exo-jcr SVN: r4057 - core/trunk.
by do-not-reply＠jboss.org
Author: dkuleshov
Date: 2011-03-04 07:40:07 -0500 (Fri, 04 Mar 2011)
New Revision: 4057
Modified:
core/trunk/pom.xml
Log:
EXOJCR-1159: reverted slf4j from 1.6.1 back to 1.5.8
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2011-03-04 12:34:42 UTC (rev 4056)
+++ core/trunk/pom.xml 2011-03-04 12:40:07 UTC (rev 4057)
@@ -153,14 +153,14 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.6.1</version>
+ <version>1.5.8</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.6.1</version>
+ <version>1.5.8</version>
<scope>test</scope>
</dependency>
15 years, 1 month
- 1
- 0
exo-jcr SVN: r4056 - in kernel/trunk: exo.kernel.commons/src/main/java/org/exoplatform/services/log/impl and 1 other directory.
by do-not-reply＠jboss.org
Author: dkuleshov
Date: 2011-03-04 07:34:42 -0500 (Fri, 04 Mar 2011)
New Revision: 4056
Modified:
kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/services/log/impl/LocationAwareSLF4JExoLog.java
kernel/trunk/pom.xml
Log:
EXOJCR-1159: reverted slf4j from 1.6.1 back to 1.5.8
Modified: kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/services/log/impl/LocationAwareSLF4JExoLog.java
===================================================================
--- kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/services/log/impl/LocationAwareSLF4JExoLog.java 2011-03-04 12:20:26 UTC (rev 4055)
+++ kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/services/log/impl/LocationAwareSLF4JExoLog.java 2011-03-04 12:34:42 UTC (rev 4056)
@@ -84,61 +84,61 @@
public void trace(Object o)
{
- logger.log(null, FQCN, LocationAwareLogger.TRACE_INT, String.valueOf(o), null, null);
+ logger.log(null, FQCN, LocationAwareLogger.TRACE_INT, String.valueOf(o), null);
}
public void trace(Object o, Throwable throwable)
{
- logger.log(null, FQCN, LocationAwareLogger.TRACE_INT, String.valueOf(o), null, throwable);
+ logger.log(null, FQCN, LocationAwareLogger.TRACE_INT, String.valueOf(o), throwable);
}
public void debug(Object o)
{
- logger.log(null, FQCN, LocationAwareLogger.DEBUG_INT, String.valueOf(o), null, null);
+ logger.log(null, FQCN, LocationAwareLogger.DEBUG_INT, String.valueOf(o), null);
}
public void debug(Object o, Throwable throwable)
{
- logger.log(null, FQCN, LocationAwareLogger.DEBUG_INT, String.valueOf(o), null, throwable);
+ logger.log(null, FQCN, LocationAwareLogger.DEBUG_INT, String.valueOf(o), throwable);
}
public void info(Object o)
{
- logger.log(null, FQCN, LocationAwareLogger.INFO_INT, String.valueOf(o), null, null);
+ logger.log(null, FQCN, LocationAwareLogger.INFO_INT, String.valueOf(o), null);
}
public void info(Object o, Throwable throwable)
{
- logger.log(null, FQCN, LocationAwareLogger.INFO_INT, String.valueOf(o), null, throwable);
+ logger.log(null, FQCN, LocationAwareLogger.INFO_INT, String.valueOf(o), throwable);
}
public void warn(Object o)
{
- logger.log(null, FQCN, LocationAwareLogger.WARN_INT, String.valueOf(o), null, null);
+ logger.log(null, FQCN, LocationAwareLogger.WARN_INT, String.valueOf(o), null);
}
public void warn(Object o, Throwable throwable)
{
- logger.log(null, FQCN, LocationAwareLogger.WARN_INT, String.valueOf(o), null, throwable);
+ logger.log(null, FQCN, LocationAwareLogger.WARN_INT, String.valueOf(o), throwable);
}
public void error(Object o)
{
- logger.log(null, FQCN, LocationAwareLogger.ERROR_INT, String.valueOf(o), null, null);
+ logger.log(null, FQCN, LocationAwareLogger.ERROR_INT, String.valueOf(o), null);
}
public void error(Object o, Throwable throwable)
{
- logger.log(null, FQCN, LocationAwareLogger.ERROR_INT, String.valueOf(o), null, throwable);
+ logger.log(null, FQCN, LocationAwareLogger.ERROR_INT, String.valueOf(o), throwable);
}
public void fatal(Object o)
{
- logger.log(null, FQCN, LocationAwareLogger.ERROR_INT, String.valueOf(o), null, null);
+ logger.log(null, FQCN, LocationAwareLogger.ERROR_INT, String.valueOf(o), null);
}
public void fatal(Object o, Throwable throwable)
{
- logger.log(null, FQCN, LocationAwareLogger.ERROR_INT, String.valueOf(o), null, throwable);
+ logger.log(null, FQCN, LocationAwareLogger.ERROR_INT, String.valueOf(o), throwable);
}
}
Modified: kernel/trunk/pom.xml
===================================================================
--- kernel/trunk/pom.xml 2011-03-04 12:20:26 UTC (rev 4055)
+++ kernel/trunk/pom.xml 2011-03-04 12:34:42 UTC (rev 4056)
@@ -122,13 +122,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.6.1</version>
+ <version>1.5.8</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.6.1</version>
+ <version>1.5.8</version>
<scope>test</scope>
</dependency>
<dependency>
15 years, 1 month
- 1
- 0
exo-jcr SVN: r4055 - in core/trunk: exo.core.component.database and 1 other directories.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-03-04 07:20:26 -0500 (Fri, 04 Mar 2011)
New Revision: 4055
Modified:
core/trunk/exo.core.component.database/pom.xml
core/trunk/exo.core.component.organization.jdbc/pom.xml
core/trunk/pom.xml
Log:
EXOJCR-1159: change scope for org.hsqldb to test
Modified: core/trunk/exo.core.component.database/pom.xml
===================================================================
--- core/trunk/exo.core.component.database/pom.xml 2011-03-04 11:49:46 UTC (rev 4054)
+++ core/trunk/exo.core.component.database/pom.xml 2011-03-04 12:20:26 UTC (rev 4055)
@@ -76,7 +76,6 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>com.experlog</groupId>
Modified: core/trunk/exo.core.component.organization.jdbc/pom.xml
===================================================================
--- core/trunk/exo.core.component.organization.jdbc/pom.xml 2011-03-04 11:49:46 UTC (rev 4054)
+++ core/trunk/exo.core.component.organization.jdbc/pom.xml 2011-03-04 12:20:26 UTC (rev 4055)
@@ -79,6 +79,10 @@
<artifactId>exo.core.component.organization.api</artifactId>
</dependency>
<dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ </dependency>
+ <dependency>
<groupId>javax.resource</groupId>
<artifactId>connector-api</artifactId>
<scope>test</scope>
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2011-03-04 11:49:46 UTC (rev 4054)
+++ core/trunk/pom.xml 2011-03-04 12:20:26 UTC (rev 4055)
@@ -175,6 +175,7 @@
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.0.0</version>
+ <scope>test</scope>
</dependency>
<dependency>
15 years, 1 month
- 1
- 0
exo-jcr SVN: r4054 - core/trunk/exo.core.component.database.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-03-04 06:49:46 -0500 (Fri, 04 Mar 2011)
New Revision: 4054
Modified:
core/trunk/exo.core.component.database/pom.xml
Log:
EXOJCR-1159: change scope for org.hsqldb to test
Modified: core/trunk/exo.core.component.database/pom.xml
===================================================================
--- core/trunk/exo.core.component.database/pom.xml 2011-03-03 15:54:57 UTC (rev 4053)
+++ core/trunk/exo.core.component.database/pom.xml 2011-03-04 11:49:46 UTC (rev 4054)
@@ -76,7 +76,7 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <scope>runtime</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>com.experlog</groupId>
15 years, 1 month
- 1
- 0
exo-jcr SVN: r4053 - jcr/trunk/packaging/module/src/main/javascript.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-03-03 10:54:57 -0500 (Thu, 03 Mar 2011)
New Revision: 4053
Modified:
jcr/trunk/packaging/module/src/main/javascript/jcr.packaging.module.js
Log:
EXOJCR-1159: fix js
Modified: jcr/trunk/packaging/module/src/main/javascript/jcr.packaging.module.js
===================================================================
--- jcr/trunk/packaging/module/src/main/javascript/jcr.packaging.module.js 2011-03-03 15:34:52 UTC (rev 4052)
+++ jcr/trunk/packaging/module/src/main/javascript/jcr.packaging.module.js 2011-03-03 15:54:57 UTC (rev 4053)
@@ -21,7 +21,7 @@
addDependency(core.component.documents) .
addDependency(new Project("jcr", "jcr", "jar", "1.0")).
addDependency(new Project("concurrent", "concurrent", "jar", "1.3.4")).
- addDependency(new Project("jgroups", "jgroups", "jar", "2.11.1.Final")).
+ addDependency(new Project("org.jgroups", "jgroups", "jar", "2.11.1.Final")).
// addDependency(new Project("stax", "stax-api", "jar", "1.0")).
// addDependency(new Project("stax", "stax", "jar", "1.2.0")).
addDependency(new Project("org.jboss.cache","jbosscache-core","jar","3.2.6.GA")).
15 years, 1 month
- 1
- 0
exo-jcr SVN: r4052 - in jcr/trunk/exo.jcr.component.core/src: main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache and 1 other directories.
by do-not-reply＠jboss.org
Author: nzamosenchuk
Date: 2011-03-03 10:34:52 -0500 (Thu, 03 Mar 2011)
New Revision: 4052
Added:
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-indexer.xml
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ISPNIndexChangesFilter.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/IndexerCacheStore.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/IndexerCacheLoader.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JBossCacheIndexChangesFilter.java
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-jbc.xml
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc-jbc.xml
Log:
EXOJCR-833 : Fixed QueryHandler configuration and Index startup when JBC implementation used in non-clustered environment
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ISPNIndexChangesFilter.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ISPNIndexChangesFilter.java 2011-03-03 15:27:43 UTC (rev 4051)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ISPNIndexChangesFilter.java 2011-03-03 15:34:52 UTC (rev 4052)
@@ -91,12 +91,6 @@
cache.getAdvancedCache().getComponentRegistry().getComponent(CacheLoaderManager.class);
IndexerCacheStore cacheStore = (IndexerCacheStore)cacheLoaderManager.getCacheLoader();
- // This code make it possible to use the ISPNIndexChangesFilter in a non-cluster environment
- if (cache.getConfiguration().getCacheMode() == CacheMode.LOCAL)
- {
- cacheStore.activeStatusChanged(true);
- }
-
cacheStore.register(searchManager, parentSearchManager, handler, parentHandler);
IndexerIoModeHandler modeHandler = cacheStore.getModeHandler();
handler.setIndexerIoModeHandler(modeHandler);
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/IndexerCacheStore.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/IndexerCacheStore.java 2011-03-03 15:27:43 UTC (rev 4051)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/IndexerCacheStore.java 2011-03-03 15:34:52 UTC (rev 4052)
@@ -23,6 +23,7 @@
import org.exoplatform.services.jcr.impl.core.query.jbosscache.ChangesFilterListsWrapper;
import org.exoplatform.services.jcr.util.IdGenerator;
import org.infinispan.Cache;
+import org.infinispan.config.Configuration.CacheMode;
import org.infinispan.container.DataContainer;
import org.infinispan.container.entries.InternalCacheEntry;
import org.infinispan.lifecycle.ComponentStatus;
@@ -100,7 +101,8 @@
if (modeHandler == null)
{
this.modeHandler =
- new IndexerIoModeHandler(cacheManager.isCoordinator() ? IndexerIoMode.READ_WRITE
+ new IndexerIoModeHandler(cacheManager.isCoordinator()
+ || cache.getConfiguration().getCacheMode() == CacheMode.LOCAL ? IndexerIoMode.READ_WRITE
: IndexerIoMode.READ_ONLY);
}
}
@@ -143,11 +145,8 @@
{
coordinator = newActiveState;
- if (modeHandler != null)
- {
- modeHandler.setMode(coordinator ? IndexerIoMode.READ_WRITE : IndexerIoMode.READ_ONLY);
- log.info("Set indexer io mode to:" + (coordinator ? IndexerIoMode.READ_WRITE : IndexerIoMode.READ_ONLY));
- }
+ getModeHandler().setMode(coordinator ? IndexerIoMode.READ_WRITE : IndexerIoMode.READ_ONLY);
+ log.info("Set indexer io mode to:" + (coordinator ? IndexerIoMode.READ_WRITE : IndexerIoMode.READ_ONLY));
if (coordinator)
{
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/IndexerCacheLoader.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/IndexerCacheLoader.java 2011-03-03 15:27:43 UTC (rev 4051)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/IndexerCacheLoader.java 2011-03-03 15:34:52 UTC (rev 4052)
@@ -28,6 +28,7 @@
import org.jboss.cache.CacheStatus;
import org.jboss.cache.Fqn;
import org.jboss.cache.Modification;
+import org.jboss.cache.config.Configuration.CacheMode;
import java.util.HashMap;
import java.util.List;
@@ -156,10 +157,7 @@
*/
void setMode(IndexerIoMode ioMode)
{
- if (modeHandler != null)
- {
- modeHandler.setMode(ioMode);
- }
+ getModeHandler().setMode(ioMode);
}
/**
@@ -179,7 +177,8 @@
if (modeHandler == null)
{
this.modeHandler =
- new IndexerIoModeHandler(cache.getRPCManager().isCoordinator() ? IndexerIoMode.READ_WRITE
+ new IndexerIoModeHandler(cache.getRPCManager().isCoordinator()
+ || cache.getConfiguration().getCacheMode() == CacheMode.LOCAL ? IndexerIoMode.READ_WRITE
: IndexerIoMode.READ_ONLY);
}
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JBossCacheIndexChangesFilter.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JBossCacheIndexChangesFilter.java 2011-03-03 15:27:43 UTC (rev 4051)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JBossCacheIndexChangesFilter.java 2011-03-03 15:34:52 UTC (rev 4052)
@@ -148,20 +148,6 @@
IndexerSingletonStoreCacheLoader issCacheLoader =
(IndexerSingletonStoreCacheLoader)((CacheSPI)cache).getCacheLoaderManager().getCacheLoader();
- // This code make it possible to use the JBossCacheIndexChangesFilter in
- // a non-cluster environment
- if (cache.getConfiguration().getCacheMode() == CacheMode.LOCAL)
- {
- // Activate the cache loader
- try
- {
- issCacheLoader.activeStatusChanged(true);
- }
- catch (PushStateException e)
- {
- // ignore me;
- }
- }
indexerCacheLoader = (IndexerCacheLoader)issCacheLoader.getCacheLoader();
indexerCacheLoader.register(searchManager, parentSearchManager, handler, parentHandler);
Added: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-indexer.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-indexer.xml (rev 0)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-indexer.xml 2011-03-03 15:34:52 UTC (rev 4052)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1">
+
+ <locking useLockStriping="false" concurrencyLevel="500" lockParentForChildInsertRemove="false"
+ lockAcquisitionTimeout="20000" />
+ <!-- Configure the TransactionManager -->
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup" />
+
+ <!-- Eviction configuration -->
+ <eviction wakeUpInterval="5000">
+ <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" eventQueueSize="1000000">
+ <property name="maxNodes" value="10000" />
+ <property name="minTimeToLive" value="60000" />
+ </default>
+ </eviction>
+
+</jbosscache>
Property changes on: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-indexer.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-jbc.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-jbc.xml 2011-03-03 15:27:43 UTC (rev 4051)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-jbc.xml 2011-03-03 15:34:52 UTC (rev 4052)
@@ -40,11 +40,13 @@
<property name="swap-directory" value="target/temp/swap/ws" />
</properties>
<value-storages>
- <value-storage id="ws" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
+ <value-storage id="ws"
+ class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
<properties>
<property name="path" value="target/temp/values/ws" />
<property name="digest-algo" value="MD5" />
- <property name="vcas-type" value="org.exoplatform.services.jcr.impl.storage.value.cas.JDBCValueContentAddressStorageImpl" />
+ <property name="vcas-type"
+ value="org.exoplatform.services.jcr.impl.storage.value.cas.JDBCValueContentAddressStorageImpl" />
<property name="jdbc-source-name" value="jdbcjcr" />
<property name="jdbc-dialect" value="auto" />
</properties>
@@ -59,25 +61,20 @@
<property name="root-nodetype" value="nt:unstructured" />
</properties>
</initializer>
- <!-- initializer class="org.exoplatform.services.jcr.impl.core.RestoreWorkspaceInitializer">
+ <cache enabled="true"
+ class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
- <property name="restore-path" value="./sv_export_root.xml" />
- <property name="restore-path" value="./src/test/resources/import-export/restore_db1_ws1.xml" />
- </properties>
- </initializer -->
- <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
- <properties>
<property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" />
- <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</cache>
- <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
- <properties>
+ <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
+ <properties>
+ <property name="changesfilter-class"
+ value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
+ <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-indexer.xml" />
<property name="index-dir" value="target/temp/index/db1/ws" />
- <!-- property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JbossCacheIndexChangesFilter" />
- <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" /-->
-
- </properties>
+ </properties>
</query-handler>
<lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl">
<properties>
@@ -91,9 +88,9 @@
<property name="jbosscache-cl-cache.jdbc.node.column" value="node" />
<property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" />
<property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr" />
- <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
- </lock-manager>
+ </lock-manager>
</workspace>
<workspace name="ws1">
@@ -107,7 +104,8 @@
<property name="swap-directory" value="target/temp/swap/ws1" />
</properties>
<value-storages>
- <value-storage id="ws1" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
+ <value-storage id="ws1"
+ class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
<properties>
<property name="path" value="target/temp/values/ws1" />
</properties>
@@ -117,21 +115,27 @@
</value-storage>
</value-storages>
</container>
- <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
+ <cache enabled="true"
+ class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
<property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" />
- <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</cache>
- <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
- <properties>
+ <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
+ <properties>
+ <property name="changesfilter-class"
+ value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
+ <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-indexer.xml" />
<property name="index-dir" value="target/temp/index/db1/ws1" />
- <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
+ <property name="synonymprovider-class"
+ value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
<property name="synonymprovider-config-path" value="../../synonyms.properties" />
<property name="support-highlighting" value="true" />
<property name="indexing-configuration-path" value="../../indexing-configuration.xml" />
<property name="query-class" value="org.exoplatform.services.jcr.impl.core.query.QueryImpl" />
- <property name="spellchecker-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" />
+ <property name="spellchecker-class"
+ value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" />
</properties>
</query-handler>
<lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl">
@@ -146,9 +150,9 @@
<property name="jbosscache-cl-cache.jdbc.node.column" value="node" />
<property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" />
<property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr1" />
- <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
- </lock-manager>
+ </lock-manager>
</workspace>
<workspace name="ws2" lazy-read-threshold="1">
@@ -162,7 +166,8 @@
<property name="swap-directory" value="target/temp/swap/ws2" />
</properties>
<value-storages>
- <value-storage id="ws2" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
+ <value-storage id="ws2"
+ class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
<properties>
<property name="path" value="target/temp/values/ws2" />
</properties>
@@ -172,21 +177,27 @@
</value-storage>
</value-storages>
</container>
- <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
+ <cache enabled="true"
+ class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
<property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" />
- <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</cache>
- <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
- <properties>
+ <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
+ <properties>
+ <property name="changesfilter-class"
+ value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
+ <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-indexer.xml" />
<property name="index-dir" value="target/temp/index/db1/ws2" />
- <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
+ <property name="synonymprovider-class"
+ value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
<property name="synonymprovider-config-path" value="../../synonyms.properties" />
<property name="support-highlighting" value="true" />
<property name="indexing-configuration-path" value="../../indexing-configuration.xml" />
<property name="query-class" value="org.exoplatform.services.jcr.impl.core.query.QueryImpl" />
- <property name="spellchecker-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" />
+ <property name="spellchecker-class"
+ value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" />
</properties>
</query-handler>
<lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl">
@@ -201,11 +212,11 @@
<property name="jbosscache-cl-cache.jdbc.node.column" value="node" />
<property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" />
<property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr2" />
- <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
- </lock-manager>
+ </lock-manager>
</workspace>
-
+
<workspace name="ws3">
<!-- for system storage -->
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
@@ -218,12 +229,12 @@
<property name="swap-directory" value="target/temp/swap/ws3" />
</properties>
<value-storages>
- <!--
- This storage is used to check whether properties are removed
- correctly from each value-storage
- (TestRemoveFromValueStorage.java)
- -->
- <value-storage id="ws3_big" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
+ <!--
+ This storage is used to check whether properties are removed correctly from each value-storage
+ (TestRemoveFromValueStorage.java)
+ -->
+ <value-storage id="ws3_big"
+ class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
<properties>
<property name="path" value="target/temp/values/ws3_big" />
</properties>
@@ -231,11 +242,13 @@
<filter property-type="Binary" min-value-size="1024K" />
</filters>
</value-storage>
- <value-storage id="ws3" class="org.exoplatform.services.jcr.impl.storage.value.fs.CASableTreeFileValueStorage">
+ <value-storage id="ws3"
+ class="org.exoplatform.services.jcr.impl.storage.value.fs.CASableTreeFileValueStorage">
<properties>
<property name="path" value="target/temp/values/ws3" />
<property name="digest-algo" value="MD5" />
- <property name="vcas-type" value="org.exoplatform.services.jcr.impl.storage.value.cas.JDBCValueContentAddressStorageImpl" />
+ <property name="vcas-type"
+ value="org.exoplatform.services.jcr.impl.storage.value.cas.JDBCValueContentAddressStorageImpl" />
<property name="jdbc-source-name" value="jdbcjcr" />
</properties>
<filters>
@@ -249,21 +262,27 @@
<property name="root-nodetype" value="nt:unstructured" />
</properties>
</initializer>
- <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
+ <cache enabled="true"
+ class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
<property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" />
- <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</cache>
- <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
- <properties>
+ <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
+ <properties>
+ <property name="changesfilter-class"
+ value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
+ <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-indexer.xml" />
<property name="index-dir" value="target/temp/index/db1/ws3" />
- <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
+ <property name="synonymprovider-class"
+ value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
<property name="synonymprovider-config-path" value="../../synonyms.properties" />
<property name="support-highlighting" value="true" />
<property name="indexing-configuration-path" value="../../indexing-configuration.xml" />
<property name="query-class" value="org.exoplatform.services.jcr.impl.core.query.QueryImpl" />
- <property name="spellchecker-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" />
+ <property name="spellchecker-class"
+ value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" />
</properties>
</query-handler>
<lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl">
@@ -278,9 +297,9 @@
<property name="jbosscache-cl-cache.jdbc.node.column" value="node" />
<property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" />
<property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr3" />
- <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
- </lock-manager>
+ </lock-manager>
</workspace>
</workspaces>
</repository>
@@ -304,7 +323,8 @@
<property name="swap-directory" value="target/temp/swap/wsdb2" />
</properties>
<value-storages>
- <value-storage id="ws" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
+ <value-storage id="ws"
+ class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
<properties>
<property name="path" value="target/temp/values/wsdb2" />
</properties>
@@ -317,17 +337,22 @@
<initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
<properties>
<property name="root-nodetype" value="nt:unstructured" />
- <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" />
+ <property name="root-permissions"
+ value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" />
</properties>
</initializer>
- <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
+ <cache enabled="true"
+ class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
<property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" />
<property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</cache>
- <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
- <properties>
+ <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
+ <properties>
+ <property name="changesfilter-class"
+ value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
+ <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-indexer.xml" />
<property name="index-dir" value="target/temp/index/db2/ws" />
</properties>
</query-handler>
@@ -345,7 +370,7 @@
<property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcrdb2" />
<property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
- </lock-manager>
+ </lock-manager>
</workspace>
<workspace name="ws1">
@@ -359,7 +384,8 @@
<property name="swap-directory" value="target/temp/swap/ws1db2" />
</properties>
<value-storages>
- <value-storage id="ws1" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
+ <value-storage id="ws1"
+ class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
<properties>
<property name="path" value="target/temp/values/ws1db2" />
</properties>
@@ -375,14 +401,18 @@
<property name="root-permissions" value="any read;any add_node;any set_property;any remove" />
</properties>
</initializer>
- <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
+ <cache enabled="true"
+ class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
<property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" />
<property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</cache>
- <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
- <properties>
+ <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
+ <properties>
+ <property name="changesfilter-class"
+ value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
+ <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-indexer.xml" />
<property name="index-dir" value="target/temp/index/db2/ws1" />
</properties>
</query-handler>
@@ -400,10 +430,10 @@
<property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr1db2" />
<property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
- </lock-manager>
+ </lock-manager>
</workspace>
</workspaces>
- </repository>
+ </repository>
<repository name="db1tck" system-workspace="ws" default-workspace="ws">
<security-domain>exo-domain</security-domain>
@@ -424,7 +454,8 @@
<property name="swap-directory" value="target/temp/swap/wstck" />
</properties>
<value-storages>
- <value-storage id="ws" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
+ <value-storage id="ws"
+ class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
<properties>
<property name="path" value="target/temp/values/wstck" />
</properties>
@@ -437,25 +468,32 @@
<initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
<properties>
<property name="root-nodetype" value="nt:unstructured" />
- <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" />
+ <property name="root-permissions"
+ value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" />
</properties>
</initializer>
- <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
+ <cache enabled="true"
+ class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
<property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" />
<property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</cache>
- <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
- <properties>
+ <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
+ <properties>
+ <property name="changesfilter-class"
+ value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
+ <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-indexer.xml" />
<property name="index-dir" value="target/temp/index/db1tck/ws" />
- <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
+ <property name="synonymprovider-class"
+ value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
<property name="synonymprovider-config-path" value="../../synonyms.properties" />
<property name="support-highlighting" value="true" />
<property name="indexing-configuration-path" value="../../indexing-configuration.xml" />
<property name="query-class" value="org.exoplatform.services.jcr.impl.core.query.QueryImpl" />
<property name="excerptprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.WeightedHTMLExcerpt" />
- <property name="spellchecker-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" />
+ <property name="spellchecker-class"
+ value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" />
</properties>
</query-handler>
<lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl">
@@ -472,7 +510,7 @@
<property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcrtck" />
<property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
- </lock-manager>
+ </lock-manager>
</workspace>
<workspace name="ws1">
@@ -486,7 +524,8 @@
<property name="swap-directory" value="target/temp/swap/ws1tck" />
</properties>
<value-storages>
- <value-storage id="ws1" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
+ <value-storage id="ws1"
+ class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
<properties>
<property name="path" value="target/temp/values/ws1tck" />
</properties>
@@ -499,24 +538,31 @@
<initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
<properties>
<property name="root-nodetype" value="nt:unstructured" />
- <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" />
+ <property name="root-permissions"
+ value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" />
</properties>
</initializer>
- <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
+ <cache enabled="true"
+ class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
<property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" />
<property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</cache>
- <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
- <properties>
+ <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
+ <properties>
+ <property name="changesfilter-class"
+ value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
+ <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-indexer.xml" />
<property name="index-dir" value="target/temp/index/db1tck/ws1" />
- <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
+ <property name="synonymprovider-class"
+ value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
<property name="synonymprovider-config-path" value="../../synonyms.properties" />
<property name="support-highlighting" value="true" />
<property name="indexing-configuration-path" value="../../indexing-configuration.xml" />
<property name="query-class" value="org.exoplatform.services.jcr.impl.core.query.QueryImpl" />
- <property name="spellchecker-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" />
+ <property name="spellchecker-class"
+ value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" />
</properties>
</query-handler>
<lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl">
@@ -533,7 +579,7 @@
<property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr1tck" />
<property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
- </lock-manager>
+ </lock-manager>
</workspace>
<workspace name="ws2">
@@ -547,7 +593,8 @@
<property name="swap-directory" value="target/temp/swap/ws2tck" />
</properties>
<value-storages>
- <value-storage id="ws2" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
+ <value-storage id="ws2"
+ class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
<properties>
<property name="path" value="target/temp/values/ws2tck" />
</properties>
@@ -560,27 +607,34 @@
<initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
<properties>
<property name="root-nodetype" value="nt:unstructured" />
- <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" />
+ <property name="root-permissions"
+ value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" />
</properties>
</initializer>
- <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
+ <cache enabled="true"
+ class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
<property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" />
<property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</cache>
- <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
- <properties>
+ <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
+ <properties>
+ <property name="changesfilter-class"
+ value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
+ <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-indexer.xml" />
<property name="index-dir" value="target/temp/index/db1tck/ws2" />
- <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
+ <property name="synonymprovider-class"
+ value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
<property name="synonymprovider-config-path" value="../../synonyms.properties" />
<property name="support-highlighting" value="true" />
<property name="indexing-configuration-path" value="../../indexing-configuration.xml" />
<property name="query-class" value="org.exoplatform.services.jcr.impl.core.query.QueryImpl" />
- <property name="spellchecker-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" />
- <property name="excerptprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.WeightedHTMLExcerpt"/>
- <property name="extractorPoolSize" value="2"/>
- <property name="extractorTimeout" value="10"/>
+ <property name="spellchecker-class"
+ value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" />
+ <property name="excerptprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.WeightedHTMLExcerpt" />
+ <property name="extractorPoolSize" value="2" />
+ <property name="extractorTimeout" value="10" />
</properties>
</query-handler>
<lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl">
@@ -597,7 +651,7 @@
<property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr2tck" />
<property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
- </lock-manager>
+ </lock-manager>
</workspace>
</workspaces>
</repository>
Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc-jbc.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc-jbc.xml 2011-03-03 15:27:43 UTC (rev 4051)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc-jbc.xml 2011-03-03 15:34:52 UTC (rev 4052)
@@ -40,11 +40,13 @@
<property name="swap-directory" value="target/temp/swap/ws" />
</properties>
<value-storages>
- <value-storage id="ws" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
+ <value-storage id="ws"
+ class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
<properties>
<property name="path" value="target/temp/values/ws" />
<property name="digest-algo" value="MD5" />
- <property name="vcas-type" value="org.exoplatform.services.jcr.impl.storage.value.cas.JDBCValueContentAddressStorageImpl" />
+ <property name="vcas-type"
+ value="org.exoplatform.services.jcr.impl.storage.value.cas.JDBCValueContentAddressStorageImpl" />
<property name="jdbc-source-name" value="jdbcjcr" />
<property name="jdbc-dialect" value="auto" />
</properties>
@@ -59,25 +61,20 @@
<property name="root-nodetype" value="nt:unstructured" />
</properties>
</initializer>
- <!-- initializer class="org.exoplatform.services.jcr.impl.core.RestoreWorkspaceInitializer">
+ <cache enabled="true"
+ class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
- <property name="restore-path" value="./sv_export_root.xml" />
- <property name="restore-path" value="./src/test/resources/import-export/restore_db1_ws1.xml" />
- </properties>
- </initializer -->
- <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
- <properties>
<property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" />
<property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</cache>
- <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
- <properties>
+ <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
+ <properties>
+ <property name="changesfilter-class"
+ value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
+ <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-indexer.xml" />
<property name="index-dir" value="target/temp/index/db1/ws" />
- <!-- property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JbossCacheIndexChangesFilter" />
- <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" /-->
-
- </properties>
+ </properties>
</query-handler>
<lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl">
<properties>
@@ -93,7 +90,7 @@
<property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr" />
<property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
- </lock-manager>
+ </lock-manager>
</workspace>
<workspace name="ws1">
@@ -107,7 +104,8 @@
<property name="swap-directory" value="target/temp/swap/ws1" />
</properties>
<value-storages>
- <value-storage id="ws1" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
+ <value-storage id="ws1"
+ class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
<properties>
<property name="path" value="target/temp/values/ws1" />
</properties>
@@ -117,21 +115,27 @@
</value-storage>
</value-storages>
</container>
- <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
+ <cache enabled="true"
+ class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
<property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" />
<property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</cache>
- <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
- <properties>
+ <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
+ <properties>
+ <property name="changesfilter-class"
+ value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
+ <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-indexer.xml" />
<property name="index-dir" value="target/temp/index/db1/ws1" />
- <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
+ <property name="synonymprovider-class"
+ value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
<property name="synonymprovider-config-path" value="../../synonyms.properties" />
<property name="support-highlighting" value="true" />
<property name="indexing-configuration-path" value="../../indexing-configuration.xml" />
<property name="query-class" value="org.exoplatform.services.jcr.impl.core.query.QueryImpl" />
- <property name="spellchecker-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" />
+ <property name="spellchecker-class"
+ value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" />
</properties>
</query-handler>
<lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl">
@@ -148,7 +152,7 @@
<property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr" />
<property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
- </lock-manager>
+ </lock-manager>
</workspace>
<workspace name="ws2" lazy-read-threshold="1">
@@ -162,7 +166,8 @@
<property name="swap-directory" value="target/temp/swap/ws2" />
</properties>
<value-storages>
- <value-storage id="ws2" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
+ <value-storage id="ws2"
+ class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
<properties>
<property name="path" value="target/temp/values/ws2" />
</properties>
@@ -172,21 +177,27 @@
</value-storage>
</value-storages>
</container>
- <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
+ <cache enabled="true"
+ class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
<property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" />
<property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</cache>
- <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
- <properties>
+ <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
+ <properties>
+ <property name="changesfilter-class"
+ value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
+ <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-indexer.xml" />
<property name="index-dir" value="target/temp/index/db1/ws2" />
- <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
+ <property name="synonymprovider-class"
+ value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
<property name="synonymprovider-config-path" value="../../synonyms.properties" />
<property name="support-highlighting" value="true" />
<property name="indexing-configuration-path" value="../../indexing-configuration.xml" />
<property name="query-class" value="org.exoplatform.services.jcr.impl.core.query.QueryImpl" />
- <property name="spellchecker-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" />
+ <property name="spellchecker-class"
+ value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" />
</properties>
</query-handler>
<lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl">
@@ -203,95 +214,94 @@
<property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr" />
<property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
- </lock-manager>
+ </lock-manager>
</workspace>
-
+
<workspace name="ws3">
- <!-- for system storage -->
- <container
- class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
- <properties>
- <property name="source-name" value="jdbcjcr" />
- <property name="dialect" value="auto" />
- <property name="multi-db" value="false" />
- <property name="update-storage" value="false" />
- <property name="max-buffer-size" value="200k" />
- <property name="swap-directory" value="target/temp/swap/ws3" />
- </properties>
- <value-storages>
- <!--
- This storage is used to check whether properties are removed
- correctly from each value-storage
- (TestRemoveFromValueStorage.java)
- -->
- <value-storage id="ws3_big"
- class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
- <properties>
- <property name="path" value="target/temp/values/ws3_big" />
- </properties>
- <filters>
- <filter property-type="Binary" min-value-size="1024K" />
- </filters>
- </value-storage>
- <value-storage id="ws3"
- class="org.exoplatform.services.jcr.impl.storage.value.fs.CASableTreeFileValueStorage">
- <properties>
- <property name="path" value="target/temp/values/ws3" />
- <property name="digest-algo" value="MD5" />
- <property name="vcas-type"
- value="org.exoplatform.services.jcr.impl.storage.value.cas.JDBCValueContentAddressStorageImpl" />
- <property name="jdbc-source-name" value="jdbcjcr" />
- </properties>
- <filters>
- <filter property-type="Binary" />
- </filters>
- </value-storage>
- </value-storages>
- </container>
- <initializer
- class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
- <properties>
- <property name="root-nodetype" value="nt:unstructured" />
- </properties>
- </initializer>
- <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
- <properties>
- <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" />
- <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
- </properties>
- </cache>
- <query-handler
- class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
- <properties>
- <property name="index-dir" value="target/temp/index/db1/ws3" />
- <property name="synonymprovider-class"
- value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
- <property name="synonymprovider-config-path" value="../../synonyms.properties" />
- <property name="support-highlighting" value="true" />
- <property name="indexing-configuration-path" value="../../indexing-configuration.xml" />
- <property name="query-class"
- value="org.exoplatform.services.jcr.impl.core.query.QueryImpl" />
- <property name="spellchecker-class"
- value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" />
- </properties>
- </query-handler>
- <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl">
- <properties>
- <property name="time-out" value="15m" />
- <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-lock.xml" />
- <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_db1_ws3" />
- <property name="jbosscache-cl-cache.jdbc.table.create" value="true" />
- <property name="jbosscache-cl-cache.jdbc.table.drop" value="false" />
- <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="jcrlocks_db1_ws3_pk" />
- <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" />
- <property name="jbosscache-cl-cache.jdbc.node.column" value="node" />
- <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" />
- <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr" />
- <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
- </properties>
- </lock-manager>
+ <!-- for system storage -->
+ <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
+ <properties>
+ <property name="source-name" value="jdbcjcr" />
+ <property name="dialect" value="auto" />
+ <property name="multi-db" value="false" />
+ <property name="update-storage" value="false" />
+ <property name="max-buffer-size" value="200k" />
+ <property name="swap-directory" value="target/temp/swap/ws3" />
+ </properties>
+ <value-storages>
+ <!--
+ This storage is used to check whether properties are removed correctly from each value-storage
+ (TestRemoveFromValueStorage.java)
+ -->
+ <value-storage id="ws3_big"
+ class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
+ <properties>
+ <property name="path" value="target/temp/values/ws3_big" />
+ </properties>
+ <filters>
+ <filter property-type="Binary" min-value-size="1024K" />
+ </filters>
+ </value-storage>
+ <value-storage id="ws3"
+ class="org.exoplatform.services.jcr.impl.storage.value.fs.CASableTreeFileValueStorage">
+ <properties>
+ <property name="path" value="target/temp/values/ws3" />
+ <property name="digest-algo" value="MD5" />
+ <property name="vcas-type"
+ value="org.exoplatform.services.jcr.impl.storage.value.cas.JDBCValueContentAddressStorageImpl" />
+ <property name="jdbc-source-name" value="jdbcjcr" />
+ </properties>
+ <filters>
+ <filter property-type="Binary" />
+ </filters>
+ </value-storage>
+ </value-storages>
+ </container>
+ <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
+ <properties>
+ <property name="root-nodetype" value="nt:unstructured" />
+ </properties>
+ </initializer>
+ <cache enabled="true"
+ class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
+ <properties>
+ <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
+ </properties>
+ </cache>
+ <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
+ <properties>
+ <property name="changesfilter-class"
+ value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
+ <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-indexer.xml" />
+ <property name="index-dir" value="target/temp/index/db1/ws3" />
+ <property name="synonymprovider-class"
+ value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
+ <property name="synonymprovider-config-path" value="../../synonyms.properties" />
+ <property name="support-highlighting" value="true" />
+ <property name="indexing-configuration-path" value="../../indexing-configuration.xml" />
+ <property name="query-class" value="org.exoplatform.services.jcr.impl.core.query.QueryImpl" />
+ <property name="spellchecker-class"
+ value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" />
+ </properties>
+ </query-handler>
+ <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl">
+ <properties>
+ <property name="time-out" value="15m" />
+ <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-lock.xml" />
+ <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_db1_ws3" />
+ <property name="jbosscache-cl-cache.jdbc.table.create" value="true" />
+ <property name="jbosscache-cl-cache.jdbc.table.drop" value="false" />
+ <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="jcrlocks_db1_ws3_pk" />
+ <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" />
+ <property name="jbosscache-cl-cache.jdbc.node.column" value="node" />
+ <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" />
+ <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
+ </properties>
+ </lock-manager>
- </workspace>
+ </workspace>
</workspaces>
</repository>
@@ -314,7 +324,8 @@
<property name="swap-directory" value="target/temp/swap/wsdb2" />
</properties>
<value-storages>
- <value-storage id="ws" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
+ <value-storage id="ws"
+ class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
<properties>
<property name="path" value="target/temp/values/wsdb2" />
</properties>
@@ -327,17 +338,22 @@
<initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
<properties>
<property name="root-nodetype" value="nt:unstructured" />
- <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" />
+ <property name="root-permissions"
+ value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" />
</properties>
</initializer>
- <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
+ <cache enabled="true"
+ class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
<property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" />
<property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</cache>
- <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
- <properties>
+ <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
+ <properties>
+ <property name="changesfilter-class"
+ value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
+ <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-indexer.xml" />
<property name="index-dir" value="target/temp/index/db2/ws" />
</properties>
</query-handler>
@@ -355,7 +371,7 @@
<property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcrdb2" />
<property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
- </lock-manager>
+ </lock-manager>
</workspace>
<workspace name="ws1">
@@ -369,7 +385,8 @@
<property name="swap-directory" value="target/temp/swap/ws1db2" />
</properties>
<value-storages>
- <value-storage id="ws1" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
+ <value-storage id="ws1"
+ class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
<properties>
<property name="path" value="target/temp/values/ws1db2" />
</properties>
@@ -385,14 +402,18 @@
<property name="root-permissions" value="any read;any add_node;any set_property;any remove" />
</properties>
</initializer>
- <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
+ <cache enabled="true"
+ class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
<property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" />
<property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</cache>
- <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
- <properties>
+ <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
+ <properties>
+ <property name="changesfilter-class"
+ value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
+ <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-indexer.xml" />
<property name="index-dir" value="target/temp/index/db2/ws1" />
</properties>
</query-handler>
@@ -410,10 +431,10 @@
<property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcrdb2" />
<property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
- </lock-manager>
+ </lock-manager>
</workspace>
</workspaces>
- </repository>
+ </repository>
<repository name="db1tck" system-workspace="ws" default-workspace="ws">
<security-domain>exo-domain</security-domain>
@@ -434,7 +455,8 @@
<property name="swap-directory" value="target/temp/swap/wstck" />
</properties>
<value-storages>
- <value-storage id="ws" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
+ <value-storage id="ws"
+ class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
<properties>
<property name="path" value="target/temp/values/wstck" />
</properties>
@@ -447,25 +469,32 @@
<initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
<properties>
<property name="root-nodetype" value="nt:unstructured" />
- <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" />
+ <property name="root-permissions"
+ value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" />
</properties>
</initializer>
- <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
+ <cache enabled="true"
+ class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
<property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" />
<property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</cache>
- <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
- <properties>
+ <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
+ <properties>
+ <property name="changesfilter-class"
+ value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
+ <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-indexer.xml" />
<property name="index-dir" value="target/temp/index/db1tck/ws" />
- <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
+ <property name="synonymprovider-class"
+ value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
<property name="synonymprovider-config-path" value="../../synonyms.properties" />
<property name="support-highlighting" value="true" />
<property name="indexing-configuration-path" value="../../indexing-configuration.xml" />
<property name="query-class" value="org.exoplatform.services.jcr.impl.core.query.QueryImpl" />
<property name="excerptprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.WeightedHTMLExcerpt" />
- <property name="spellchecker-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" />
+ <property name="spellchecker-class"
+ value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" />
</properties>
</query-handler>
<lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl">
@@ -482,7 +511,7 @@
<property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcrtck" />
<property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
- </lock-manager>
+ </lock-manager>
</workspace>
<workspace name="ws1">
@@ -496,7 +525,8 @@
<property name="swap-directory" value="target/temp/swap/ws1tck" />
</properties>
<value-storages>
- <value-storage id="ws1" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
+ <value-storage id="ws1"
+ class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
<properties>
<property name="path" value="target/temp/values/ws1tck" />
</properties>
@@ -509,24 +539,31 @@
<initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
<properties>
<property name="root-nodetype" value="nt:unstructured" />
- <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" />
+ <property name="root-permissions"
+ value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" />
</properties>
</initializer>
- <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
+ <cache enabled="true"
+ class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
<property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" />
<property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</cache>
- <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
- <properties>
+ <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
+ <properties>
+ <property name="changesfilter-class"
+ value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
+ <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-indexer.xml" />
<property name="index-dir" value="target/temp/index/db1tck/ws1" />
- <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
+ <property name="synonymprovider-class"
+ value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
<property name="synonymprovider-config-path" value="../../synonyms.properties" />
<property name="support-highlighting" value="true" />
<property name="indexing-configuration-path" value="../../indexing-configuration.xml" />
<property name="query-class" value="org.exoplatform.services.jcr.impl.core.query.QueryImpl" />
- <property name="spellchecker-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" />
+ <property name="spellchecker-class"
+ value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" />
</properties>
</query-handler>
<lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl">
@@ -543,7 +580,7 @@
<property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcrtck" />
<property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
- </lock-manager>
+ </lock-manager>
</workspace>
<workspace name="ws2">
@@ -557,7 +594,8 @@
<property name="swap-directory" value="target/temp/swap/ws2tck" />
</properties>
<value-storages>
- <value-storage id="ws2" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
+ <value-storage id="ws2"
+ class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
<properties>
<property name="path" value="target/temp/values/ws2tck" />
</properties>
@@ -570,27 +608,34 @@
<initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
<properties>
<property name="root-nodetype" value="nt:unstructured" />
- <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" />
+ <property name="root-permissions"
+ value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" />
</properties>
</initializer>
- <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
+ <cache enabled="true"
+ class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
<property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" />
<property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</cache>
- <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
- <properties>
+ <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
+ <properties>
+ <property name="changesfilter-class"
+ value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
+ <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-indexer.xml" />
<property name="index-dir" value="target/temp/index/db1tck/ws2" />
- <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
+ <property name="synonymprovider-class"
+ value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
<property name="synonymprovider-config-path" value="../../synonyms.properties" />
<property name="support-highlighting" value="true" />
<property name="indexing-configuration-path" value="../../indexing-configuration.xml" />
<property name="query-class" value="org.exoplatform.services.jcr.impl.core.query.QueryImpl" />
- <property name="spellchecker-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" />
- <property name="excerptprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.WeightedHTMLExcerpt"/>
- <property name="extractorPoolSize" value="2"/>
- <property name="extractorTimeout" value="10"/>
+ <property name="spellchecker-class"
+ value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" />
+ <property name="excerptprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.WeightedHTMLExcerpt" />
+ <property name="extractorPoolSize" value="2" />
+ <property name="extractorTimeout" value="10" />
</properties>
</query-handler>
<lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl">
@@ -607,7 +652,7 @@
<property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcrtck" />
<property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
- </lock-manager>
+ </lock-manager>
</workspace>
</workspaces>
</repository>
15 years, 1 month
- 1
- 0
exo-jcr SVN: r4051 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/cas.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-03-03 10:27:43 -0500 (Thu, 03 Mar 2011)
New Revision: 4051
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/cas/JDBCValueContentAddressStorageImpl.java
Log:
EXOJCR-1159: adopt to mysql-connector version to 5.1.14
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/cas/JDBCValueContentAddressStorageImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/cas/JDBCValueContentAddressStorageImpl.java 2011-03-03 15:04:31 UTC (rev 4050)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/cas/JDBCValueContentAddressStorageImpl.java 2011-03-03 15:27:43 UTC (rev 4051)
@@ -18,6 +18,7 @@
*/
package org.exoplatform.services.jcr.impl.storage.value.cas;
+import org.exoplatform.commons.utils.SecurityHelper;
import org.exoplatform.services.jcr.config.RepositoryConfigurationException;
import org.exoplatform.services.jcr.impl.storage.jdbc.DBConstants;
import org.exoplatform.services.jcr.impl.storage.jdbc.DialectDetecter;
@@ -155,38 +156,46 @@
try
{
- dataSource = (DataSource)new InitialContext().lookup(sn);
+ PrivilegedExceptionAction<DataSource> action = new PrivilegedExceptionAction<DataSource>()
+ {
+ public DataSource run() throws Exception
+ {
+ return (DataSource)new InitialContext().lookup(sn);
+ }
+ };
+ try
+ {
+ dataSource = AccessController.doPrivileged(action);
+ }
+ catch (PrivilegedActionException pae)
+ {
+ Throwable cause = pae.getCause();
+ if (cause instanceof NamingException)
+ {
+ throw (NamingException)cause;
+ }
+ else if (cause instanceof RuntimeException)
+ {
+ throw (RuntimeException)cause;
+ }
+ else
+ {
+ throw new RuntimeException(cause);
+ }
+ }
+
+
Connection conn = null;
Statement st = null;
try
{
- PrivilegedExceptionAction<Object> action = new PrivilegedExceptionAction<Object>()
+ conn = SecurityHelper.doPrivilegedSQLExceptionAction(new PrivilegedExceptionAction<Connection>()
{
- public Object run() throws Exception
+ public Connection run() throws Exception
{
return dataSource.getConnection();
}
- };
- try
- {
- conn = (Connection)AccessController.doPrivileged(action);
- }
- catch (PrivilegedActionException pae)
- {
- Throwable cause = pae.getCause();
- if (cause instanceof SQLException)
- {
- throw (SQLException)cause;
- }
- else if (cause instanceof RuntimeException)
- {
- throw (RuntimeException)cause;
- }
- else
- {
- throw new RuntimeException(cause);
- }
- }
+ });
DatabaseMetaData dbMetaData = conn.getMetaData();
15 years, 1 month
- 1
- 0
exo-jcr SVN: r4050 - in jcr/trunk: applications/exo.jcr.applications.jboss and 12 other directories.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-03-03 10:04:31 -0500 (Thu, 03 Mar 2011)
New Revision: 4050
Modified:
jcr/trunk/applications/exo.jcr.applications.jboss/pom.xml
jcr/trunk/applications/exo.jcr.applications.jetty/pom.xml
jcr/trunk/applications/exo.jcr.applications.jonas/pom.xml
jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml
jcr/trunk/exo.jcr.component.core/pom.xml
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/rdbms/DBRestor.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java
jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sql
jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sql
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCConnectionTestBase.java
jcr/trunk/exo.jcr.component.ext/pom.xml
jcr/trunk/exo.jcr.component.ftp/pom.xml
jcr/trunk/exo.jcr.component.webdav/pom.xml
jcr/trunk/exo.jcr.framework.command/pom.xml
jcr/trunk/pom.xml
Log:
EXOJCR-1218: Problem of renaming folders in WebDav
Modified: jcr/trunk/applications/exo.jcr.applications.jboss/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.jboss/pom.xml 2011-03-03 15:02:13 UTC (rev 4049)
+++ jcr/trunk/applications/exo.jcr.applications.jboss/pom.xml 2011-03-03 15:04:31 UTC (rev 4050)
@@ -46,7 +46,7 @@
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>runtime</scope>
</dependency>
Modified: jcr/trunk/applications/exo.jcr.applications.jetty/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.jetty/pom.xml 2011-03-03 15:02:13 UTC (rev 4049)
+++ jcr/trunk/applications/exo.jcr.applications.jetty/pom.xml 2011-03-03 15:04:31 UTC (rev 4050)
@@ -39,7 +39,7 @@
<dependencies>
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>runtime</scope>
</dependency>
Modified: jcr/trunk/applications/exo.jcr.applications.jonas/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.jonas/pom.xml 2011-03-03 15:02:13 UTC (rev 4049)
+++ jcr/trunk/applications/exo.jcr.applications.jonas/pom.xml 2011-03-03 15:04:31 UTC (rev 4050)
@@ -46,7 +46,7 @@
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>runtime</scope>
</dependency>
Modified: jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml 2011-03-03 15:02:13 UTC (rev 4049)
+++ jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml 2011-03-03 15:04:31 UTC (rev 4050)
@@ -40,7 +40,7 @@
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>runtime</scope>
</dependency>
Modified: jcr/trunk/exo.jcr.component.core/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/pom.xml 2011-03-03 15:02:13 UTC (rev 4049)
+++ jcr/trunk/exo.jcr.component.core/pom.xml 2011-03-03 15:04:31 UTC (rev 4050)
@@ -224,7 +224,7 @@
</dependency>
<!-- ===== Databases JDBC support for tests ===== -->
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope>
</dependency>
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/rdbms/DBRestor.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/rdbms/DBRestor.java 2011-03-03 15:02:13 UTC (rev 4049)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/rdbms/DBRestor.java 2011-03-03 15:04:31 UTC (rev 4050)
@@ -358,8 +358,6 @@
names += columnName.get(i) + (i == targetColumnCount - 1 ? "" : ",");
parameters += "?" + (i == targetColumnCount - 1 ? "" : ",");
}
- insertNode =
- jdbcConn.prepareStatement("INSERT INTO " + tableName + " (" + names + ") VALUES(" + parameters + ")");
// set data
outer : while (true)
@@ -401,6 +399,13 @@
stream = len == -1 ? null : spoolInputStream(contentReader, len);
}
+ if (insertNode == null)
+ {
+ insertNode =
+ jdbcConn.prepareStatement("INSERT INTO " + tableName + " (" + names + ") VALUES(" + parameters
+ + ")");
+ }
+
if (restoreRule.getSkipColumnIndex() != null && restoreRule.getSkipColumnIndex() == i)
{
targetIndex--;
@@ -517,10 +522,16 @@
insertNode.setNull(targetIndex + 1, columnType.get(i));
}
}
- insertNode.addBatch();
+ if (insertNode != null)
+ {
+ insertNode.addBatch();
+ }
}
- insertNode.executeBatch();
+ if (insertNode != null)
+ {
+ insertNode.executeBatch();
+ }
}
finally
{
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java 2011-03-03 15:02:13 UTC (rev 4049)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java 2011-03-03 15:04:31 UTC (rev 4050)
@@ -421,7 +421,9 @@
}
catch (RepositoryConfigurationException e)
{
- this.checkSNSNewConnection = DBConstants.DB_DIALECT_SYBASE.equals(this.dbDialect) ? false : true;
+ this.checkSNSNewConnection =
+ DBConstants.DB_DIALECT_SYBASE.equals(this.dbDialect)
+ || DBConstants.DB_DIALECT_HSQLDB.equals(this.dbDialect) ? false : true;
}
// ------------- Values swap config ------------------
Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sql
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sql 2011-03-03 15:02:13 UTC (rev 4049)
+++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sql 2011-03-03 15:04:31 UTC (rev 4050)
@@ -19,7 +19,7 @@
CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_NAME ON JCR_MITEM(I_CLASS, PARENT_ID, NAME, I_INDEX, VERSION DESC);
CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_ID ON JCR_MITEM(I_CLASS, PARENT_ID, ID, VERSION DESC);
CREATE TABLE JCR_MVALUE(
- ID BIGINT generated by default as identity (START WITH 2, INCREMENT BY 1) NOT NULL,
+ ID BIGINT generated by default as identity (START WITH 2) NOT NULL,
DATA VARBINARY(65535),
ORDER_NUM INTEGER NOT NULL,
PROPERTY_ID VARCHAR(96) NOT NULL,
Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sql
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sql 2011-03-03 15:02:13 UTC (rev 4049)
+++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sql 2011-03-03 15:04:31 UTC (rev 4050)
@@ -12,7 +12,7 @@
I_INDEX INTEGER NOT NULL,
N_ORDER_NUM INTEGER,
P_TYPE INTEGER,
- P_MULTIVALUED INTEGER,
+ P_MULTIVALUED BOOLEAN,
CONSTRAINT JCR_PK_SITEM PRIMARY KEY(ID),
CONSTRAINT JCR_FK_SITEM_PARENT FOREIGN KEY(PARENT_ID) REFERENCES JCR_SITEM(ID)
);
@@ -20,7 +20,7 @@
CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION DESC);
CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION DESC);
CREATE TABLE JCR_SVALUE(
- ID BIGINT generated by default as identity (START WITH 2, INCREMENT BY 1) NOT NULL,
+ ID BIGINT generated by default as identity (START WITH 2) NOT NULL,
DATA VARBINARY(65535),
ORDER_NUM INTEGER NOT NULL,
PROPERTY_ID VARCHAR(96) NOT NULL,
Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCConnectionTestBase.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCConnectionTestBase.java 2011-03-03 15:02:13 UTC (rev 4049)
+++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCConnectionTestBase.java 2011-03-03 15:04:31 UTC (rev 4050)
@@ -21,7 +21,6 @@
import org.exoplatform.services.jcr.datamodel.NodeData;
import org.exoplatform.services.jcr.impl.Constants;
import org.exoplatform.services.jcr.impl.dataflow.TransientNodeData;
-import org.exoplatform.services.jcr.impl.storage.jdbc.init.StorageDBInitializer;
import java.io.ByteArrayInputStream;
import java.sql.Connection;
@@ -47,6 +46,7 @@
private Connection connect = null;
+ @Override
protected void tearDown() throws Exception
{
@@ -95,7 +95,7 @@
byte data[] = {5};
ByteArrayInputStream bas = new ByteArrayInputStream(data);
- jdbcConn.addValueData("C", 2, bas, 2, "J");
+ jdbcConn.addValueData("C", 2, bas, bas.available(), "J");
ResultSet rs =
connect.createStatement().executeQuery(
"select * from " + "JCR_" + tableType + "VALUE" + " where PROPERTY_ID='C'");
Modified: jcr/trunk/exo.jcr.component.ext/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.ext/pom.xml 2011-03-03 15:02:13 UTC (rev 4049)
+++ jcr/trunk/exo.jcr.component.ext/pom.xml 2011-03-03 15:04:31 UTC (rev 4050)
@@ -133,7 +133,7 @@
<artifactId>commons-collections</artifactId>
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope>
</dependency>
Modified: jcr/trunk/exo.jcr.component.ftp/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.ftp/pom.xml 2011-03-03 15:02:13 UTC (rev 4049)
+++ jcr/trunk/exo.jcr.component.ftp/pom.xml 2011-03-03 15:04:31 UTC (rev 4050)
@@ -80,7 +80,7 @@
<artifactId>picocontainer</artifactId>
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope>
</dependency>
Modified: jcr/trunk/exo.jcr.component.webdav/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/pom.xml 2011-03-03 15:02:13 UTC (rev 4049)
+++ jcr/trunk/exo.jcr.component.webdav/pom.xml 2011-03-03 15:04:31 UTC (rev 4050)
@@ -95,7 +95,7 @@
<artifactId>slf4j-log4j12</artifactId>
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope>
</dependency>
Modified: jcr/trunk/exo.jcr.framework.command/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.framework.command/pom.xml 2011-03-03 15:02:13 UTC (rev 4049)
+++ jcr/trunk/exo.jcr.framework.command/pom.xml 2011-03-03 15:04:31 UTC (rev 4050)
@@ -77,7 +77,7 @@
<artifactId>slf4j-log4j12</artifactId>
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope>
</dependency>
Modified: jcr/trunk/pom.xml
===================================================================
--- jcr/trunk/pom.xml 2011-03-03 15:02:13 UTC (rev 4049)
+++ jcr/trunk/pom.xml 2011-03-03 15:04:31 UTC (rev 4050)
@@ -339,9 +339,9 @@
<classifier>sources</classifier>
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>1.8.0.7</version>
+ <version>2.0.0</version>
</dependency>
<dependency>
<groupId>org.jgroups</groupId>
15 years, 1 month
- 1
- 0
exo-jcr SVN: r4049 - in core/trunk: exo.core.component.database and 3 other directories.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-03-03 10:02:13 -0500 (Thu, 03 Mar 2011)
New Revision: 4049
Modified:
core/trunk/exo.core.component.database/pom.xml
core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/ExoDatasource.java
core/trunk/exo.core.component.database/src/test/java/org/exoplatform/services/database/TestDatabaseService.java
core/trunk/packaging/module/src/main/javascript/core.packaging.module.js
core/trunk/pom.xml
Log:
EXOJCR-1159: update libraries
Modified: core/trunk/exo.core.component.database/pom.xml
===================================================================
--- core/trunk/exo.core.component.database/pom.xml 2011-03-03 12:51:45 UTC (rev 4048)
+++ core/trunk/exo.core.component.database/pom.xml 2011-03-03 15:02:13 UTC (rev 4049)
@@ -74,7 +74,7 @@
<artifactId>jta</artifactId>
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>runtime</scope>
</dependency>
Modified: core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/ExoDatasource.java
===================================================================
--- core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/ExoDatasource.java 2011-03-03 12:51:45 UTC (rev 4048)
+++ core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/ExoDatasource.java 2011-03-03 15:02:13 UTC (rev 4049)
@@ -18,10 +18,13 @@
*/
package org.exoplatform.services.database;
+import org.exoplatform.commons.utils.SecurityHelper;
import org.exoplatform.services.database.table.IDGenerator;
+import java.security.PrivilegedExceptionAction;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
+import java.sql.SQLException;
import javax.sql.DataSource;
@@ -84,10 +87,18 @@
* @param ds
* @throws Exception
*/
- public ExoDatasource(DataSource ds) throws Exception
+ public ExoDatasource(final DataSource ds) throws Exception
{
xaDatasource_ = ds;
- DatabaseMetaData metaData = ds.getConnection().getMetaData();
+ DatabaseMetaData metaData =
+ SecurityHelper.doPrivilegedSQLExceptionAction(new PrivilegedExceptionAction<DatabaseMetaData>()
+ {
+ public DatabaseMetaData run() throws SQLException
+ {
+ return ds.getConnection().getMetaData();
+ }
+ });
+
databaseName_ = metaData.getDatabaseProductName();
databaseVersion_ = metaData.getDatabaseProductVersion();
Modified: core/trunk/exo.core.component.database/src/test/java/org/exoplatform/services/database/TestDatabaseService.java
===================================================================
--- core/trunk/exo.core.component.database/src/test/java/org/exoplatform/services/database/TestDatabaseService.java 2011-03-03 12:51:45 UTC (rev 4048)
+++ core/trunk/exo.core.component.database/src/test/java/org/exoplatform/services/database/TestDatabaseService.java 2011-03-03 15:02:13 UTC (rev 4049)
@@ -64,7 +64,7 @@
try
{
s = conn.createStatement();
- s.addBatch("create table test (name varchar, data varchar)");
+ s.addBatch("create table test (name varchar(25), data varchar(25))");
s.addBatch("insert into test values('name1', 'value1')");
s.executeBatch();
s.close();
Modified: core/trunk/packaging/module/src/main/javascript/core.packaging.module.js
===================================================================
--- core/trunk/packaging/module/src/main/javascript/core.packaging.module.js 2011-03-03 12:51:45 UTC (rev 4048)
+++ core/trunk/packaging/module/src/main/javascript/core.packaging.module.js 2011-03-03 15:02:13 UTC (rev 4049)
@@ -33,7 +33,7 @@
//addDependency(new Project("jotm", "jotm_jrmp_stubs", "jar", "2.0.10")).
//addDependency(new Project("jotm", "jotm", "jar", "2.0.10")).
//addDependency(new Project("howl", "howl-logger", "jar", "0.1.11")).
- addDependency(new Project("hsqldb", "hsqldb", "jar", "1.8.0.7")).
+ addDependency(new Project("org.hsqldb", "hsqldb", "jar", "2.0.0")).
addDependency(new Project("javax.resource", "connector-api", "jar", "1.5"));
module.component.documents =
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2011-03-03 12:51:45 UTC (rev 4048)
+++ core/trunk/pom.xml 2011-03-03 15:02:13 UTC (rev 4049)
@@ -172,9 +172,9 @@
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>1.8.0.7</version>
+ <version>2.0.0</version>
</dependency>
<dependency>
15 years, 1 month
- 1
- 0
exo-jcr SVN: r4048 - kernel/trunk/exo.kernel.container/src/main/resources and 2 other directories.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2011-03-03 07:51:45 -0500 (Thu, 03 Mar 2011)
New Revision: 4048
Added:
kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/configuration/TestImportWithProperties.java
kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/import-with-parameter-configuration.xml
Modified:
jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel/container-configuration.xml
kernel/trunk/exo.kernel.container/src/main/resources/binding.xml
Log:
EXOJCR-1220: Allow to use variables to define any values in the configuration file
Now we can use variables everywhere in the configuration files
Modified: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel/container-configuration.xml
===================================================================
--- jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel/container-configuration.xml 2011-03-03 10:04:47 UTC (rev 4047)
+++ jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel/container-configuration.xml 2011-03-03 12:51:45 UTC (rev 4048)
@@ -30,19 +30,37 @@
<title>Kernel configuration namespace</title>
<para>To be effective, the namespace URI
- <uri>http://www.exoplaform.org/xml/ns/kernel_1_1.xsd</uri> must be target
+ <uri>http://www.exoplaform.org/xml/ns/kernel_1_2.xsd</uri> must be target
namespace of the XML configuration file.</para>
- <programlisting><xsd:schema
- targetNamespace="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
- xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified"
- attributeFormDefault="unqualified"
- version="1.0">
+ <programlisting><configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd http://www.exoplaform.org/xml/ns/kernel_1_2.xsd"
+ xmlns="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd">
+
...
-</xsd:schema></programlisting>
+</configuration></programlisting>
+
+ <note>
+ <para>Any values in the configuration files can be created thanks to
+ variables since the eXo kernel resolves them, for example the following
+ configuration will be well interpreted:</para>
+
+ <programlisting><configuration
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd http://www.exoplaform.org/xml/ns/kernel_1_2.xsd"
+ xmlns="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd">
+
+ <import>${db.configuration.path}/db.xml</import>
+ <import>${java.io.tmpdir}/bindfile.xml</import>
+ <import>simple.xml</import>
+
+</configuration></programlisting>
+
+ <para>The variables that are supported, are System properties and
+ variables that are specific to your portal container, see next chapters
+ for more details.</para>
+ </note>
</section>
<section>
Modified: kernel/trunk/exo.kernel.container/src/main/resources/binding.xml
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/resources/binding.xml 2011-03-03 10:04:47 UTC (rev 4047)
+++ kernel/trunk/exo.kernel.container/src/main/resources/binding.xml 2011-03-03 12:51:45 UTC (rev 4048)
@@ -20,7 +20,7 @@
-->
<binding>
<!-- the default deserializer to use for String -->
- <format type="java.lang.String" deserializer="org.exoplatform.container.xml.Deserializer.cleanString"/>
+ <format type="java.lang.String" deserializer="org.exoplatform.container.xml.Deserializer.resolveString"/>
<!-- xml object mapping -->
<mapping class="org.exoplatform.xml.object.XMLBaseObject" abstract="true" label="base-object">
Added: kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/configuration/TestImportWithProperties.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/configuration/TestImportWithProperties.java (rev 0)
+++ kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/configuration/TestImportWithProperties.java 2011-03-03 12:51:45 UTC (rev 4048)
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2011 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.container.configuration;
+
+import org.exoplatform.container.xml.Configuration;
+
+/**
+ * Test usage of system properties in import configuration declaration
+ */
+public class TestImportWithProperties extends AbstractProfileTest
+{
+ private String oldValue;
+
+ /**
+ * @see junit.framework.TestCase#setUp()
+ */
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ oldValue = System.getProperty("db.configuration.path");
+ System.clearProperty("db.configuration.path");
+ }
+
+ /**
+ * @see junit.framework.TestCase#tearDown()
+ */
+ @Override
+ protected void tearDown() throws Exception
+ {
+ if (oldValue == null)
+ {
+ System.clearProperty("db.configuration.path");
+ }
+ else
+ {
+ System.setProperty("db.configuration.path", oldValue);
+ }
+ super.tearDown();
+ }
+
+ /**
+ * Test if used system property not defined. String ${db.configuration.path}
+ * should not be replaced.
+ *
+ * @throws Exception
+ */
+ public void testWithNoPropertyDefined() throws Exception
+ {
+ assertNull(System.getProperty("db.configuration.path"));
+ Configuration config = getConfiguration("import-with-parameter-configuration.xml");
+ assertEquals(3, config.getImports().size());
+ assertEquals("${db.configuration.path}/db.xml", config.getImports().get(0));
+ assertEquals(System.getProperty("java.io.tmpdir") + "/bindfile.xml", config.getImports().get(1));
+ assertEquals("simple.xml", config.getImports().get(2));
+
+ }
+
+ /**
+ * Test if system property t defined. String ${db.configuration.path} should
+ * be replaced with property value.
+ *
+ * @throws Exception
+ */
+ public void testWithPropertyDefined() throws Exception
+ {
+ System.setProperty("db.configuration.path", "/home/admin/db");
+ assertNotNull(System.getProperty("db.configuration.path"));
+ Configuration config = getConfiguration("import-with-parameter-configuration.xml");
+ assertEquals(3, config.getImports().size());
+ assertEquals("/home/admin/db/db.xml", config.getImports().get(0));
+ assertEquals(System.getProperty("java.io.tmpdir") + "/bindfile.xml", config.getImports().get(1));
+ assertEquals("simple.xml", config.getImports().get(2));
+
+ }
+}
Added: kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/import-with-parameter-configuration.xml
===================================================================
--- kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/import-with-parameter-configuration.xml (rev 0)
+++ kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/configuration/import-with-parameter-configuration.xml 2011-03-03 12:51:45 UTC (rev 4048)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+ 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.
+
+-->
+<configuration
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+ xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
+
+ <import>${db.configuration.path}/db.xml</import>
+ <import>${java.io.tmpdir}/bindfile.xml</import>
+ <import>simple.xml</import>
+
+
+</configuration>
\ No newline at end of file
15 years, 1 month
- 1
- 0