[exo-jcr-commits] exo-jcr SVN: r366 - in jcr/branches/1.12.0-JBC/component/core/src: main/java/org/exoplatform/services/jbosscache and 4 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Sun Oct 25 15:50:15 EDT 2009
Author: pnedonosko
Date: 2009-10-25 15:50:14 -0400 (Sun, 25 Oct 2009)
New Revision: 366
Added:
jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jbosscache/
jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jbosscache/JBossCacheService.java
jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/
jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnectionTest.java
Modified:
jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/ExoJCRCacheLoader.java
jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnection.java
jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheWorkspaceDataContainer.java
jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-configuration.xml
jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jcr-config.xml
Log:
EXOJCR-200: WorkspaceStorageConnection impl parts + configs + JBossCacheService
Added: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jbosscache/JBossCacheService.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jbosscache/JBossCacheService.java (rev 0)
+++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jbosscache/JBossCacheService.java 2009-10-25 19:50:14 UTC (rev 366)
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2009 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+/*
+ * Copyright (C) 2009 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.exoplatform.services.jbosscache;
+
+import java.io.Serializable;
+
+import org.exoplatform.container.xml.InitParams;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
+import org.jboss.cache.Cache;
+import org.jboss.cache.CacheFactory;
+import org.jboss.cache.DefaultCacheFactory;
+import org.picocontainer.Startable;
+
+/**
+ * Created by The eXo Platform SAS.<br/>
+ *
+ * Service provides singletone JBossCache instance.
+ *
+ * <br/>Date: 25.10.2009
+ *
+ * @author <a href="mailto:peter.nedonosko at exoplatform.com.ua">Peter Nedonosko</a>
+ * @version $Id: JBossCacheService.java 111 2008-11-11 11:11:11Z pnedonosko $
+ */
+public class JBossCacheService implements Startable
+{
+ protected static Log LOG = ExoLogger.getLogger("jcr.JBossCacheService");
+
+ private final Cache<Serializable, Object> cache;
+
+ public JBossCacheService(InitParams params)
+ {
+ String jbcConfig = params.getValueParam("jboss-cache-configuration").getValue();
+
+ CacheFactory<Serializable, Object> factory = new DefaultCacheFactory<Serializable, Object>();
+
+ LOG.info("JBoss Cache configuration used: " + jbcConfig);
+
+ this.cache = factory.createCache(jbcConfig);
+
+ // initializes configuration state, the root node, etc.
+ this.cache.create();
+ }
+
+ /**
+ * Return JBoss Cache instance.
+ *
+ * @return Cache
+ */
+ public Cache<Serializable, Object> getCache()
+ {
+ return cache;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void start()
+ {
+ // starts the cache loader, starts cache replication, starts the region manager, etc.
+ this.cache.start();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void stop()
+ {
+ this.cache.stop();
+ }
+
+}
Property changes on: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jbosscache/JBossCacheService.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/ExoJCRCacheLoader.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/ExoJCRCacheLoader.java 2009-10-25 16:29:14 UTC (rev 365)
+++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/ExoJCRCacheLoader.java 2009-10-25 19:50:14 UTC (rev 366)
@@ -39,7 +39,7 @@
* <br/>Date: 23.10.2009
*
* @author <a href="mailto:peter.nedonosko at exoplatform.com.ua">Peter Nedonosko</a>
- * @version $Id: ExoJCRCacheLoader.java 111 2008-11-11 11:11:11Z pnedonosko $
+ * @version $Id$
*/
public class ExoJCRCacheLoader implements CacheLoader
{
Property changes on: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/ExoJCRCacheLoader.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnection.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnection.java 2009-10-25 16:29:14 UTC (rev 365)
+++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnection.java 2009-10-25 19:50:14 UTC (rev 366)
@@ -30,7 +30,9 @@
import org.jboss.cache.Node;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.List;
+import java.util.Set;
import javax.jcr.InvalidItemStateException;
import javax.jcr.RepositoryException;
@@ -46,7 +48,7 @@
* References map ??? /$repo_name/$ws_name/$REFS: Key=NodeId, Value = PropertyId.<br/>
*
* @author <a href="mailto:peter.nedonosko at exoplatform.com.ua">Peter Nedonosko</a>
- * @version $Id: JBossCacheStorageConnection.java 111 2008-11-11 11:11:11Z pnedonosko $
+ * @version $Id$
*/
public class JBossCacheStorageConnection extends DBConstants implements WorkspaceStorageConnection
{
@@ -59,7 +61,7 @@
private final Cache<Serializable, Object> cache;
private final Node<Serializable, Object> treeRoot;
-
+
private final Node<Serializable, Object> itemsRoot;
/**
@@ -67,7 +69,8 @@
*
* @param cache Cache<Serializable, Object>
*/
- public JBossCacheStorageConnection(Cache<Serializable, Object> cache, Node<Serializable, Object> treeRoot, Node<Serializable, Object> itemsRoot)
+ public JBossCacheStorageConnection(Cache<Serializable, Object> cache, Node<Serializable, Object> treeRoot,
+ Node<Serializable, Object> itemsRoot)
{
this.cache = cache;
this.itemsRoot = itemsRoot;
@@ -88,7 +91,7 @@
return Fqn.fromRelativeFqn(treeRoot.getFqn(), Fqn.fromElements(fqns));
}
- private Fqn<String> makePropertyFqn(QPath propertyPath)
+ private Fqn<String> makeParentFqn(QPath propertyPath)
{
QPathEntry[] path = propertyPath.getEntries();
int pathLen = path.length - 1;
@@ -125,9 +128,11 @@
public void add(PropertyData data) throws RepositoryException, UnsupportedOperationException,
InvalidItemStateException, IllegalStateException
{
+ Fqn<String> parentFqn = makeParentFqn(data.getQPath());
- cache.put(makePropertyFqn(data.getQPath()), data.getQPath().getEntries()[data.getQPath().getEntries().length - 1]
- .getAsString(true), data.getIdentifier());
+ // add an attr to the parent node as key=PropertyName value=PropertyId
+ cache.put(parentFqn, data.getQPath().getEntries()[data.getQPath().getEntries().length - 1].getAsString(true),
+ data.getIdentifier());
cache.put(makeIdFqn(data.getIdentifier()), ITEM_DATA, data);
}
@@ -137,8 +142,8 @@
public void delete(NodeData data) throws RepositoryException, UnsupportedOperationException,
InvalidItemStateException, IllegalStateException
{
- // TODO Auto-generated method stub
-
+ cache.removeNode(makeNodeFqn(data.getQPath()));
+ cache.removeNode(makeIdFqn(data.getIdentifier()));
}
/**
@@ -147,8 +152,10 @@
public void delete(PropertyData data) throws RepositoryException, UnsupportedOperationException,
InvalidItemStateException, IllegalStateException
{
- // TODO Auto-generated method stub
-
+ // delete attr on parent by key=PropertyName
+ cache.remove(makeParentFqn(data.getQPath()),
+ data.getQPath().getEntries()[data.getQPath().getEntries().length - 1].getAsString(true));
+ cache.removeNode(makeIdFqn(data.getIdentifier()));
}
/**
@@ -156,8 +163,26 @@
*/
public List<NodeData> getChildNodesData(NodeData parent) throws RepositoryException, IllegalStateException
{
- // TODO Auto-generated method stub
- return null;
+ //Set<Object> childNames = cache.getChildrenNames(makeNodeFqn(parent.getQPath()));
+ Node<Serializable, Object> parentNode = cache.getNode(makeNodeFqn(parent.getQPath()));
+ if (parentNode == null)
+ {
+ throw new IllegalStateException("Get child Nodes error: parent not found " + parent.getQPath().getAsString());
+ }
+
+ Set<Node<Serializable, Object>> childNodes = parentNode.getChildren();
+
+ List<NodeData> childs = new ArrayList<NodeData>();
+ for (Node<Serializable, Object> child : childNodes)
+ {
+ String childId = (String)child.get(ITEM_ID);
+
+ // TODO NodeData or PropertyData? As ItemData check then and cast.
+ NodeData node = (NodeData)cache.get(makeIdFqn(childId), ITEM_DATA);
+ childs.add(node);
+ }
+
+ return childs;
}
/**
@@ -165,8 +190,27 @@
*/
public List<PropertyData> getChildPropertiesData(NodeData parent) throws RepositoryException, IllegalStateException
{
- // TODO Auto-generated method stub
- return null;
+ // TODO treeRoot.getChild(f) possible if f not a direct child???
+ Node<Serializable, Object> parentNode = cache.getNode(makeNodeFqn(parent.getQPath()));
+ if (parentNode == null)
+ {
+ throw new IllegalStateException("Get child Nodes error: parent not found " + parent.getQPath().getAsString());
+ }
+
+ List<PropertyData> childs = new ArrayList<PropertyData>();
+
+ // TODO keys Serializable shoudl be!!!
+ for (Object key : parentNode.getKeys())
+ {
+ if (!key.equals(ITEM_ID))
+ {
+ // TODO NodeData or PropertyData? As ItemData check then and cast.
+ PropertyData property = (PropertyData)cache.get(makeIdFqn((String)key), ITEM_DATA);
+ childs.add(property);
+ }
+ }
+
+ return childs;
}
/**
@@ -174,7 +218,11 @@
*/
public ItemData getItemData(NodeData parentData, QPathEntry name) throws RepositoryException, IllegalStateException
{
- // TODO Auto-generated method stub
+ // Node<Serializable, Object> node = cache.getNode(makeNodeFqn(parentData.getQPath()));
+ // if (node == null)
+ // {
+ // throw new IllegalStateException("Get child Nodes error: parent not found " + parent.getQPath().getAsString());
+ // };
return null;
}
Property changes on: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnection.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheWorkspaceDataContainer.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheWorkspaceDataContainer.java 2009-10-25 16:29:14 UTC (rev 365)
+++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheWorkspaceDataContainer.java 2009-10-25 19:50:14 UTC (rev 366)
@@ -18,6 +18,14 @@
*/
package org.exoplatform.services.jcr.impl.storage.jbosscache;
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.List;
+
+import javax.jcr.RepositoryException;
+import javax.naming.NamingException;
+
+import org.exoplatform.services.jbosscache.JBossCacheService;
import org.exoplatform.services.jcr.config.RepositoryConfigurationException;
import org.exoplatform.services.jcr.config.RepositoryEntry;
import org.exoplatform.services.jcr.config.WorkspaceEntry;
@@ -34,21 +42,16 @@
import org.jboss.cache.DefaultCacheFactory;
import org.jboss.cache.Fqn;
import org.jboss.cache.Node;
+import org.jboss.cache.config.CacheLoaderConfig.IndividualCacheLoaderConfig;
import org.picocontainer.Startable;
-import java.io.IOException;
-import java.io.Serializable;
-
-import javax.jcr.RepositoryException;
-import javax.naming.NamingException;
-
/**
* Created by The eXo Platform SAS.
*
* <br/>Date: 23.10.2009
*
* @author <a href="mailto:peter.nedonosko at exoplatform.com.ua">Peter Nedonosko</a>
- * @version $Id: JBossWorkspaceDataContainer.java 111 2008-11-11 11:11:11Z pnedonosko $
+ * @version $Id$
*/
public class JBossCacheWorkspaceDataContainer extends WorkspaceDataContainerBase implements Startable
{
@@ -70,38 +73,39 @@
private final Cache<Serializable, Object> cache;
private final Node<Serializable, Object> tree;
+
+ private final Node<Serializable, Object> items;
- private final Node<Serializable, Object> items;
-
/**
* JBossWorkspaceDataContainer constructor.
*
*/
- public JBossCacheWorkspaceDataContainer(WorkspaceEntry wsConfig, RepositoryEntry repConfig,
- InitialContextInitializer contextInit, ValueStoragePluginProvider valueStorageProvider)
+ public JBossCacheWorkspaceDataContainer(JBossCacheService jbcService, WorkspaceEntry wsConfig,
+ RepositoryEntry repConfig, InitialContextInitializer contextInit, ValueStoragePluginProvider valueStorageProvider)
throws RepositoryConfigurationException, NamingException, RepositoryException, IOException
{
this.repositoryName = repConfig.getName();
this.containerName = wsConfig.getName();
- CacheFactory<Serializable, Object> factory = new DefaultCacheFactory<Serializable, Object>();
+ this.cache = jbcService.getCache();
- String jbcConfig = wsConfig.getContainer().getParameterValue(JBOSSCACHE_CONFIG);
- LOG.info("JBossCache configuration used: " + jbcConfig);
-
- this.cache = factory.createCache(jbcConfig);
-
// TODO hardcoded now
this.persistentContainer = new JDBCWorkspaceDataContainer(wsConfig, repConfig, contextInit, valueStorageProvider);
- // TODO add/configure CacheLoader here with this.persistentContainer
- this.cache.create();
- this.cache.start();
+ // TODO configure CacheLoader here with this.persistentContainer
+ for (IndividualCacheLoaderConfig loaderCfg : this.cache.getConfiguration().getCacheLoaderConfig()
+ .getIndividualCacheLoaderConfigs())
+ {
+ if (loaderCfg.getClassName().equals(ExoJCRCacheLoader.class.getName()))
+ {
+ ((ExoJCRCacheLoader)loaderCfg.getCacheLoader()).initDataContainer(this.persistentContainer);
+ }
+ }
Node<Serializable, Object> cacheRoot = cache.getRoot();
Node<Serializable, Object> wsRoot = cacheRoot.addChild(Fqn.fromElements(repositoryName, containerName));
- // prepare
+ // prepare cache structures
this.tree = wsRoot.addChild(Fqn.fromString(ROOT));
this.items = wsRoot.addChild(Fqn.fromString(ITEMS));
}
Property changes on: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheWorkspaceDataContainer.java
___________________________________________________________________
Name: svn:keywords
+ Id
Added: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnectionTest.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnectionTest.java (rev 0)
+++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnectionTest.java 2009-10-25 19:50:14 UTC (rev 366)
@@ -0,0 +1,134 @@
+/*
+ * Copyright (C) 2009 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+/*
+ * Copyright (C) 2009 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.exoplatform.services.jcr.impl.storage.jbosscache;
+
+import java.io.Serializable;
+
+import javax.jcr.InvalidItemStateException;
+import javax.jcr.RepositoryException;
+
+import junit.framework.TestCase;
+
+import org.exoplatform.services.jcr.access.AccessControlList;
+import org.exoplatform.services.jcr.datamodel.IllegalPathException;
+import org.exoplatform.services.jcr.datamodel.InternalQName;
+import org.exoplatform.services.jcr.datamodel.QPath;
+import org.exoplatform.services.jcr.impl.Constants;
+import org.exoplatform.services.jcr.impl.dataflow.TransientNodeData;
+import org.jboss.cache.Cache;
+import org.jboss.cache.DefaultCacheFactory;
+import org.jboss.cache.Fqn;
+import org.jboss.cache.Node;
+
+/**
+ * Created by The eXo Platform SAS.
+ *
+ * <br/>Date: 25.10.2009
+ *
+ * @author <a href="mailto:peter.nedonosko at exoplatform.com.ua">Peter Nedonosko</a>
+ * @version $Id$
+ */
+public class JBossCacheStorageConnectionTest extends TestCase
+{
+
+ private JBossCacheStorageConnection conn;
+
+ private Cache<Serializable, Object> cache;
+
+ private Node<Serializable, Object> tree;
+
+ private Node<Serializable, Object> items;
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ // JBossCache
+ String jbcConfig = "/conf/portal/exojcr-jboss-cache-conf.xml";
+
+ cache = new DefaultCacheFactory<Serializable, Object>().createCache(jbcConfig);
+
+ Node<Serializable, Object> cacheRoot = cache.getRoot();
+ Node<Serializable, Object> wsRoot = cacheRoot.addChild(Fqn.fromElements("repo", "ws"));
+
+ // prepare cache structures
+ tree = wsRoot.addChild(Fqn.fromString(JBossCacheWorkspaceDataContainer.ROOT));
+ items = wsRoot.addChild(Fqn.fromString(JBossCacheWorkspaceDataContainer.ITEMS));
+
+ // run cache
+ cache.create();
+ cache.start();
+
+ // JCR connection
+ conn = new JBossCacheStorageConnection(cache, tree, items);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void tearDown() throws Exception
+ {
+
+ cache.stop();
+ cache.destroy();
+
+ super.tearDown();
+ }
+
+ public void testAddNode() throws Exception
+ {
+ // add
+ conn.add(new TransientNodeData(QPath.parse("[]:node:1"), "1", 1, Constants.NT_UNSTRUCTURED, new InternalQName[0],
+ 0, Constants.ROOT_UUID, new AccessControlList()));
+
+ // test
+ tree.getChildren();
+ }
+
+ public void testGetChildNodesData()
+ {
+
+ // prepare
+
+ // check
+
+ }
+
+}
Property changes on: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnectionTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Id
Modified: jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-configuration.xml
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-configuration.xml 2009-10-25 16:29:14 UTC (rev 365)
+++ jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-configuration.xml 2009-10-25 19:50:14 UTC (rev 366)
@@ -102,6 +102,16 @@
</init-params>
</component>
+ <component>
+ <type>org.exoplatform.services.jbosscache.JBossCacheService</type>
+ <init-params>
+ <value-param>
+ <name>jboss-cache-configuration</name>
+ <value>/conf/portal/exojcr-jboss-cache-conf.xml</value>
+ </value-param>
+ </init-params>
+ </component>
+
<component>
<key>org.exoplatform.services.jcr.RepositoryService</key>
<type>org.exoplatform.services.jcr.impl.RepositoryServiceImpl</type>
Modified: jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jcr-config.xml
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jcr-config.xml 2009-10-25 16:29:14 UTC (rev 365)
+++ jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jcr-config.xml 2009-10-25 19:50:14 UTC (rev 366)
@@ -32,7 +32,6 @@
<!-- for system storage -->
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.JBossCacheWorkspaceDataContainer">
<properties>
- <property name="jboss-cache-conf" value="/conf/portal/exojcr-jboss-cache-conf.xml" />
<property name="source-name" value="jdbcjcr" />
<property name="dialect" value="hsqldb" />
<property name="multi-db" value="true" />
More information about the exo-jcr-commits
mailing list