Author: pnedonosko
Date: 2009-10-27 10:50:02 -0400 (Tue, 27 Oct 2009)
New Revision: 433
Added:
jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/JBossCacheWorkspaceDataManager.java
Removed:
jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/JBossCachePersistentDataManager.java
jcr/branches/1.12.0-JBC/component/core/src/test/java/conf/
Modified:
jcr/branches/1.12.0-JBC/component/core/pom.xml
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/main/resources/conf/portal/exojcr-jboss-cache-conf.xml
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/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: persistence based on JBC JDBC loader (for tests)
Modified: jcr/branches/1.12.0-JBC/component/core/pom.xml
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/pom.xml 2009-10-27 14:39:23 UTC (rev 432)
+++ jcr/branches/1.12.0-JBC/component/core/pom.xml 2009-10-27 14:50:02 UTC (rev 433)
@@ -569,9 +569,9 @@
</systemProperties>
<includes>
<include>**/**/TestErrorMultithreading__.java</include>
- <include>**/**/TestConcurrentItems__.java</include>
-
- <include>**/**/JBossCacheServiceTest.java</include>
+
<include>**/**/JBossCacheServiceTest__.java</include>
+
+ <include>**/**/TestItem.java</include>
</includes>
</configuration>
</plugin>
Deleted:
jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/JBossCachePersistentDataManager.java
===================================================================
---
jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/JBossCachePersistentDataManager.java 2009-10-27
14:39:23 UTC (rev 432)
+++
jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/JBossCachePersistentDataManager.java 2009-10-27
14:50:02 UTC (rev 433)
@@ -1,182 +0,0 @@
-/*
- * 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 3 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.dataflow.persistent;
-
-import org.exoplatform.services.jcr.dataflow.ItemState;
-import org.exoplatform.services.jcr.dataflow.ItemStateChangesLog;
-import org.exoplatform.services.jcr.dataflow.ReadOnlyThroughChanges;
-import org.exoplatform.services.jcr.datamodel.QPath;
-import org.exoplatform.services.jcr.impl.Constants;
-import org.exoplatform.services.jcr.impl.dataflow.TransientItemData;
-import org.exoplatform.services.jcr.impl.storage.SystemDataContainerHolder;
-import org.exoplatform.services.jcr.storage.WorkspaceDataContainer;
-import org.exoplatform.services.jcr.storage.WorkspaceStorageConnection;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import javax.jcr.RepositoryException;
-
-/**
- * Created by The eXo Platform SAS.
- *
- * <br/>Date: 23.10.2009
- *
- * @author <a href="mailto:peter.nedonosko@exoplatform.com.ua">Peter
Nedonosko</a>
- * @version $Id$
- */
-public class JBossCachePersistentDataManager extends WorkspacePersistentDataManager
-{
-
- /**
- * JBossCachePersistentDataManager constructor.
- *
- * @param dataContainer WorkspaceDataContainer
- * @param systemDataContainerHolder SystemDataContainerHolder
- */
- public JBossCachePersistentDataManager(WorkspaceDataContainer dataContainer,
- SystemDataContainerHolder<WorkspaceDataContainer> systemDataContainerHolder)
- {
- super(dataContainer, systemDataContainerHolder);
- }
-
- @Override
- public void save(ItemStateChangesLog changesLog) throws RepositoryException
- {
- // check if this workspace container is not read-only
- if (readOnly && !(changesLog instanceof ReadOnlyThroughChanges))
- throw new ReadOnlyWorkspaceException("Workspace container '" +
dataContainer.getName() + "' is read-only.");
-
- final Set<QPath> addedNodes = new HashSet<QPath>();
-
- WorkspaceStorageConnection thisConnection = null;
- WorkspaceStorageConnection systemConnection = null;
-
- try
- {
- for (Iterator<ItemState> iter = changesLog.getAllStates().iterator();
iter.hasNext();)
- {
- ItemState itemState = iter.next();
-
- if (!itemState.isPersisted())
- continue;
-
- long start = System.currentTimeMillis();
-
- TransientItemData data = (TransientItemData)itemState.getData();
-
- WorkspaceStorageConnection conn = null;
- if (isSystemDescendant(data.getQPath()))
- {
- conn = systemConnection == null
- // we need system connection but it's not exist
- ? systemConnection = (systemDataContainer != dataContainer
- // if it's different container instances
- ? systemDataContainer.equals(dataContainer) &&
thisConnection != null
- // but container confugrations are same and non-system connnection
open
- // reuse this connection as system
- ? systemDataContainer.reuseConnection(thisConnection)
- // or open one new system
- : systemDataContainer.openConnection()
- // else if it's same container instances (system and this)
- : thisConnection == null
- // and non-system connection doens't exist - open it
- ? thisConnection = dataContainer.openConnection()
- // if already open - use it
- : thisConnection)
- // system connection opened - use it
- : systemConnection;
- }
- else
- {
- conn = thisConnection == null
- // we need this conatiner conection
- ? thisConnection = (systemDataContainer != dataContainer
- // if it's different container instances
- ? dataContainer.equals(systemDataContainer) &&
systemConnection != null
- // but container confugrations are same and system connnection open
- // reuse system connection as this
- ? dataContainer.reuseConnection(systemConnection)
- // or open one new
- : dataContainer.openConnection()
- // else if it's same container instances (system and this)
- : systemConnection == null
- // and system connection doens't exist - open it
- ? systemConnection = dataContainer.openConnection()
- // if already open - use it
- : systemConnection)
- // this connection opened - use it
- : thisConnection;
- }
-
- data.increasePersistedVersion();
-
- if (itemState.isAdded())
- {
- doAdd(data, conn, addedNodes);
- }
- else if (itemState.isUpdated())
- {
- doUpdate(data, conn);
- }
- else if (itemState.isDeleted())
- {
- doDelete(data, conn);
- }
- else if (itemState.isRenamed())
- {
- doRename(data, conn, addedNodes);
- }
-
- if (LOG.isDebugEnabled())
- LOG.debug(ItemState.nameFromValue(itemState.getState()) + " " +
(System.currentTimeMillis() - start)
- + "ms, " + data.getQPath().getAsString());
- }
- if (thisConnection != null)
- thisConnection.commit();
- if (systemConnection != null &&
!systemConnection.equals(thisConnection))
- systemConnection.commit();
- }
- finally
- {
- if (thisConnection != null && thisConnection.isOpened())
- thisConnection.rollback();
- if (systemConnection != null && !systemConnection.equals(thisConnection)
&& systemConnection.isOpened())
- systemConnection.rollback();
-
- // help to GC
- addedNodes.clear();
- }
- }
-
-
- /**
- * Tell if the path is jcr:system descendant.
- *
- * @param path
- * path to check
- * @return boolean result, true if yes - it's jcr:system tree path
- */
- private boolean isSystemDescendant(QPath path)
- {
- return path.isDescendantOf(Constants.JCR_SYSTEM_PATH) ||
path.equals(Constants.JCR_SYSTEM_PATH);
- }
-
-}
Copied:
jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/JBossCacheWorkspaceDataManager.java
(from rev 431,
jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/JBossCachePersistentDataManager.java)
===================================================================
---
jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/JBossCacheWorkspaceDataManager.java
(rev 0)
+++
jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/JBossCacheWorkspaceDataManager.java 2009-10-27
14:50:02 UTC (rev 433)
@@ -0,0 +1,182 @@
+/*
+ * 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 3 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.dataflow.persistent;
+
+import org.exoplatform.services.jcr.dataflow.ItemState;
+import org.exoplatform.services.jcr.dataflow.ItemStateChangesLog;
+import org.exoplatform.services.jcr.dataflow.ReadOnlyThroughChanges;
+import org.exoplatform.services.jcr.datamodel.QPath;
+import org.exoplatform.services.jcr.impl.Constants;
+import org.exoplatform.services.jcr.impl.dataflow.TransientItemData;
+import org.exoplatform.services.jcr.impl.storage.SystemDataContainerHolder;
+import org.exoplatform.services.jcr.storage.WorkspaceDataContainer;
+import org.exoplatform.services.jcr.storage.WorkspaceStorageConnection;
+
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+import javax.jcr.RepositoryException;
+
+/**
+ * Created by The eXo Platform SAS.
+ *
+ * <br/>Date: 23.10.2009
+ *
+ * @author <a href="mailto:peter.nedonosko@exoplatform.com.ua">Peter
Nedonosko</a>
+ * @version $Id$
+ */
+public class JBossCacheWorkspaceDataManager extends WorkspacePersistentDataManager
+{
+
+ /**
+ * JBossCachePersistentDataManager constructor.
+ *
+ * @param dataContainer WorkspaceDataContainer
+ * @param systemDataContainerHolder SystemDataContainerHolder
+ */
+ public JBossCacheWorkspaceDataManager(WorkspaceDataContainer dataContainer,
+ SystemDataContainerHolder<WorkspaceDataContainer> systemDataContainerHolder)
+ {
+ super(dataContainer, systemDataContainerHolder);
+ }
+
+ @Override
+ public void save(ItemStateChangesLog changesLog) throws RepositoryException
+ {
+ // check if this workspace container is not read-only
+ if (readOnly && !(changesLog instanceof ReadOnlyThroughChanges))
+ throw new ReadOnlyWorkspaceException("Workspace container '" +
dataContainer.getName() + "' is read-only.");
+
+ final Set<QPath> addedNodes = new HashSet<QPath>();
+
+ WorkspaceStorageConnection thisConnection = null;
+ WorkspaceStorageConnection systemConnection = null;
+
+ try
+ {
+ for (Iterator<ItemState> iter = changesLog.getAllStates().iterator();
iter.hasNext();)
+ {
+ ItemState itemState = iter.next();
+
+ if (!itemState.isPersisted())
+ continue;
+
+ long start = System.currentTimeMillis();
+
+ TransientItemData data = (TransientItemData)itemState.getData();
+
+ WorkspaceStorageConnection conn = null;
+ if (isSystemDescendant(data.getQPath()))
+ {
+ conn = systemConnection == null
+ // we need system connection but it's not exist
+ ? systemConnection = (systemDataContainer != dataContainer
+ // if it's different container instances
+ ? systemDataContainer.equals(dataContainer) &&
thisConnection != null
+ // but container confugrations are same and non-system connnection
open
+ // reuse this connection as system
+ ? systemDataContainer.reuseConnection(thisConnection)
+ // or open one new system
+ : systemDataContainer.openConnection()
+ // else if it's same container instances (system and this)
+ : thisConnection == null
+ // and non-system connection doens't exist - open it
+ ? thisConnection = dataContainer.openConnection()
+ // if already open - use it
+ : thisConnection)
+ // system connection opened - use it
+ : systemConnection;
+ }
+ else
+ {
+ conn = thisConnection == null
+ // we need this conatiner conection
+ ? thisConnection = (systemDataContainer != dataContainer
+ // if it's different container instances
+ ? dataContainer.equals(systemDataContainer) &&
systemConnection != null
+ // but container confugrations are same and system connnection open
+ // reuse system connection as this
+ ? dataContainer.reuseConnection(systemConnection)
+ // or open one new
+ : dataContainer.openConnection()
+ // else if it's same container instances (system and this)
+ : systemConnection == null
+ // and system connection doens't exist - open it
+ ? systemConnection = dataContainer.openConnection()
+ // if already open - use it
+ : systemConnection)
+ // this connection opened - use it
+ : thisConnection;
+ }
+
+ data.increasePersistedVersion();
+
+ if (itemState.isAdded())
+ {
+ doAdd(data, conn, addedNodes);
+ }
+ else if (itemState.isUpdated())
+ {
+ doUpdate(data, conn);
+ }
+ else if (itemState.isDeleted())
+ {
+ doDelete(data, conn);
+ }
+ else if (itemState.isRenamed())
+ {
+ doRename(data, conn, addedNodes);
+ }
+
+ if (LOG.isDebugEnabled())
+ LOG.debug(ItemState.nameFromValue(itemState.getState()) + " " +
(System.currentTimeMillis() - start)
+ + "ms, " + data.getQPath().getAsString());
+ }
+ if (thisConnection != null)
+ thisConnection.commit();
+ if (systemConnection != null &&
!systemConnection.equals(thisConnection))
+ systemConnection.commit();
+ }
+ finally
+ {
+ if (thisConnection != null && thisConnection.isOpened())
+ thisConnection.rollback();
+ if (systemConnection != null && !systemConnection.equals(thisConnection)
&& systemConnection.isOpened())
+ systemConnection.rollback();
+
+ // help to GC
+ addedNodes.clear();
+ }
+ }
+
+
+ /**
+ * Tell if the path is jcr:system descendant.
+ *
+ * @param path
+ * path to check
+ * @return boolean result, true if yes - it's jcr:system tree path
+ */
+ private boolean isSystemDescendant(QPath path)
+ {
+ return path.isDescendantOf(Constants.JCR_SYSTEM_PATH) ||
path.equals(Constants.JCR_SYSTEM_PATH);
+ }
+
+}
Property changes on:
jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/JBossCacheWorkspaceDataManager.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
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-27
14:39:23 UTC (rev 432)
+++
jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnection.java 2009-10-27
14:50:02 UTC (rev 433)
@@ -56,7 +56,7 @@
{
protected static final Log LOG =
ExoLogger.getLogger("jcr.JBossCacheStorageConnection");
-
+
//public static final InternalQName NODE = new InternalQName(Constants.NS_DEFAULT_URI,
"$node");
public static final String ITEM_DATA = "$idata".intern();
@@ -192,6 +192,10 @@
// TODO NodeData or PropertyData? As ItemData check then and cast.
NodeData node = (NodeData)cache.get(makeIdFqn(childId), ITEM_DATA);
+ if (node == null)
+ {
+ throw new RepositoryException("One of childs is null. Parent " +
parent.getQPath().getAsString());
+ }
childs.add(node);
}
@@ -219,6 +223,10 @@
{
// TODO NodeData or PropertyData? As ItemData check then and cast.
PropertyData property = (PropertyData)cache.get(makeIdFqn((String)key),
ITEM_DATA);
+ if (property == null)
+ {
+ throw new RepositoryException("One of childs is null. Parent " +
parent.getQPath().getAsString());
+ }
childs.add(property);
}
}
@@ -259,7 +267,7 @@
else
{
// it's Node Item
- Node<Serializable, Object> node =
parentNode.getChild(Fqn.fromString(itemName)); // TODO not Fqn?
+ Node<Serializable, Object> node = parentNode.getChild(itemName); // TODO
String not Fqn?
if (node != null)
{
String nodeId = (String)node.get(ITEM_ID);
@@ -301,8 +309,7 @@
startBatch();
// TODO move Node to a new position at the tree,
// but prev location was in prev DELETE.
-
-
+
}
/**
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-27
14:39:23 UTC (rev 432)
+++
jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheWorkspaceDataContainer.java 2009-10-27
14:50:02 UTC (rev 433)
@@ -18,13 +18,6 @@
*/
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;
@@ -38,13 +31,17 @@
import org.exoplatform.services.log.Log;
import org.exoplatform.services.naming.InitialContextInitializer;
import org.jboss.cache.Cache;
-import org.jboss.cache.CacheFactory;
-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.
*
Modified:
jcr/branches/1.12.0-JBC/component/core/src/main/resources/conf/portal/exojcr-jboss-cache-conf.xml
===================================================================
---
jcr/branches/1.12.0-JBC/component/core/src/main/resources/conf/portal/exojcr-jboss-cache-conf.xml 2009-10-27
14:39:23 UTC (rev 432)
+++
jcr/branches/1.12.0-JBC/component/core/src/main/resources/conf/portal/exojcr-jboss-cache-conf.xml 2009-10-27
14:50:02 UTC (rev 433)
@@ -52,15 +52,15 @@
</clustering>
<loaders passivation="false" shared="false">
- <loader class="org.jboss.cache.loader.FileCacheLoader"
async="false"
+ <!-- loader class="org.jboss.cache.loader.FileCacheLoader"
async="false"
fetchPersistentState="true" ignoreModifications="false"
purgeOnStartup="false">
<properties>
location=/tmp/test-jboss-cache/proxy
</properties>
- </loader>
+ </loader -->
- <!-- loader class="org.jboss.cache.loader.JDBCCacheLoader"
async="false" fetchPersistentState="true"
+ <loader class="org.jboss.cache.loader.JDBCCacheLoader"
async="false" fetchPersistentState="true"
ignoreModifications="false" purgeOnStartup="false">
<properties>
cache.jdbc.table.name=jdbcjcr
@@ -70,14 +70,14 @@
cache.jdbc.fqn.column=fqn
cache.jdbc.fqn.type=VARCHAR(512)
cache.jdbc.node.column=node
- cache.jdbc.node.type=BLOB
+ cache.jdbc.node.type=VARBINARY(65535)
cache.jdbc.parent.column=parent
cache.jdbc.driver=org.hsqldb.jdbcDriver
cache.jdbc.url=jdbc:hsqldb:file:target/temp/data/exojcr
cache.jdbc.user=sa
cache.jdbc.password=
</properties>
- </loader -->
+ </loader>
</loaders>
<!-- Enable batching -->
Modified:
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 2009-10-27
14:39:23 UTC (rev 432)
+++
jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnectionTest.java 2009-10-27
14:50:02 UTC (rev 433)
@@ -36,15 +36,9 @@
*/
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;
@@ -54,6 +48,8 @@
import org.jboss.cache.Fqn;
import org.jboss.cache.Node;
+import java.io.Serializable;
+
/**
* Created by The eXo Platform SAS.
*
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-27
14:39:23 UTC (rev 432)
+++
jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-configuration.xml 2009-10-27
14:50:02 UTC (rev 433)
@@ -107,7 +107,7 @@
<init-params>
<value-param>
<name>jboss-cache-configuration</name>
- <value>/conf/portal/exojcr-jboss-cache-conf.xml</value>
+ <value>conf/portal/exojcr-jboss-cache-conf.xml</value>
</value-param>
</init-params>
</component>
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-27
14:39:23 UTC (rev 432)
+++
jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jcr-config.xml 2009-10-27
14:50:02 UTC (rev 433)
@@ -30,7 +30,7 @@
<workspaces>
<workspace name="ws">
<!-- for system storage -->
- <container
class="org.exoplatform.services.jcr.impl.storage.jdbc.JBossCacheWorkspaceDataContainer">
+ <container
class="org.exoplatform.services.jcr.impl.storage.jbosscache.JBossCacheWorkspaceDataContainer">
<properties>
<property name="source-name" value="jdbcjcr"
/>
<property name="dialect" value="hsqldb"
/>
@@ -59,19 +59,19 @@
<property name="root-nodetype"
value="nt:unstructured" />
</properties>
</initializer>
- <query-handler
class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
+ <!-- query-handler
class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
<properties>
<property name="index-dir"
value="target/temp/index/db1/ws" />
</properties>
- </query-handler>
- <lock-manager>
+ </query-handler -->
+ <!-- lock-manager>
<time-out>15m</time-out>
<persister
class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister">
<properties>
<property name="path"
value="target/temp/lock" />
</properties>
</persister>
- </lock-manager>
+ </lock-manager -->
</workspace>
<workspace name="ws1">