[exo-jcr-commits] exo-jcr SVN: r1614 - in jcr/trunk/exo.jcr.component.core/src/test/resources/conf: standalone and 1 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Thu Jan 28 10:45:01 EST 2010


Author: nzamosenchuk
Date: 2010-01-28 10:45:00 -0500 (Thu, 28 Jan 2010)
New Revision: 1614

Added:
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/readme.txt
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-data.xml
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-indexer.xml
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-lock.xml
Removed:
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/readme.txt
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-data.tpl.xml
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-indexer.tpl.xml
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-lock.tpl.xml
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/templateBased/
Modified:
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-configuration.xml
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jcr-config.xml
Log:
EXOJCR-434: move templateBased configuration.

Copied: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased (from rev 1608, jcr/trunk/exo.jcr.component.core/src/test/resources/conf/templateBased)

Deleted: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/readme.txt
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/templateBased/readme.txt	2010-01-28 14:13:25 UTC (rev 1608)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/readme.txt	2010-01-28 15:45:00 UTC (rev 1614)
@@ -1,43 +0,0 @@
-INFO
-
-This is new, template-based configuration of JCR with JBossCache. 
-This configuration uses MySQL database (sql script for creating
-and deleting all needed DBs is shown below).
-
-Currently JBossCache cluster-groups use the same "udp.xml" config
-so lots of warnings can appear on system out from JGroups.
-
-TEMPLATING
-Configuration templates should use variables like:
-"jbosscache-*" or "jgroups-configuration" any other wouldn't be 
-inserted into the template.
-
-
-
-DROP  DATABASE IF EXISTS portal ;
-create database portal default charset latin1 collate latin1_general_cs;
-DROP  DATABASE IF EXISTS jcr ;
-create database jcr default charset latin1 collate latin1_general_cs;
-
-DROP  DATABASE IF EXISTS jcr2 ;
-create database jcr2 default charset latin1 collate latin1_general_cs;
-DROP  DATABASE IF EXISTS jcr3 ;
-create database jcr3 default charset latin1 collate latin1_general_cs;
-
-DROP  DATABASE IF EXISTS jcrtest ;
-create database jcrtest default charset latin1 collate latin1_general_cs;
-DROP  DATABASE IF EXISTS portaltck ;
-create database portaltck default charset latin1 collate latin1_general_cs;
-
-DROP  DATABASE IF EXISTS jcrtck ;
-create database jcrtck default charset latin1 collate latin1_general_cs;
-DROP  DATABASE IF EXISTS jcr2tck;
-create database jcr2tck default charset latin1 collate latin1_general_cs;
-
-DROP  DATABASE IF EXISTS jdbcjcr2export1 ;
-create database jdbcjcr2export1 default charset latin1 collate latin1_general_cs;
-DROP  DATABASE IF EXISTS jdbcjcr2export2 ;
-create database jdbcjcr2export2 default charset latin1 collate latin1_general_cs;
-
-DROP  DATABASE IF EXISTS jdbcjcr2export3 ;
-create database jdbcjcr2export3 default charset latin1 collate latin1_general_cs;

Copied: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/readme.txt (from rev 1611, jcr/trunk/exo.jcr.component.core/src/test/resources/conf/templateBased/readme.txt)
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/readme.txt	                        (rev 0)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/readme.txt	2010-01-28 15:45:00 UTC (rev 1614)
@@ -0,0 +1,42 @@
+DEPRECATED, use multiplexer-based configuration!
+
+INFO
+
+This is new, template-based configuration of JCR with JBossCache. 
+This configuration uses MySQL database (sql script for creating
+and deleting all needed DBs is shown below).
+
+TEMPLATING
+Configuration templates should use variables like:
+"jbosscache-*" or "jgroups-configuration" any other wouldn't be 
+inserted into the template.
+
+
+
+DROP  DATABASE IF EXISTS portal ;
+create database portal default charset latin1 collate latin1_general_cs;
+DROP  DATABASE IF EXISTS jcr ;
+create database jcr default charset latin1 collate latin1_general_cs;
+
+DROP  DATABASE IF EXISTS jcr2 ;
+create database jcr2 default charset latin1 collate latin1_general_cs;
+DROP  DATABASE IF EXISTS jcr3 ;
+create database jcr3 default charset latin1 collate latin1_general_cs;
+
+DROP  DATABASE IF EXISTS jcrtest ;
+create database jcrtest default charset latin1 collate latin1_general_cs;
+DROP  DATABASE IF EXISTS portaltck ;
+create database portaltck default charset latin1 collate latin1_general_cs;
+
+DROP  DATABASE IF EXISTS jcrtck ;
+create database jcrtck default charset latin1 collate latin1_general_cs;
+DROP  DATABASE IF EXISTS jcr2tck;
+create database jcr2tck default charset latin1 collate latin1_general_cs;
+
+DROP  DATABASE IF EXISTS jdbcjcr2export1 ;
+create database jdbcjcr2export1 default charset latin1 collate latin1_general_cs;
+DROP  DATABASE IF EXISTS jdbcjcr2export2 ;
+create database jdbcjcr2export2 default charset latin1 collate latin1_general_cs;
+
+DROP  DATABASE IF EXISTS jdbcjcr2export3 ;
+create database jdbcjcr2export3 default charset latin1 collate latin1_general_cs;

Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-configuration.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/templateBased/test-configuration.xml	2010-01-28 14:13:25 UTC (rev 1608)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-configuration.xml	2010-01-28 15:45:00 UTC (rev 1614)
@@ -171,7 +171,7 @@
       <value-param>
         <name>conf-path</name>
         <description>JCR configuration file</description>
-        <value>jar:/conf/templateBased/test-jcr-config.xml</value>
+        <value>jar:/conf/standalone/templateBased/test-jcr-config.xml</value>
       </value-param>
       <!-- properties-param>
         <name>working-conf</name>

Deleted: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-data.tpl.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/templateBased/test-jbosscache-data.tpl.xml	2010-01-28 14:13:25 UTC (rev 1608)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-data.tpl.xml	2010-01-28 15:45:00 UTC (rev 1614)
@@ -1,23 +0,0 @@
-<?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="50000"
-		lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
-
-	<clustering mode="replication" clusterName="${jbosscache-cluster-name}">
-		<stateRetrieval timeout="20000" fetchInMemoryState="false" />
-		<jgroupsConfig configFile="${jgroups-configuration}" />
-		<sync />
-	</clustering>
-
-	<!-- Eviction configuration -->
-	<eviction wakeUpInterval="5000">
-		<default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm"
-			actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy"
-			eventQueueSize="1000000">
-			<property name="maxNodes" value="10000" />
-			<property name="timeToLive" value="120000" />
-		</default>
-	</eviction>
-</jbosscache>
\ No newline at end of file

Copied: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-data.xml (from rev 1608, jcr/trunk/exo.jcr.component.core/src/test/resources/conf/templateBased/test-jbosscache-data.tpl.xml)
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-data.xml	                        (rev 0)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-data.xml	2010-01-28 15:45:00 UTC (rev 1614)
@@ -0,0 +1,23 @@
+<?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="50000"
+		lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
+
+	<clustering mode="replication" clusterName="${jbosscache-cluster-name}">
+		<stateRetrieval timeout="20000" fetchInMemoryState="false" />
+		<jgroupsConfig configFile="${jgroups-configuration}" />
+		<sync />
+	</clustering>
+
+	<!-- Eviction configuration -->
+	<eviction wakeUpInterval="5000">
+		<default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm"
+			actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy"
+			eventQueueSize="1000000">
+			<property name="maxNodes" value="10000" />
+			<property name="timeToLive" value="120000" />
+		</default>
+	</eviction>
+</jbosscache>
\ No newline at end of file


Property changes on: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-data.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Deleted: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-indexer.tpl.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/templateBased/test-jbosscache-indexer.tpl.xml	2010-01-28 14:13:25 UTC (rev 1608)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-indexer.tpl.xml	2010-01-28 15:45:00 UTC (rev 1614)
@@ -1,25 +0,0 @@
-<?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="50000"
-		lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
-	<!-- Configure the TransactionManager -->
-	<transaction
-		transactionManagerLookupClass="org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup" />
-
-	<clustering mode="replication" clusterName="${jbosscache-cluster-name}">
-		<stateRetrieval timeout="20000" fetchInMemoryState="false" />
-		<jgroupsConfig configFile="${jgroups-configuration}" />
-		<sync />
-	</clustering>
-	<!-- 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>

Copied: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-indexer.xml (from rev 1608, jcr/trunk/exo.jcr.component.core/src/test/resources/conf/templateBased/test-jbosscache-indexer.tpl.xml)
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-indexer.xml	                        (rev 0)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-indexer.xml	2010-01-28 15:45:00 UTC (rev 1614)
@@ -0,0 +1,25 @@
+<?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="50000"
+		lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
+	<!-- Configure the TransactionManager -->
+	<transaction
+		transactionManagerLookupClass="org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup" />
+
+	<clustering mode="replication" clusterName="${jbosscache-cluster-name}">
+		<stateRetrieval timeout="20000" fetchInMemoryState="false" />
+		<jgroupsConfig configFile="${jgroups-configuration}" />
+		<sync />
+	</clustering>
+	<!-- 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/templateBased/test-jbosscache-indexer.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Deleted: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-lock.tpl.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/templateBased/test-jbosscache-lock.tpl.xml	2010-01-28 14:13:25 UTC (rev 1608)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-lock.tpl.xml	2010-01-28 15:45:00 UTC (rev 1614)
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns="urn:jboss:jbosscache-core:config:3.2">
-
-	<locking useLockStriping="false" concurrencyLevel="50000"
-		lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
-
-	<clustering mode="replication" clusterName="${jbosscache-cluster-name}">
-		<stateRetrieval timeout="20000" fetchInMemoryState="false" />
-		<jgroupsConfig configFile="${jgroups-configuration}" />
-		<sync />
-	</clustering>
-
-	<loaders passivation="false" shared="true">
-		<preload>
-			<node fqn="/" />
-		</preload>
-		<!--
-			For another cache-loader class you should use another template with
-			cache-loader specific parameters
-		-->
-		<loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false"
-			fetchPersistentState="false" ignoreModifications="false"
-			purgeOnStartup="false">
-			<properties>
-				cache.jdbc.table.name=${jbosscache-cl-cache.jdbc.table.name}
-				cache.jdbc.table.create=${jbosscache-cl-cache.jdbc.table.create}
-				cache.jdbc.table.drop=${jbosscache-cl-cache.jdbc.table.drop}
-				cache.jdbc.table.primarykey=${jbosscache-cl-cache.jdbc.table.primarykey}
-				cache.jdbc.fqn.column=${jbosscache-cl-cache.jdbc.fqn.column}
-				cache.jdbc.fqn.type=${jbosscache-cl-cache.jdbc.fqn.type}
-				cache.jdbc.node.column=${jbosscache-cl-cache.jdbc.node.column}
-				cache.jdbc.node.type=${jbosscache-cl-cache.jdbc.node.type}
-				cache.jdbc.parent.column=${jbosscache-cl-cache.jdbc.parent.column}
-				cache.jdbc.datasource=${jbosscache-cl-cache.jdbc.datasource}
-			</properties>
-		</loader>
-
-	</loaders>
-
-</jbosscache>

Copied: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-lock.xml (from rev 1608, jcr/trunk/exo.jcr.component.core/src/test/resources/conf/templateBased/test-jbosscache-lock.tpl.xml)
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-lock.xml	                        (rev 0)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-lock.xml	2010-01-28 15:45:00 UTC (rev 1614)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns="urn:jboss:jbosscache-core:config:3.2">
+
+	<locking useLockStriping="false" concurrencyLevel="50000"
+		lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
+
+	<clustering mode="replication" clusterName="${jbosscache-cluster-name}">
+		<stateRetrieval timeout="20000" fetchInMemoryState="false" />
+		<jgroupsConfig configFile="${jgroups-configuration}" />
+		<sync />
+	</clustering>
+
+	<loaders passivation="false" shared="true">
+		<preload>
+			<node fqn="/" />
+		</preload>
+		<!--
+			For another cache-loader class you should use another template with
+			cache-loader specific parameters
+		-->
+		<loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false"
+			fetchPersistentState="false" ignoreModifications="false"
+			purgeOnStartup="false">
+			<properties>
+				cache.jdbc.table.name=${jbosscache-cl-cache.jdbc.table.name}
+				cache.jdbc.table.create=${jbosscache-cl-cache.jdbc.table.create}
+				cache.jdbc.table.drop=${jbosscache-cl-cache.jdbc.table.drop}
+				cache.jdbc.table.primarykey=${jbosscache-cl-cache.jdbc.table.primarykey}
+				cache.jdbc.fqn.column=${jbosscache-cl-cache.jdbc.fqn.column}
+				cache.jdbc.fqn.type=${jbosscache-cl-cache.jdbc.fqn.type}
+				cache.jdbc.node.column=${jbosscache-cl-cache.jdbc.node.column}
+				cache.jdbc.node.type=${jbosscache-cl-cache.jdbc.node.type}
+				cache.jdbc.parent.column=${jbosscache-cl-cache.jdbc.parent.column}
+				cache.jdbc.datasource=${jbosscache-cl-cache.jdbc.datasource}
+			</properties>
+		</loader>
+
+	</loaders>
+
+</jbosscache>


Property changes on: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-lock.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jcr-config.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/templateBased/test-jcr-config.xml	2010-01-28 14:13:25 UTC (rev 1608)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jcr-config.xml	2010-01-28 15:45:00 UTC (rev 1614)
@@ -68,8 +68,8 @@
 -->
                <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
                   <properties>
-                     <property name="jbosscache-configuration" value="conf/templateBased/test-jbosscache-data.tpl.xml" />
-                     <property name="jgroups-configuration" value="conf/templateBased/tcp-data-db1-ws.xml" />
+                     <property name="jbosscache-configuration" value="conf/standalone/templateBased/test-jbosscache-data.xml" />
+                     <property name="jgroups-configuration" value="conf/standalone/templateBased/tcp-data-db1-ws.xml" />
                      <property name="jbosscache-cluster-name" value="JCR-cluster-db1-ws" />
                   </properties>
                </cache>
@@ -77,8 +77,8 @@
                   <properties>
                      <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/templateBased/test-jbosscache-indexer.tpl.xml" />
-                     <property name="jgroups-configuration" value="conf/templateBased/tcp-index-db1-ws.xml" />
+                     <property name="jbosscache-configuration" value="conf/standalone/templateBased/test-jbosscache-indexer.xml" />
+                     <property name="jgroups-configuration" value="conf/standalone/templateBased/tcp-index-db1-ws.xml" />
                      <property name="jbosscache-cluster-name" value="JCR-cluster-indexer-db1-ws" />
                      <property name="max-volatile-time" value="60" />
                    </properties>
@@ -86,8 +86,8 @@
                <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
                   <properties>
                      <property name="time-out" value="15m" />
-                     <property name="jbosscache-configuration" value="conf/templateBased/test-jbosscache-lock.tpl.xml" />
-                     <property name="jgroups-configuration" value="conf/templateBased/tcp-lock-db1-ws.xml" />
+                     <property name="jbosscache-configuration" value="conf/standalone/templateBased/test-jbosscache-lock.xml" />
+                     <property name="jgroups-configuration" value="conf/standalone/templateBased/tcp-lock-db1-ws.xml" />
                      <property name="jbosscache-cluster-name" value="JCR-cluster-locks-db1-ws" />
                      <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_db1_ws"/>
                      <property name="jbosscache-cl-cache.jdbc.table.create" value="true"/>
@@ -126,8 +126,8 @@
                </container>
                <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
                   <properties>
-                     <property name="jbosscache-configuration" value="conf/templateBased/test-jbosscache-data.tpl.xml" />
-                     <property name="jgroups-configuration" value="conf/templateBased/tcp-data-db1-ws1.xml" />
+                     <property name="jbosscache-configuration" value="conf/standalone/templateBased/test-jbosscache-data.xml" />
+                     <property name="jgroups-configuration" value="conf/standalone/templateBased/tcp-data-db1-ws1.xml" />
                      <property name="jbosscache-cluster-name" value="JCR-cluster-db1-ws1" />
                   </properties>
                </cache>
@@ -135,15 +135,15 @@
                   <properties>
                      <property name="index-dir" value="target/temp/index/db1/ws1" />
                      <property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
-                     <property name="jbosscache-configuration" value="conf/templateBased/test-jbosscache-indexer.tpl.xml" />
-                     <property name="jgroups-configuration" value="conf/templateBased/tcp-index-db1-ws1.xml" />
+                     <property name="jbosscache-configuration" value="conf/standalone/templateBased/test-jbosscache-indexer.xml" />
+                     <property name="jgroups-configuration" value="conf/standalone/templateBased/tcp-index-db1-ws1.xml" />
                      <property name="jbosscache-cluster-name" value="JCR-cluster-indexer-db1-ws1" />
                      <property name="max-volatile-time" value="60" />
                      
                      <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
-                     <property name="synonymprovider-config-path" value="../../synonyms.properties" />
+                     <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="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" />
                      
@@ -152,8 +152,8 @@
                <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
                   <properties>
                      <property name="time-out" value="15m" />
-                     <property name="jbosscache-configuration" value="conf/templateBased/test-jbosscache-lock.tpl.xml" />
-                     <property name="jgroups-configuration" value="conf/templateBased/tcp-lock-db1-ws1.xml" />
+                     <property name="jbosscache-configuration" value="conf/standalone/templateBased/test-jbosscache-lock.xml" />
+                     <property name="jgroups-configuration" value="conf/standalone/templateBased/tcp-lock-db1-ws1.xml" />
                      <property name="jbosscache-cluster-name" value="JCR-cluster-locks-db1-ws1" />
                      <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_db1_ws1"/>
                      <property name="jbosscache-cl-cache.jdbc.table.create" value="true"/>
@@ -191,8 +191,8 @@
                </container>
                <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
                   <properties>
-                     <property name="jbosscache-configuration" value="conf/templateBased/test-jbosscache-data.tpl.xml" />
-                     <property name="jgroups-configuration" value="conf/templateBased/tcp-data-db1-ws2.xml" />
+                     <property name="jbosscache-configuration" value="conf/standalone/templateBased/test-jbosscache-data.xml" />
+                     <property name="jgroups-configuration" value="conf/standalone/templateBased/tcp-data-db1-ws2.xml" />
                      <property name="jbosscache-cluster-name" value="JCR-cluster-db1-ws2" />
                   </properties>
                </cache>
@@ -200,15 +200,15 @@
                   <properties>
                      <property name="index-dir" value="target/temp/index/db1/ws2" />
                      <property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
-                     <property name="jbosscache-configuration" value="conf/templateBased/test-jbosscache-indexer.tpl.xml" />
-                     <property name="jgroups-configuration" value="conf/templateBased/tcp-index-db1-ws2.xml" />
+                     <property name="jbosscache-configuration" value="conf/standalone/templateBased/test-jbosscache-indexer.xml" />
+                     <property name="jgroups-configuration" value="conf/standalone/templateBased/tcp-index-db1-ws2.xml" />
                      <property name="jbosscache-cluster-name" value="JCR-cluster-indexer-db1-ws2" />
                      <property name="max-volatile-time" value="60" />
                      
                      <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
-                     <property name="synonymprovider-config-path" value="../../synonyms.properties" />
+                     <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="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" />
                      
@@ -217,8 +217,8 @@
                <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
                   <properties>
                      <property name="time-out" value="15m" />
-                     <property name="jbosscache-configuration" value="conf/templateBased/test-jbosscache-lock.tpl.xml" />
-                     <property name="jgroups-configuration" value="conf/templateBased/tcp-lock-db1-ws2.xml" />
+                     <property name="jbosscache-configuration" value="conf/standalone/templateBased/test-jbosscache-lock.xml" />
+                     <property name="jgroups-configuration" value="conf/standalone/templateBased/tcp-lock-db1-ws2.xml" />
                      <property name="jbosscache-cluster-name" value="JCR-cluster-locks-db1-ws2" />
                      <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_db1_ws2"/>
                      <property name="jbosscache-cl-cache.jdbc.table.create" value="true"/>
@@ -275,8 +275,8 @@
                </container>
                <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
                   <properties>
-                     <property name="jbosscache-configuration" value="conf/templateBased/test-jbosscache-data.tpl.xml" />
-                     <property name="jgroups-configuration" value="conf/templateBased/tcp-data-db1-ws3.xml" />
+                     <property name="jbosscache-configuration" value="conf/standalone/templateBased/test-jbosscache-data.xml" />
+                     <property name="jgroups-configuration" value="conf/standalone/templateBased/tcp-data-db1-ws3.xml" />
                      <property name="jbosscache-cluster-name" value="JCR-cluster-db1-ws3" />
                   </properties>
                </cache>
@@ -284,15 +284,15 @@
                   <properties>
                      <property name="index-dir" value="target/temp/index/db1/ws3" />
                      <property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
-                     <property name="jbosscache-configuration" value="conf/templateBased/test-jbosscache-indexer.tpl.xml" />
-                     <property name="jgroups-configuration" value="conf/templateBased/tcp-index-db1-ws3.xml" />
+                     <property name="jbosscache-configuration" value="conf/standalone/templateBased/test-jbosscache-indexer.xml" />
+                     <property name="jgroups-configuration" value="conf/standalone/templateBased/tcp-index-db1-ws3.xml" />
                      <property name="jbosscache-cluster-name" value="JCR-cluster-indexer-db1-ws3" />
                      <property name="max-volatile-time" value="60" />
                      
                      <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
-                     <property name="synonymprovider-config-path" value="../../synonyms.properties" />
+                     <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="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" />
                      
@@ -301,8 +301,8 @@
                <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
                   <properties>
                      <property name="time-out" value="15m" />
-                     <property name="jbosscache-configuration" value="conf/templateBased/test-jbosscache-lock.tpl.xml" />
-                     <property name="jgroups-configuration" value="conf/templateBased/tcp-lock-db1-ws3.xml" />
+                     <property name="jbosscache-configuration" value="conf/standalone/templateBased/test-jbosscache-lock.xml" />
+                     <property name="jgroups-configuration" value="conf/standalone/templateBased/tcp-lock-db1-ws3.xml" />
                      <property name="jbosscache-cluster-name" value="JCR-cluster-locks-db1-ws3" />
                      <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_db1_ws3"/>
                      <property name="jbosscache-cl-cache.jdbc.table.create" value="true"/>
@@ -359,8 +359,8 @@
                </initializer>
                <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
                   <properties>
-                     <property name="jbosscache-configuration" value="conf/templateBased/test-jbosscache-data.tpl.xml" />
-                     <property name="jgroups-configuration" value="conf/templateBased/tcp-data-db1tck-ws.xml" />
+                     <property name="jbosscache-configuration" value="conf/standalone/templateBased/test-jbosscache-data.xml" />
+                     <property name="jgroups-configuration" value="conf/standalone/templateBased/tcp-data-db1tck-ws.xml" />
                      <property name="jbosscache-cluster-name" value="JCR-cluster-db1tck-ws" />
                   </properties>
                </cache>
@@ -368,15 +368,15 @@
                   <properties>
                      <property name="index-dir" value="target/temp/index/db1tck/ws" />
                      <property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
-                     <property name="jbosscache-configuration" value="conf/templateBased/test-jbosscache-indexer.tpl.xml" />
-                     <property name="jgroups-configuration" value="conf/templateBased/tcp-index-db1tck-ws.xml" />
+                     <property name="jbosscache-configuration" value="conf/standalone/templateBased/test-jbosscache-indexer.xml" />
+                     <property name="jgroups-configuration" value="conf/standalone/templateBased/tcp-index-db1tck-ws.xml" />
                      <property name="jbosscache-cluster-name" value="JCR-cluster-indexer-db1tck-ws" />
                      <property name="max-volatile-time" value="60" />
                      
                      <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
-                     <property name="synonymprovider-config-path" value="../../synonyms.properties" />
+                     <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="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" />
@@ -385,8 +385,8 @@
                <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
                   <properties>
                      <property name="time-out" value="15m" />
-                     <property name="jbosscache-configuration" value="conf/templateBased/test-jbosscache-lock.tpl.xml" />
-                     <property name="jgroups-configuration" value="conf/templateBased/tcp-lock-db1tck-ws.xml" />
+                     <property name="jbosscache-configuration" value="conf/standalone/templateBased/test-jbosscache-lock.xml" />
+                     <property name="jgroups-configuration" value="conf/standalone/templateBased/tcp-lock-db1tck-ws.xml" />
                      <property name="jbosscache-cluster-name" value="JCR-cluster-locks-db1tck-ws" />
                      <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_db1tck_ws"/>
                      <property name="jbosscache-cl-cache.jdbc.table.create" value="true"/>
@@ -431,8 +431,8 @@
                </initializer>
                <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
                   <properties>
-                     <property name="jbosscache-configuration" value="conf/templateBased/test-jbosscache-data.tpl.xml" />
-                     <property name="jgroups-configuration" value="conf/templateBased/tcp-data-db1tck-ws1.xml" />
+                     <property name="jbosscache-configuration" value="conf/standalone/templateBased/test-jbosscache-data.xml" />
+                     <property name="jgroups-configuration" value="conf/standalone/templateBased/tcp-data-db1tck-ws1.xml" />
                      <property name="jbosscache-cluster-name" value="JCR-cluster-db1tck-ws1" />
                   </properties>
                </cache>
@@ -440,14 +440,14 @@
                   <properties>
                      <property name="index-dir" value="target/temp/index/db1tck/ws1" />
                      <property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
-                     <property name="jbosscache-configuration" value="conf/templateBased/test-jbosscache-indexer.tpl.xml" />
-                     <property name="jgroups-configuration" value="conf/templateBased/tcp-index-db1tck-ws1.xml" />
+                     <property name="jbosscache-configuration" value="conf/standalone/templateBased/test-jbosscache-indexer.xml" />
+                     <property name="jgroups-configuration" value="conf/standalone/templateBased/tcp-index-db1tck-ws1.xml" />
                      <property name="jbosscache-cluster-name" value="JCR-cluster-indexer-db1tck-ws1" />
                      <property name="max-volatile-time" value="60" />
                      <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
-                     <property name="synonymprovider-config-path" value="../../synonyms.properties" />
+                     <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="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>
@@ -455,8 +455,8 @@
                <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
                   <properties>
                      <property name="time-out" value="15m" />
-                     <property name="jbosscache-configuration" value="conf/templateBased/test-jbosscache-lock.tpl.xml" />
-                     <property name="jgroups-configuration" value="conf/templateBased/tcp-lock-db1tck-ws1.xml" />
+                     <property name="jbosscache-configuration" value="conf/standalone/templateBased/test-jbosscache-lock.xml" />
+                     <property name="jgroups-configuration" value="conf/standalone/templateBased/tcp-lock-db1tck-ws1.xml" />
                      <property name="jbosscache-cluster-name" value="JCR-cluster-locks-db1tck-ws1" />
                      <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_db1tck_ws1"/>
                      <property name="jbosscache-cl-cache.jdbc.table.create" value="true"/>
@@ -501,8 +501,8 @@
                </initializer>
                <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
                   <properties>
-                     <property name="jbosscache-configuration" value="conf/templateBased/test-jbosscache-data.tpl.xml" />
-                     <property name="jgroups-configuration" value="conf/templateBased/tcp-data-db1tck-ws2.xml" />
+                     <property name="jbosscache-configuration" value="conf/standalone/templateBased/test-jbosscache-data.xml" />
+                     <property name="jgroups-configuration" value="conf/standalone/templateBased/tcp-data-db1tck-ws2.xml" />
                      <property name="jbosscache-cluster-name" value="JCR-cluster-db1tck-ws2" />
                   </properties>
                </cache>
@@ -510,14 +510,14 @@
                   <properties>
                      <property name="index-dir" value="target/temp/index/db1tck/ws2" />
                      <property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
-                     <property name="jbosscache-configuration" value="conf/templateBased/test-jbosscache-indexer.tpl.xml" />
-                     <property name="jgroups-configuration" value="conf/templateBased/tcp-index-db1tck-ws2.xml" />
+                     <property name="jbosscache-configuration" value="conf/standalone/templateBased/test-jbosscache-indexer.xml" />
+                     <property name="jgroups-configuration" value="conf/standalone/templateBased/tcp-index-db1tck-ws2.xml" />
                      <property name="jbosscache-cluster-name" value="JCR-cluster-indexer-db1tck-ws2" />
                      <property name="max-volatile-time" value="60" />
                      <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
-                     <property name="synonymprovider-config-path" value="../../synonyms.properties" />
+                     <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="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"/>
@@ -528,8 +528,8 @@
                <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
                   <properties>
                      <property name="time-out" value="15m" />
-                     <property name="jbosscache-configuration" value="conf/templateBased/test-jbosscache-lock.tpl.xml" />
-                     <property name="jgroups-configuration" value="conf/templateBased/tcp-lock-db1tck-ws2.xml" />
+                     <property name="jbosscache-configuration" value="conf/standalone/templateBased/test-jbosscache-lock.xml" />
+                     <property name="jgroups-configuration" value="conf/standalone/templateBased/tcp-lock-db1tck-ws2.xml" />
                      <property name="jbosscache-cluster-name" value="JCR-cluster-locks-db1tck-ws2" />
                      <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_db1tck_ws2"/>
                      <property name="jbosscache-cl-cache.jdbc.table.create" value="true"/>



More information about the exo-jcr-commits mailing list