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

do-not-reply at jboss.org do-not-reply at jboss.org
Fri Jan 29 08:58:38 EST 2010


Author: nzamosenchuk
Date: 2010-01-29 08:58:37 -0500 (Fri, 29 Jan 2010)
New Revision: 1624

Added:
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-data.xml
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-indexer.xml
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-lock.xml
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/udp-mux.xml
Removed:
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-config-db1-ws.xml
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-config-db1-ws1.xml
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-config-db1-ws2.xml
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-config-db1-ws3.xml
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-config-db1tck-ws.xml
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-config-db1tck-ws1.xml
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-config-db1tck-ws2.xml
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-indexer-config-exoloader_db1_ws.xml
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-indexer-config-exoloader_db1_ws1.xml
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-indexer-config-exoloader_db1_ws2.xml
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-indexer-config-exoloader_db1_ws3.xml
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-indexer-config-exoloader_db1tck_ws.xml
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-indexer-config-exoloader_db1tck_ws1.xml
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-indexer-config-exoloader_db1tck_ws2.xml
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-lock-config_db1_ws.xml
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-lock-config_db1_ws1.xml
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-lock-config_db1_ws2.xml
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-lock-config_db1_ws3.xml
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-lock-config_db1tck_ws.xml
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-lock-config_db1tck_ws1.xml
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-lock-config_db1tck_ws2.xml
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mux/
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/
Modified:
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-configuration.xml
   jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config.xml
Log:
EXOJCR-434: configuration cleanup.

Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-configuration.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-configuration.xml	2010-01-29 12:53:47 UTC (rev 1623)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-configuration.xml	2010-01-29 13:58:37 UTC (rev 1624)
@@ -246,9 +246,9 @@
           <name>ref-addresses</name>
           <description>ref-addresses</description>
           <property name="driverClassName" value="com.mysql.jdbc.Driver" />
-          <property name="url" value="jdbc:mysql://db2.exoua-int/portal"/>
+          <property name="url" value="jdbc:mysql://localhost/portal"/>
           <property name="username" value="root"/>
-          <property name="password" value="eXoAdmin"/>
+          <property name="password" value="admin"/>
           <property name="maxActive" value="100" />
           <property name="maxIdle" value="5" />
           <property name="initialSize" value="5" />
@@ -276,9 +276,9 @@
           <name>ref-addresses</name>
           <description>ref-addresses</description>
           <property name="driverClassName" value="com.mysql.jdbc.Driver" />
-          <property name="url" value="jdbc:mysql://db2.exoua-int/jcr"/>
+          <property name="url" value="jdbc:mysql://localhost/jcr"/>
           <property name="username" value="root"/>
-          <property name="password" value="eXoAdmin"/>
+          <property name="password" value="admin"/>
           <property name="maxActive" value="100" />
           <property name="maxIdle" value="5" />
           <property name="initialSize" value="5" />
@@ -306,9 +306,9 @@
           <name>ref-addresses</name>
           <description>ref-addresses</description>
           <property name="driverClassName" value="com.mysql.jdbc.Driver" />
-          <property name="url" value="jdbc:mysql://db2.exoua-int/jcr2"/>
+          <property name="url" value="jdbc:mysql://localhost/jcr2"/>
           <property name="username" value="root"/>
-          <property name="password" value="eXoAdmin"/>
+          <property name="password" value="admin"/>
           <property name="maxActive" value="100" />
           <property name="maxIdle" value="5" />
           <property name="initialSize" value="5" />
@@ -336,9 +336,9 @@
           <name>ref-addresses</name>
           <description>ref-addresses</description>
           <property name="driverClassName" value="com.mysql.jdbc.Driver" />
-          <property name="url" value="jdbc:mysql://db2.exoua-int/jcr3"/>
+          <property name="url" value="jdbc:mysql://localhost/jcr3"/>
           <property name="username" value="root"/>
-          <property name="password" value="eXoAdmin"/>
+          <property name="password" value="admin"/>
           <property name="maxActive" value="100" />
           <property name="maxIdle" value="5" />
           <property name="initialSize" value="5" />
@@ -393,9 +393,9 @@
           <name>ref-addresses</name>
           <description>ref-addresses</description>
           <property name="driverClassName" value="com.mysql.jdbc.Driver" />
-          <property name="url" value="jdbc:mysql://db2.exoua-int/portaltck"/>
+          <property name="url" value="jdbc:mysql://localhost/portaltck"/>
           <property name="username" value="root"/>
-          <property name="password" value="eXoAdmin"/>
+          <property name="password" value="admin"/>
           <property name="maxActive" value="100" />
           <property name="maxIdle" value="5" />
           <property name="initialSize" value="5" />
@@ -423,9 +423,9 @@
           <name>ref-addresses</name>
           <description>ref-addresses</description>
           <property name="driverClassName" value="com.mysql.jdbc.Driver" />
-          <property name="url" value="jdbc:mysql://db2.exoua-int/jcrtck"/>
+          <property name="url" value="jdbc:mysql://localhost/jcrtck"/>
           <property name="username" value="root"/>
-          <property name="password" value="eXoAdmin"/>
+          <property name="password" value="admin"/>
           <property name="maxActive" value="100" />
           <property name="maxIdle" value="5" />
           <property name="initialSize" value="5" />
@@ -453,9 +453,9 @@
           <name>ref-addresses</name>
           <description>ref-addresses</description>
           <property name="driverClassName" value="com.mysql.jdbc.Driver" />
-          <property name="url" value="jdbc:mysql://db2.exoua-int/jcr2tck"/>
+          <property name="url" value="jdbc:mysql://localhost/jcr2tck"/>
           <property name="username" value="root"/>
-          <property name="password" value="eXoAdmin"/>
+          <property name="password" value="admin"/>
           <property name="maxActive" value="100" />
           <property name="maxIdle" value="5" />
           <property name="initialSize" value="5" />

Deleted: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-config-db1-ws.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-config-db1-ws.xml	2010-01-29 12:53:47 UTC (rev 1623)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-config-db1-ws.xml	2010-01-29 13:58:37 UTC (rev 1624)
@@ -1,88 +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="JBoss-Cache-Cluster_db1_ws">
-		<!--
-			Fetch in memory state is enable, because second cluster-node
-			currently doesn't work properly on clear cache
-		-->
-		<stateRetrieval timeout="20000" fetchInMemoryState="false"  nonBlocking="true"/>
-		<!--
-			This JGroups configuration is taken from JBC branch, but
-			"enable_bundling" is set to false, because of notice, that appeared
-			during running
-      multiplexerStack="fc-fast-minimalthreads"   
-		-->
-		<jgroupsConfig>
-			<!--
-				UDP discard_incompatible_packets="true" enable_bundling="false"
-				enable_diagnostics="false" ip_ttl="2" loopback="false"
-				max_bundle_size="64000" max_bundle_timeout="30"
-				mcast_addr="228.10.10.10" mcast_port="45588"
-				mcast_recv_buf_size="25000000" mcast_send_buf_size="640000"
-				oob_thread_pool.enabled="true"
-				oob_thread_pool.keep_alive_time="10000"
-				oob_thread_pool.max_threads="4" oob_thread_pool.min_threads="1"
-				oob_thread_pool.queue_enabled="true"
-				oob_thread_pool.queue_max_size="10"
-				oob_thread_pool.rejection_policy="Run" thread_naming_pattern="pl"
-				thread_pool.enabled="true" thread_pool.keep_alive_time="30000"
-				thread_pool.max_threads="25" thread_pool.min_threads="1"
-				thread_pool.queue_enabled="true" thread_pool.queue_max_size="10"
-				thread_pool.rejection_policy="Run" tos="8"
-				ucast_recv_buf_size="20000000" ucast_send_buf_size="640000"
-				use_concurrent_stack="true" use_incoming_packet_handler="true" />
-				<PING num_initial_members="3" timeout="2000" /
-			-->
-
-			<TCP bind_addr="127.0.0.1" start_port="9600" loopback="true"
-				recv_buf_size="20000000" send_buf_size="640000"
-				discard_incompatible_packets="true" max_bundle_size="64000"
-				max_bundle_timeout="30" use_incoming_packet_handler="true"
-				enable_bundling="false" use_send_queues="false" sock_conn_timeout="300"
-				skip_suspected_members="true" use_concurrent_stack="true"
-				thread_pool.enabled="true" thread_pool.min_threads="1"
-				thread_pool.max_threads="25" thread_pool.keep_alive_time="5000"
-				thread_pool.queue_enabled="false" thread_pool.queue_max_size="100"
-				thread_pool.rejection_policy="run" oob_thread_pool.enabled="true"
-				oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="8"
-				oob_thread_pool.keep_alive_time="5000"
-				oob_thread_pool.queue_enabled="false"
-				oob_thread_pool.queue_max_size="100"
-				oob_thread_pool.rejection_policy="run" />
-			<MPING timeout="2000" num_initial_members="2" mcast_port="34521"
-				bind_addr="127.0.0.1" mcast_addr="224.0.0.1" />
-
-
-			<MERGE2 max_interval="30000" min_interval="10000" />
-			<FD_SOCK />
-			<FD max_tries="5" shun="true" timeout="10000" />
-			<VERIFY_SUSPECT timeout="1500" />
-			<pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0"
-				retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
-			<UNICAST timeout="300,600,1200,2400,3600" />
-			<pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000"
-				stability_delay="1000" />
-			<pbcast.GMS join_timeout="5000" print_local_addr="true"
-				shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
-			<FRAG2 frag_size="60000" />
-			<pbcast.STREAMING_STATE_TRANSFER />
-			<pbcast.FLUSH timeout="0" />
-
-		</jgroupsConfig>
-
-		<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>

Deleted: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-config-db1-ws1.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-config-db1-ws1.xml	2010-01-29 12:53:47 UTC (rev 1623)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-config-db1-ws1.xml	2010-01-29 13:58:37 UTC (rev 1624)
@@ -1,89 +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="JBoss-Cache-Cluster_db1_ws1">
-		<!--
-			Fetch in memory state is enable, because second cluster-node
-			currently doesn't work properly on clear cache
-		-->
-		<stateRetrieval timeout="20000" fetchInMemoryState="false" nonBlocking="true"/>
-		<!--
-			This JGroups configuration is taken from JBC branch, but
-			"enable_bundling" is set to false, because of notice, that appeared
-			during running
-      multiplexerStack="fc-fast-minimalthreads"
-		-->
-		<jgroupsConfig  >
-			<!--
-				UDP discard_incompatible_packets="true" enable_bundling="false"
-				enable_diagnostics="false" ip_ttl="2" loopback="false"
-				max_bundle_size="64000" max_bundle_timeout="30"
-				mcast_addr="228.10.10.10" mcast_port="45588"
-				mcast_recv_buf_size="25000000" mcast_send_buf_size="640000"
-				oob_thread_pool.enabled="true"
-				oob_thread_pool.keep_alive_time="10000"
-				oob_thread_pool.max_threads="4" oob_thread_pool.min_threads="1"
-				oob_thread_pool.queue_enabled="true"
-				oob_thread_pool.queue_max_size="10"
-				oob_thread_pool.rejection_policy="Run" thread_naming_pattern="pl"
-				thread_pool.enabled="true" thread_pool.keep_alive_time="30000"
-				thread_pool.max_threads="25" thread_pool.min_threads="1"
-				thread_pool.queue_enabled="true" thread_pool.queue_max_size="10"
-				thread_pool.rejection_policy="Run" tos="8"
-				ucast_recv_buf_size="20000000" ucast_send_buf_size="640000"
-				use_concurrent_stack="true" use_incoming_packet_handler="true" />
-				<PING num_initial_members="3" timeout="2000" /
-			-->
-
-			<TCP bind_addr="127.0.0.1" start_port="9610" loopback="true"
-				recv_buf_size="20000000" send_buf_size="640000"
-				discard_incompatible_packets="true" max_bundle_size="64000"
-				max_bundle_timeout="30" use_incoming_packet_handler="true"
-				enable_bundling="false" use_send_queues="false" sock_conn_timeout="300"
-				skip_suspected_members="true" use_concurrent_stack="true"
-				thread_pool.enabled="true" thread_pool.min_threads="1"
-				thread_pool.max_threads="25" thread_pool.keep_alive_time="5000"
-				thread_pool.queue_enabled="false" thread_pool.queue_max_size="100"
-				thread_pool.rejection_policy="run" oob_thread_pool.enabled="true"
-				oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="8"
-				oob_thread_pool.keep_alive_time="5000"
-				oob_thread_pool.queue_enabled="false"
-				oob_thread_pool.queue_max_size="100"
-				oob_thread_pool.rejection_policy="run" />
-			<MPING timeout="2000" num_initial_members="2" mcast_port="34522"
-				bind_addr="127.0.0.1" mcast_addr="224.0.0.1" />
-
-
-			<MERGE2 max_interval="30000" min_interval="10000" />
-			<FD_SOCK />
-			<FD max_tries="5" shun="true" timeout="10000" />
-			<VERIFY_SUSPECT timeout="1500" />
-			<pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0"
-				retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
-			<UNICAST timeout="300,600,1200,2400,3600" />
-			<pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000"
-				stability_delay="1000" />
-			<pbcast.GMS join_timeout="5000" print_local_addr="true"
-				shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
-			<FRAG2 frag_size="60000" />
-			<pbcast.STREAMING_STATE_TRANSFER />
-			<pbcast.FLUSH timeout="0" />
-
-		</jgroupsConfig>
-
-		<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>

Deleted: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-config-db1-ws2.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-config-db1-ws2.xml	2010-01-29 12:53:47 UTC (rev 1623)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-config-db1-ws2.xml	2010-01-29 13:58:37 UTC (rev 1624)
@@ -1,88 +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="JBoss-Cache-Cluster_db1_ws2">
-		<!--
-			Fetch in memory state is enable, because second cluster-node
-			currently doesn't work properly on clear cache
-		-->
-		<stateRetrieval timeout="20000" fetchInMemoryState="false"  nonBlocking="true"/>
-		<!--
-			This JGroups configuration is taken from JBC branch, but
-			"enable_bundling" is set to false, because of notice, that appeared
-			during running
-      multiplexerStack="fc-fast-minimalthreads"   
-		-->
-		<jgroupsConfig>
-			<!--
-				UDP discard_incompatible_packets="true" enable_bundling="false"
-				enable_diagnostics="false" ip_ttl="2" loopback="false"
-				max_bundle_size="64000" max_bundle_timeout="30"
-				mcast_addr="228.10.10.10" mcast_port="45588"
-				mcast_recv_buf_size="25000000" mcast_send_buf_size="640000"
-				oob_thread_pool.enabled="true"
-				oob_thread_pool.keep_alive_time="10000"
-				oob_thread_pool.max_threads="4" oob_thread_pool.min_threads="1"
-				oob_thread_pool.queue_enabled="true"
-				oob_thread_pool.queue_max_size="10"
-				oob_thread_pool.rejection_policy="Run" thread_naming_pattern="pl"
-				thread_pool.enabled="true" thread_pool.keep_alive_time="30000"
-				thread_pool.max_threads="25" thread_pool.min_threads="1"
-				thread_pool.queue_enabled="true" thread_pool.queue_max_size="10"
-				thread_pool.rejection_policy="Run" tos="8"
-				ucast_recv_buf_size="20000000" ucast_send_buf_size="640000"
-				use_concurrent_stack="true" use_incoming_packet_handler="true" />
-				<PING num_initial_members="3" timeout="2000" /
-			-->
-
-			<TCP bind_addr="127.0.0.1" start_port="9620" loopback="true"
-				recv_buf_size="20000000" send_buf_size="640000"
-				discard_incompatible_packets="true" max_bundle_size="64000"
-				max_bundle_timeout="30" use_incoming_packet_handler="true"
-				enable_bundling="false" use_send_queues="false" sock_conn_timeout="300"
-				skip_suspected_members="true" use_concurrent_stack="true"
-				thread_pool.enabled="true" thread_pool.min_threads="1"
-				thread_pool.max_threads="25" thread_pool.keep_alive_time="5000"
-				thread_pool.queue_enabled="false" thread_pool.queue_max_size="100"
-				thread_pool.rejection_policy="run" oob_thread_pool.enabled="true"
-				oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="8"
-				oob_thread_pool.keep_alive_time="5000"
-				oob_thread_pool.queue_enabled="false"
-				oob_thread_pool.queue_max_size="100"
-				oob_thread_pool.rejection_policy="run" />
-			<MPING timeout="2000" num_initial_members="2" mcast_port="34521"
-				bind_addr="127.0.0.1" mcast_addr="224.0.0.1" />
-
-
-			<MERGE2 max_interval="30000" min_interval="10000" />
-			<FD_SOCK />
-			<FD max_tries="5" shun="true" timeout="10000" />
-			<VERIFY_SUSPECT timeout="1500" />
-			<pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0"
-				retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
-			<UNICAST timeout="300,600,1200,2400,3600" />
-			<pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000"
-				stability_delay="1000" />
-			<pbcast.GMS join_timeout="5000" print_local_addr="true"
-				shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
-			<FRAG2 frag_size="60000" />
-			<pbcast.STREAMING_STATE_TRANSFER />
-			<pbcast.FLUSH timeout="0" />
-
-		</jgroupsConfig>
-
-		<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>

Deleted: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-config-db1-ws3.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-config-db1-ws3.xml	2010-01-29 12:53:47 UTC (rev 1623)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-config-db1-ws3.xml	2010-01-29 13:58:37 UTC (rev 1624)
@@ -1,88 +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="JBoss-Cache-Cluster_db1_ws3">
-		<!--
-			Fetch in memory state is enable, because second cluster-node
-			currently doesn't work properly on clear cache
-		-->
-		<stateRetrieval timeout="20000" fetchInMemoryState="false"  nonBlocking="true"/>
-		<!--
-			This JGroups configuration is taken from JBC branch, but
-			"enable_bundling" is set to false, because of notice, that appeared
-			during running
-      multiplexerStack="fc-fast-minimalthreads"   
-		-->
-		<jgroupsConfig>
-			<!--
-				UDP discard_incompatible_packets="true" enable_bundling="false"
-				enable_diagnostics="false" ip_ttl="2" loopback="false"
-				max_bundle_size="64000" max_bundle_timeout="30"
-				mcast_addr="228.10.10.10" mcast_port="45588"
-				mcast_recv_buf_size="25000000" mcast_send_buf_size="640000"
-				oob_thread_pool.enabled="true"
-				oob_thread_pool.keep_alive_time="10000"
-				oob_thread_pool.max_threads="4" oob_thread_pool.min_threads="1"
-				oob_thread_pool.queue_enabled="true"
-				oob_thread_pool.queue_max_size="10"
-				oob_thread_pool.rejection_policy="Run" thread_naming_pattern="pl"
-				thread_pool.enabled="true" thread_pool.keep_alive_time="30000"
-				thread_pool.max_threads="25" thread_pool.min_threads="1"
-				thread_pool.queue_enabled="true" thread_pool.queue_max_size="10"
-				thread_pool.rejection_policy="Run" tos="8"
-				ucast_recv_buf_size="20000000" ucast_send_buf_size="640000"
-				use_concurrent_stack="true" use_incoming_packet_handler="true" />
-				<PING num_initial_members="3" timeout="2000" /
-			-->
-
-			<TCP bind_addr="127.0.0.1" start_port="9630" loopback="true"
-				recv_buf_size="20000000" send_buf_size="640000"
-				discard_incompatible_packets="true" max_bundle_size="64000"
-				max_bundle_timeout="30" use_incoming_packet_handler="true"
-				enable_bundling="false" use_send_queues="false" sock_conn_timeout="300"
-				skip_suspected_members="true" use_concurrent_stack="true"
-				thread_pool.enabled="true" thread_pool.min_threads="1"
-				thread_pool.max_threads="25" thread_pool.keep_alive_time="5000"
-				thread_pool.queue_enabled="false" thread_pool.queue_max_size="100"
-				thread_pool.rejection_policy="run" oob_thread_pool.enabled="true"
-				oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="8"
-				oob_thread_pool.keep_alive_time="5000"
-				oob_thread_pool.queue_enabled="false"
-				oob_thread_pool.queue_max_size="100"
-				oob_thread_pool.rejection_policy="run" />
-			<MPING timeout="2000" num_initial_members="2" mcast_port="34521"
-				bind_addr="127.0.0.1" mcast_addr="224.0.0.1" />
-
-
-			<MERGE2 max_interval="30000" min_interval="10000" />
-			<FD_SOCK />
-			<FD max_tries="5" shun="true" timeout="10000" />
-			<VERIFY_SUSPECT timeout="1500" />
-			<pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0"
-				retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
-			<UNICAST timeout="300,600,1200,2400,3600" />
-			<pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000"
-				stability_delay="1000" />
-			<pbcast.GMS join_timeout="5000" print_local_addr="true"
-				shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
-			<FRAG2 frag_size="60000" />
-			<pbcast.STREAMING_STATE_TRANSFER />
-			<pbcast.FLUSH timeout="0" />
-
-		</jgroupsConfig>
-
-		<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>

Deleted: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-config-db1tck-ws.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-config-db1tck-ws.xml	2010-01-29 12:53:47 UTC (rev 1623)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-config-db1tck-ws.xml	2010-01-29 13:58:37 UTC (rev 1624)
@@ -1,88 +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="JBoss-Cache-Cluster_db1tck_ws">
-		<!--
-			Fetch in memory state is enable, because second cluster-node
-			currently doesn't work properly on clear cache
-		-->
-		<stateRetrieval timeout="20000" fetchInMemoryState="false"  nonBlocking="true"/>
-		<!--
-			This JGroups configuration is taken from JBC branch, but
-			"enable_bundling" is set to false, because of notice, that appeared
-			during running
-      multiplexerStack="fc-fast-minimalthreads"   
-		-->
-		<jgroupsConfig>
-			<!--
-				UDP discard_incompatible_packets="true" enable_bundling="false"
-				enable_diagnostics="false" ip_ttl="2" loopback="false"
-				max_bundle_size="64000" max_bundle_timeout="30"
-				mcast_addr="228.10.10.10" mcast_port="45588"
-				mcast_recv_buf_size="25000000" mcast_send_buf_size="640000"
-				oob_thread_pool.enabled="true"
-				oob_thread_pool.keep_alive_time="10000"
-				oob_thread_pool.max_threads="4" oob_thread_pool.min_threads="1"
-				oob_thread_pool.queue_enabled="true"
-				oob_thread_pool.queue_max_size="10"
-				oob_thread_pool.rejection_policy="Run" thread_naming_pattern="pl"
-				thread_pool.enabled="true" thread_pool.keep_alive_time="30000"
-				thread_pool.max_threads="25" thread_pool.min_threads="1"
-				thread_pool.queue_enabled="true" thread_pool.queue_max_size="10"
-				thread_pool.rejection_policy="Run" tos="8"
-				ucast_recv_buf_size="20000000" ucast_send_buf_size="640000"
-				use_concurrent_stack="true" use_incoming_packet_handler="true" />
-				<PING num_initial_members="3" timeout="2000" /
-			-->
-
-			<TCP bind_addr="127.0.0.1" start_port="9640" loopback="true"
-				recv_buf_size="20000000" send_buf_size="640000"
-				discard_incompatible_packets="true" max_bundle_size="64000"
-				max_bundle_timeout="30" use_incoming_packet_handler="true"
-				enable_bundling="false" use_send_queues="false" sock_conn_timeout="300"
-				skip_suspected_members="true" use_concurrent_stack="true"
-				thread_pool.enabled="true" thread_pool.min_threads="1"
-				thread_pool.max_threads="25" thread_pool.keep_alive_time="5000"
-				thread_pool.queue_enabled="false" thread_pool.queue_max_size="100"
-				thread_pool.rejection_policy="run" oob_thread_pool.enabled="true"
-				oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="8"
-				oob_thread_pool.keep_alive_time="5000"
-				oob_thread_pool.queue_enabled="false"
-				oob_thread_pool.queue_max_size="100"
-				oob_thread_pool.rejection_policy="run" />
-			<MPING timeout="2000" num_initial_members="2" mcast_port="34521"
-				bind_addr="127.0.0.1" mcast_addr="224.0.0.1" />
-
-
-			<MERGE2 max_interval="30000" min_interval="10000" />
-			<FD_SOCK />
-			<FD max_tries="5" shun="true" timeout="10000" />
-			<VERIFY_SUSPECT timeout="1500" />
-			<pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0"
-				retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
-			<UNICAST timeout="300,600,1200,2400,3600" />
-			<pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000"
-				stability_delay="1000" />
-			<pbcast.GMS join_timeout="5000" print_local_addr="true"
-				shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
-			<FRAG2 frag_size="60000" />
-			<pbcast.STREAMING_STATE_TRANSFER />
-			<pbcast.FLUSH timeout="0" />
-
-		</jgroupsConfig>
-
-		<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>

Deleted: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-config-db1tck-ws1.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-config-db1tck-ws1.xml	2010-01-29 12:53:47 UTC (rev 1623)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-config-db1tck-ws1.xml	2010-01-29 13:58:37 UTC (rev 1624)
@@ -1,88 +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="JBoss-Cache-Cluster_db1tck_ws1">
-		<!--
-			Fetch in memory state is enable, because second cluster-node
-			currently doesn't work properly on clear cache
-		-->
-		<stateRetrieval timeout="20000" fetchInMemoryState="false"  nonBlocking="true"/>
-		<!--
-			This JGroups configuration is taken from JBC branch, but
-			"enable_bundling" is set to false, because of notice, that appeared
-			during running
-      multiplexerStack="fc-fast-minimalthreads"   
-		-->
-		<jgroupsConfig>
-			<!--
-				UDP discard_incompatible_packets="true" enable_bundling="false"
-				enable_diagnostics="false" ip_ttl="2" loopback="false"
-				max_bundle_size="64000" max_bundle_timeout="30"
-				mcast_addr="228.10.10.10" mcast_port="45588"
-				mcast_recv_buf_size="25000000" mcast_send_buf_size="640000"
-				oob_thread_pool.enabled="true"
-				oob_thread_pool.keep_alive_time="10000"
-				oob_thread_pool.max_threads="4" oob_thread_pool.min_threads="1"
-				oob_thread_pool.queue_enabled="true"
-				oob_thread_pool.queue_max_size="10"
-				oob_thread_pool.rejection_policy="Run" thread_naming_pattern="pl"
-				thread_pool.enabled="true" thread_pool.keep_alive_time="30000"
-				thread_pool.max_threads="25" thread_pool.min_threads="1"
-				thread_pool.queue_enabled="true" thread_pool.queue_max_size="10"
-				thread_pool.rejection_policy="Run" tos="8"
-				ucast_recv_buf_size="20000000" ucast_send_buf_size="640000"
-				use_concurrent_stack="true" use_incoming_packet_handler="true" />
-				<PING num_initial_members="3" timeout="2000" /
-			-->
-
-			<TCP bind_addr="127.0.0.1" start_port="9650" loopback="true"
-				recv_buf_size="20000000" send_buf_size="640000"
-				discard_incompatible_packets="true" max_bundle_size="64000"
-				max_bundle_timeout="30" use_incoming_packet_handler="true"
-				enable_bundling="false" use_send_queues="false" sock_conn_timeout="300"
-				skip_suspected_members="true" use_concurrent_stack="true"
-				thread_pool.enabled="true" thread_pool.min_threads="1"
-				thread_pool.max_threads="25" thread_pool.keep_alive_time="5000"
-				thread_pool.queue_enabled="false" thread_pool.queue_max_size="100"
-				thread_pool.rejection_policy="run" oob_thread_pool.enabled="true"
-				oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="8"
-				oob_thread_pool.keep_alive_time="5000"
-				oob_thread_pool.queue_enabled="false"
-				oob_thread_pool.queue_max_size="100"
-				oob_thread_pool.rejection_policy="run" />
-			<MPING timeout="2000" num_initial_members="2" mcast_port="34521"
-				bind_addr="127.0.0.1" mcast_addr="224.0.0.1" />
-
-
-			<MERGE2 max_interval="30000" min_interval="10000" />
-			<FD_SOCK />
-			<FD max_tries="5" shun="true" timeout="10000" />
-			<VERIFY_SUSPECT timeout="1500" />
-			<pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0"
-				retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
-			<UNICAST timeout="300,600,1200,2400,3600" />
-			<pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000"
-				stability_delay="1000" />
-			<pbcast.GMS join_timeout="5000" print_local_addr="true"
-				shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
-			<FRAG2 frag_size="60000" />
-			<pbcast.STREAMING_STATE_TRANSFER />
-			<pbcast.FLUSH timeout="0" />
-
-		</jgroupsConfig>
-
-		<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>

Deleted: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-config-db1tck-ws2.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-config-db1tck-ws2.xml	2010-01-29 12:53:47 UTC (rev 1623)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-config-db1tck-ws2.xml	2010-01-29 13:58:37 UTC (rev 1624)
@@ -1,88 +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="JBoss-Cache-Cluster_db1tck_ws2">
-		<!--
-			Fetch in memory state is enable, because second cluster-node
-			currently doesn't work properly on clear cache
-		-->
-		<stateRetrieval timeout="20000" fetchInMemoryState="false"  nonBlocking="true"/>
-		<!--
-			This JGroups configuration is taken from JBC branch, but
-			"enable_bundling" is set to false, because of notice, that appeared
-			during running
-      multiplexerStack="fc-fast-minimalthreads"   
-		-->
-		<jgroupsConfig>
-			<!--
-				UDP discard_incompatible_packets="true" enable_bundling="false"
-				enable_diagnostics="false" ip_ttl="2" loopback="false"
-				max_bundle_size="64000" max_bundle_timeout="30"
-				mcast_addr="228.10.10.10" mcast_port="45588"
-				mcast_recv_buf_size="25000000" mcast_send_buf_size="640000"
-				oob_thread_pool.enabled="true"
-				oob_thread_pool.keep_alive_time="10000"
-				oob_thread_pool.max_threads="4" oob_thread_pool.min_threads="1"
-				oob_thread_pool.queue_enabled="true"
-				oob_thread_pool.queue_max_size="10"
-				oob_thread_pool.rejection_policy="Run" thread_naming_pattern="pl"
-				thread_pool.enabled="true" thread_pool.keep_alive_time="30000"
-				thread_pool.max_threads="25" thread_pool.min_threads="1"
-				thread_pool.queue_enabled="true" thread_pool.queue_max_size="10"
-				thread_pool.rejection_policy="Run" tos="8"
-				ucast_recv_buf_size="20000000" ucast_send_buf_size="640000"
-				use_concurrent_stack="true" use_incoming_packet_handler="true" />
-				<PING num_initial_members="3" timeout="2000" /
-			-->
-
-			<TCP bind_addr="127.0.0.1" start_port="9660" loopback="true"
-				recv_buf_size="20000000" send_buf_size="640000"
-				discard_incompatible_packets="true" max_bundle_size="64000"
-				max_bundle_timeout="30" use_incoming_packet_handler="true"
-				enable_bundling="false" use_send_queues="false" sock_conn_timeout="300"
-				skip_suspected_members="true" use_concurrent_stack="true"
-				thread_pool.enabled="true" thread_pool.min_threads="1"
-				thread_pool.max_threads="25" thread_pool.keep_alive_time="5000"
-				thread_pool.queue_enabled="false" thread_pool.queue_max_size="100"
-				thread_pool.rejection_policy="run" oob_thread_pool.enabled="true"
-				oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="8"
-				oob_thread_pool.keep_alive_time="5000"
-				oob_thread_pool.queue_enabled="false"
-				oob_thread_pool.queue_max_size="100"
-				oob_thread_pool.rejection_policy="run" />
-			<MPING timeout="2000" num_initial_members="2" mcast_port="34521"
-				bind_addr="127.0.0.1" mcast_addr="224.0.0.1" />
-
-
-			<MERGE2 max_interval="30000" min_interval="10000" />
-			<FD_SOCK />
-			<FD max_tries="5" shun="true" timeout="10000" />
-			<VERIFY_SUSPECT timeout="1500" />
-			<pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0"
-				retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
-			<UNICAST timeout="300,600,1200,2400,3600" />
-			<pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000"
-				stability_delay="1000" />
-			<pbcast.GMS join_timeout="5000" print_local_addr="true"
-				shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
-			<FRAG2 frag_size="60000" />
-			<pbcast.STREAMING_STATE_TRANSFER />
-			<pbcast.FLUSH timeout="0" />
-
-		</jgroupsConfig>
-
-		<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>

Copied: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-data.xml (from rev 1617, jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mux/test-jbosscache-data.xml)
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-data.xml	                        (rev 0)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-data.xml	2010-01-29 13:58:37 UTC (rev 1624)
@@ -0,0 +1,22 @@
+<?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 multiplexerStack="jcr.stack" />
+      <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/cluster/test-jbosscache-data.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Deleted: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-indexer-config-exoloader_db1_ws.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-indexer-config-exoloader_db1_ws.xml	2010-01-29 12:53:47 UTC (rev 1623)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-indexer-config-exoloader_db1_ws.xml	2010-01-29 13:58:37 UTC (rev 1624)
@@ -1,59 +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="JBoss-Cache-Indexer-Cluster_db1_ws">
-		<stateRetrieval timeout="20000" fetchInMemoryState="false"  nonBlocking="true"/>
-		<jgroupsConfig>
-			<TCP bind_addr="127.0.0.1" start_port="9700" loopback="true"
-				recv_buf_size="20000000" send_buf_size="640000"
-				discard_incompatible_packets="true" max_bundle_size="64000"
-				max_bundle_timeout="30" use_incoming_packet_handler="true"
-				enable_bundling="false" use_send_queues="false" sock_conn_timeout="300"
-				skip_suspected_members="true" use_concurrent_stack="true"
-				thread_pool.enabled="true" thread_pool.min_threads="1"
-				thread_pool.max_threads="25" thread_pool.keep_alive_time="5000"
-				thread_pool.queue_enabled="false" thread_pool.queue_max_size="100"
-				thread_pool.rejection_policy="run" oob_thread_pool.enabled="true"
-				oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="8"
-				oob_thread_pool.keep_alive_time="5000"
-				oob_thread_pool.queue_enabled="false"
-				oob_thread_pool.queue_max_size="100"
-				oob_thread_pool.rejection_policy="run" />
-			<MPING timeout="2000" num_initial_members="2" mcast_port="34530"
-				bind_addr="127.0.0.1" mcast_addr="224.0.0.1" />
-
-
-			<MERGE2 max_interval="30000" min_interval="10000" />
-			<FD_SOCK />
-			<FD max_tries="5" shun="true" timeout="10000" />
-			<VERIFY_SUSPECT timeout="1500" />
-			<pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0"
-				retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
-			<UNICAST timeout="300,600,1200,2400,3600" />
-			<pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000"
-				stability_delay="1000" />
-			<pbcast.GMS join_timeout="5000" print_local_addr="true"
-				shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
-			<FRAG2 frag_size="60000" />
-			<pbcast.STREAMING_STATE_TRANSFER />
-			<pbcast.FLUSH timeout="0" />
-
-		</jgroupsConfig>
-
-		<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>

Deleted: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-indexer-config-exoloader_db1_ws1.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-indexer-config-exoloader_db1_ws1.xml	2010-01-29 12:53:47 UTC (rev 1623)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-indexer-config-exoloader_db1_ws1.xml	2010-01-29 13:58:37 UTC (rev 1624)
@@ -1,59 +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="JBoss-Cache-Indexer-Cluster_db1_ws1">
-		<stateRetrieval timeout="20000" fetchInMemoryState="false"  nonBlocking="true"/>
-		<jgroupsConfig>
-			<TCP bind_addr="127.0.0.1" start_port="9710" loopback="true"
-				recv_buf_size="20000000" send_buf_size="640000"
-				discard_incompatible_packets="true" max_bundle_size="64000"
-				max_bundle_timeout="30" use_incoming_packet_handler="true"
-				enable_bundling="false" use_send_queues="false" sock_conn_timeout="300"
-				skip_suspected_members="true" use_concurrent_stack="true"
-				thread_pool.enabled="true" thread_pool.min_threads="1"
-				thread_pool.max_threads="25" thread_pool.keep_alive_time="5000"
-				thread_pool.queue_enabled="false" thread_pool.queue_max_size="100"
-				thread_pool.rejection_policy="run" oob_thread_pool.enabled="true"
-				oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="8"
-				oob_thread_pool.keep_alive_time="5000"
-				oob_thread_pool.queue_enabled="false"
-				oob_thread_pool.queue_max_size="100"
-				oob_thread_pool.rejection_policy="run" />
-			<MPING timeout="2000" num_initial_members="2" mcast_port="34532"
-				bind_addr="127.0.0.1" mcast_addr="224.0.0.1" />
-
-
-			<MERGE2 max_interval="30000" min_interval="10000" />
-			<FD_SOCK />
-			<FD max_tries="5" shun="true" timeout="10000" />
-			<VERIFY_SUSPECT timeout="1500" />
-			<pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0"
-				retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
-			<UNICAST timeout="300,600,1200,2400,3600" />
-			<pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000"
-				stability_delay="1000" />
-			<pbcast.GMS join_timeout="5000" print_local_addr="true"
-				shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
-			<FRAG2 frag_size="60000" />
-			<pbcast.STREAMING_STATE_TRANSFER />
-			<pbcast.FLUSH timeout="0" />
-
-		</jgroupsConfig>
-
-		<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>

Deleted: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-indexer-config-exoloader_db1_ws2.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-indexer-config-exoloader_db1_ws2.xml	2010-01-29 12:53:47 UTC (rev 1623)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-indexer-config-exoloader_db1_ws2.xml	2010-01-29 13:58:37 UTC (rev 1624)
@@ -1,59 +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="JBoss-Cache-Indexer-Cluster_db1_ws2">
-		<stateRetrieval timeout="20000" fetchInMemoryState="false"  nonBlocking="true"/>
-		<jgroupsConfig>
-			<TCP bind_addr="127.0.0.1" start_port="9720" loopback="true"
-				recv_buf_size="20000000" send_buf_size="640000"
-				discard_incompatible_packets="true" max_bundle_size="64000"
-				max_bundle_timeout="30" use_incoming_packet_handler="true"
-				enable_bundling="false" use_send_queues="false" sock_conn_timeout="300"
-				skip_suspected_members="true" use_concurrent_stack="true"
-				thread_pool.enabled="true" thread_pool.min_threads="1"
-				thread_pool.max_threads="25" thread_pool.keep_alive_time="5000"
-				thread_pool.queue_enabled="false" thread_pool.queue_max_size="100"
-				thread_pool.rejection_policy="run" oob_thread_pool.enabled="true"
-				oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="8"
-				oob_thread_pool.keep_alive_time="5000"
-				oob_thread_pool.queue_enabled="false"
-				oob_thread_pool.queue_max_size="100"
-				oob_thread_pool.rejection_policy="run" />
-			<MPING timeout="2000" num_initial_members="2" mcast_port="34530"
-				bind_addr="127.0.0.1" mcast_addr="224.0.0.1" />
-
-
-			<MERGE2 max_interval="30000" min_interval="10000" />
-			<FD_SOCK />
-			<FD max_tries="5" shun="true" timeout="10000" />
-			<VERIFY_SUSPECT timeout="1500" />
-			<pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0"
-				retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
-			<UNICAST timeout="300,600,1200,2400,3600" />
-			<pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000"
-				stability_delay="1000" />
-			<pbcast.GMS join_timeout="5000" print_local_addr="true"
-				shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
-			<FRAG2 frag_size="60000" />
-			<pbcast.STREAMING_STATE_TRANSFER />
-			<pbcast.FLUSH timeout="0" />
-
-		</jgroupsConfig>
-
-		<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>

Deleted: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-indexer-config-exoloader_db1_ws3.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-indexer-config-exoloader_db1_ws3.xml	2010-01-29 12:53:47 UTC (rev 1623)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-indexer-config-exoloader_db1_ws3.xml	2010-01-29 13:58:37 UTC (rev 1624)
@@ -1,59 +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="JBoss-Cache-Indexer-Cluster_db1_ws3">
-		<stateRetrieval timeout="20000" fetchInMemoryState="false"  nonBlocking="true"/>
-		<jgroupsConfig>
-			<TCP bind_addr="127.0.0.1" start_port="9730" loopback="true"
-				recv_buf_size="20000000" send_buf_size="640000"
-				discard_incompatible_packets="true" max_bundle_size="64000"
-				max_bundle_timeout="30" use_incoming_packet_handler="true"
-				enable_bundling="false" use_send_queues="false" sock_conn_timeout="300"
-				skip_suspected_members="true" use_concurrent_stack="true"
-				thread_pool.enabled="true" thread_pool.min_threads="1"
-				thread_pool.max_threads="25" thread_pool.keep_alive_time="5000"
-				thread_pool.queue_enabled="false" thread_pool.queue_max_size="100"
-				thread_pool.rejection_policy="run" oob_thread_pool.enabled="true"
-				oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="8"
-				oob_thread_pool.keep_alive_time="5000"
-				oob_thread_pool.queue_enabled="false"
-				oob_thread_pool.queue_max_size="100"
-				oob_thread_pool.rejection_policy="run" />
-			<MPING timeout="2000" num_initial_members="2" mcast_port="34530"
-				bind_addr="127.0.0.1" mcast_addr="224.0.0.1" />
-
-
-			<MERGE2 max_interval="30000" min_interval="10000" />
-			<FD_SOCK />
-			<FD max_tries="5" shun="true" timeout="10000" />
-			<VERIFY_SUSPECT timeout="1500" />
-			<pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0"
-				retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
-			<UNICAST timeout="300,600,1200,2400,3600" />
-			<pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000"
-				stability_delay="1000" />
-			<pbcast.GMS join_timeout="5000" print_local_addr="true"
-				shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
-			<FRAG2 frag_size="60000" />
-			<pbcast.STREAMING_STATE_TRANSFER />
-			<pbcast.FLUSH timeout="0" />
-
-		</jgroupsConfig>
-
-		<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>

Deleted: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-indexer-config-exoloader_db1tck_ws.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-indexer-config-exoloader_db1tck_ws.xml	2010-01-29 12:53:47 UTC (rev 1623)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-indexer-config-exoloader_db1tck_ws.xml	2010-01-29 13:58:37 UTC (rev 1624)
@@ -1,59 +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="JBoss-Cache-Indexer-Cluster_db1tck_ws">
-		<stateRetrieval timeout="20000" fetchInMemoryState="false"  nonBlocking="true"/>
-		<jgroupsConfig>
-			<TCP bind_addr="127.0.0.1" start_port="9740" loopback="true"
-				recv_buf_size="20000000" send_buf_size="640000"
-				discard_incompatible_packets="true" max_bundle_size="64000"
-				max_bundle_timeout="30" use_incoming_packet_handler="true"
-				enable_bundling="false" use_send_queues="false" sock_conn_timeout="300"
-				skip_suspected_members="true" use_concurrent_stack="true"
-				thread_pool.enabled="true" thread_pool.min_threads="1"
-				thread_pool.max_threads="25" thread_pool.keep_alive_time="5000"
-				thread_pool.queue_enabled="false" thread_pool.queue_max_size="100"
-				thread_pool.rejection_policy="run" oob_thread_pool.enabled="true"
-				oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="8"
-				oob_thread_pool.keep_alive_time="5000"
-				oob_thread_pool.queue_enabled="false"
-				oob_thread_pool.queue_max_size="100"
-				oob_thread_pool.rejection_policy="run" />
-			<MPING timeout="2000" num_initial_members="2" mcast_port="34530"
-				bind_addr="127.0.0.1" mcast_addr="224.0.0.1" />
-
-
-			<MERGE2 max_interval="30000" min_interval="10000" />
-			<FD_SOCK />
-			<FD max_tries="5" shun="true" timeout="10000" />
-			<VERIFY_SUSPECT timeout="1500" />
-			<pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0"
-				retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
-			<UNICAST timeout="300,600,1200,2400,3600" />
-			<pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000"
-				stability_delay="1000" />
-			<pbcast.GMS join_timeout="5000" print_local_addr="true"
-				shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
-			<FRAG2 frag_size="60000" />
-			<pbcast.STREAMING_STATE_TRANSFER />
-			<pbcast.FLUSH timeout="0" />
-
-		</jgroupsConfig>
-
-		<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>

Deleted: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-indexer-config-exoloader_db1tck_ws1.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-indexer-config-exoloader_db1tck_ws1.xml	2010-01-29 12:53:47 UTC (rev 1623)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-indexer-config-exoloader_db1tck_ws1.xml	2010-01-29 13:58:37 UTC (rev 1624)
@@ -1,59 +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="JBoss-Cache-Indexer-Cluster_db1tck_ws1">
-		<stateRetrieval timeout="20000" fetchInMemoryState="false"  nonBlocking="true"/>
-		<jgroupsConfig>
-			<TCP bind_addr="127.0.0.1" start_port="9750" loopback="true"
-				recv_buf_size="20000000" send_buf_size="640000"
-				discard_incompatible_packets="true" max_bundle_size="64000"
-				max_bundle_timeout="30" use_incoming_packet_handler="true"
-				enable_bundling="false" use_send_queues="false" sock_conn_timeout="300"
-				skip_suspected_members="true" use_concurrent_stack="true"
-				thread_pool.enabled="true" thread_pool.min_threads="1"
-				thread_pool.max_threads="25" thread_pool.keep_alive_time="5000"
-				thread_pool.queue_enabled="false" thread_pool.queue_max_size="100"
-				thread_pool.rejection_policy="run" oob_thread_pool.enabled="true"
-				oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="8"
-				oob_thread_pool.keep_alive_time="5000"
-				oob_thread_pool.queue_enabled="false"
-				oob_thread_pool.queue_max_size="100"
-				oob_thread_pool.rejection_policy="run" />
-			<MPING timeout="2000" num_initial_members="2" mcast_port="34530"
-				bind_addr="127.0.0.1" mcast_addr="224.0.0.1" />
-
-
-			<MERGE2 max_interval="30000" min_interval="10000" />
-			<FD_SOCK />
-			<FD max_tries="5" shun="true" timeout="10000" />
-			<VERIFY_SUSPECT timeout="1500" />
-			<pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0"
-				retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
-			<UNICAST timeout="300,600,1200,2400,3600" />
-			<pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000"
-				stability_delay="1000" />
-			<pbcast.GMS join_timeout="5000" print_local_addr="true"
-				shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
-			<FRAG2 frag_size="60000" />
-			<pbcast.STREAMING_STATE_TRANSFER />
-			<pbcast.FLUSH timeout="0" />
-
-		</jgroupsConfig>
-
-		<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>

Deleted: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-indexer-config-exoloader_db1tck_ws2.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-indexer-config-exoloader_db1tck_ws2.xml	2010-01-29 12:53:47 UTC (rev 1623)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-indexer-config-exoloader_db1tck_ws2.xml	2010-01-29 13:58:37 UTC (rev 1624)
@@ -1,59 +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="JBoss-Cache-Indexer-Cluster_db1tck_ws2">
-		<stateRetrieval timeout="20000" fetchInMemoryState="false"  nonBlocking="true"/>
-		<jgroupsConfig>
-			<TCP bind_addr="127.0.0.1" start_port="9760" loopback="true"
-				recv_buf_size="20000000" send_buf_size="640000"
-				discard_incompatible_packets="true" max_bundle_size="64000"
-				max_bundle_timeout="30" use_incoming_packet_handler="true"
-				enable_bundling="false" use_send_queues="false" sock_conn_timeout="300"
-				skip_suspected_members="true" use_concurrent_stack="true"
-				thread_pool.enabled="true" thread_pool.min_threads="1"
-				thread_pool.max_threads="25" thread_pool.keep_alive_time="5000"
-				thread_pool.queue_enabled="false" thread_pool.queue_max_size="100"
-				thread_pool.rejection_policy="run" oob_thread_pool.enabled="true"
-				oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="8"
-				oob_thread_pool.keep_alive_time="5000"
-				oob_thread_pool.queue_enabled="false"
-				oob_thread_pool.queue_max_size="100"
-				oob_thread_pool.rejection_policy="run" />
-			<MPING timeout="2000" num_initial_members="2" mcast_port="34530"
-				bind_addr="127.0.0.1" mcast_addr="224.0.0.1" />
-
-
-			<MERGE2 max_interval="30000" min_interval="10000" />
-			<FD_SOCK />
-			<FD max_tries="5" shun="true" timeout="10000" />
-			<VERIFY_SUSPECT timeout="1500" />
-			<pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0"
-				retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
-			<UNICAST timeout="300,600,1200,2400,3600" />
-			<pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000"
-				stability_delay="1000" />
-			<pbcast.GMS join_timeout="5000" print_local_addr="true"
-				shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
-			<FRAG2 frag_size="60000" />
-			<pbcast.STREAMING_STATE_TRANSFER />
-			<pbcast.FLUSH timeout="0" />
-
-		</jgroupsConfig>
-
-		<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/cluster/test-jbosscache-indexer.xml (from rev 1617, jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mux/test-jbosscache-indexer.xml)
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-indexer.xml	                        (rev 0)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-indexer.xml	2010-01-29 13:58:37 UTC (rev 1624)
@@ -0,0 +1,22 @@
+<?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 multiplexerStack="jcr.stack" />
+      <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/cluster/test-jbosscache-indexer.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Deleted: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-lock-config_db1_ws.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-lock-config_db1_ws.xml	2010-01-29 12:53:47 UTC (rev 1623)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-lock-config_db1_ws.xml	2010-01-29 13:58:37 UTC (rev 1624)
@@ -1,57 +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="JBoss-Cache-Lock-Cluster_db1_ws">
-		<stateRetrieval timeout="20000" fetchInMemoryState="false" nonBlocking="true" />
-		<jgroupsConfig>
-
-			<TCP bind_addr="127.0.0.1" start_port="9800" loopback="true" recv_buf_size="20000000" send_buf_size="640000" discard_incompatible_packets="true"
-				max_bundle_size="64000" max_bundle_timeout="30" use_incoming_packet_handler="true" enable_bundling="false" use_send_queues="false" sock_conn_timeout="300"
-				skip_suspected_members="true" use_concurrent_stack="true" thread_pool.enabled="true" thread_pool.min_threads="1" thread_pool.max_threads="25"
-				thread_pool.keep_alive_time="5000" thread_pool.queue_enabled="false" thread_pool.queue_max_size="100" thread_pool.rejection_policy="run"
-				oob_thread_pool.enabled="true" oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="8" oob_thread_pool.keep_alive_time="5000"
-				oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="100" oob_thread_pool.rejection_policy="run" />
-			<MPING timeout="2000" num_initial_members="2" mcast_port="34540" bind_addr="127.0.0.1" mcast_addr="224.0.0.1" />
-
-
-			<MERGE2 max_interval="30000" min_interval="10000" />
-			<FD_SOCK />
-			<FD max_tries="5" shun="true" timeout="10000" />
-			<VERIFY_SUSPECT timeout="1500" />
-			<pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
-			<UNICAST timeout="300,600,1200,2400,3600" />
-			<pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000" />
-			<pbcast.GMS join_timeout="5000" print_local_addr="true" shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
-			<FRAG2 frag_size="60000" />
-			<pbcast.STREAMING_STATE_TRANSFER />
-			<pbcast.FLUSH timeout="0" />
-
-		</jgroupsConfig>
-
-		<sync />
-	</clustering>
-
-	<loaders passivation="false" shared="true">
-		<preload>
-			<node fqn="/" />
-		</preload>
-		<loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false">
-			<properties>
-				cache.jdbc.table.name=jcrlocks_db1_ws
-				cache.jdbc.table.create=true
-				cache.jdbc.table.drop=false
-				cache.jdbc.table.primarykey=jcrlocks_db1_ws_pk
-				cache.jdbc.fqn.column=fqn
-				cache.jdbc.fqn.type=VARCHAR(512)
-				cache.jdbc.node.column=node
-				cache.jdbc.node.type=LONGBLOB
-				cache.jdbc.parent.column=parent
-				cache.jdbc.datasource=jdbcjcr
-          </properties>
-		</loader>
-
-	</loaders>
-
-</jbosscache>

Deleted: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-lock-config_db1_ws1.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-lock-config_db1_ws1.xml	2010-01-29 12:53:47 UTC (rev 1623)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-lock-config_db1_ws1.xml	2010-01-29 13:58:37 UTC (rev 1624)
@@ -1,57 +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="JBoss-Cache-Lock-Cluster_db1_ws1">
-		<stateRetrieval timeout="20000" fetchInMemoryState="false" nonBlocking="true" />
-		<jgroupsConfig>
-
-			<TCP bind_addr="127.0.0.1" start_port="9810" loopback="true" recv_buf_size="20000000" send_buf_size="640000" discard_incompatible_packets="true"
-				max_bundle_size="64000" max_bundle_timeout="30" use_incoming_packet_handler="true" enable_bundling="false" use_send_queues="false" sock_conn_timeout="300"
-				skip_suspected_members="true" use_concurrent_stack="true" thread_pool.enabled="true" thread_pool.min_threads="1" thread_pool.max_threads="25"
-				thread_pool.keep_alive_time="5000" thread_pool.queue_enabled="false" thread_pool.queue_max_size="100" thread_pool.rejection_policy="run"
-				oob_thread_pool.enabled="true" oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="8" oob_thread_pool.keep_alive_time="5000"
-				oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="100" oob_thread_pool.rejection_policy="run" />
-			<MPING timeout="2000" num_initial_members="2" mcast_port="34542" bind_addr="127.0.0.1" mcast_addr="224.0.0.1" />
-
-
-			<MERGE2 max_interval="30000" min_interval="10000" />
-			<FD_SOCK />
-			<FD max_tries="5" shun="true" timeout="10000" />
-			<VERIFY_SUSPECT timeout="1500" />
-			<pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
-			<UNICAST timeout="300,600,1200,2400,3600" />
-			<pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000" />
-			<pbcast.GMS join_timeout="5000" print_local_addr="true" shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
-			<FRAG2 frag_size="60000" />
-			<pbcast.STREAMING_STATE_TRANSFER />
-			<pbcast.FLUSH timeout="0" />
-
-		</jgroupsConfig>
-
-		<sync />
-	</clustering>
-
-	<loaders passivation="false" shared="true">
-		<preload>
-			<node fqn="/" />
-		</preload>
-		<loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false">
-			<properties>
-				cache.jdbc.table.name=jcrlocks_db1_ws1
-				cache.jdbc.table.create=true
-				cache.jdbc.table.drop=false
-				cache.jdbc.table.primarykey=jcrlocks_db1_ws1_pk
-				cache.jdbc.fqn.column=fqn
-				cache.jdbc.fqn.type=VARCHAR(512)
-				cache.jdbc.node.column=node
-				cache.jdbc.node.type=LONGBLOB
-				cache.jdbc.parent.column=parent
-				cache.jdbc.datasource=jdbcjcr
-          </properties>
-		</loader>
-
-	</loaders>
-
-</jbosscache>

Deleted: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-lock-config_db1_ws2.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-lock-config_db1_ws2.xml	2010-01-29 12:53:47 UTC (rev 1623)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-lock-config_db1_ws2.xml	2010-01-29 13:58:37 UTC (rev 1624)
@@ -1,57 +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="JBoss-Cache-Lock-Cluster_db1_ws2">
-		<stateRetrieval timeout="20000" fetchInMemoryState="false" nonBlocking="true" />
-		<jgroupsConfig>
-
-			<TCP bind_addr="127.0.0.1" start_port="9820" loopback="true" recv_buf_size="20000000" send_buf_size="640000" discard_incompatible_packets="true"
-				max_bundle_size="64000" max_bundle_timeout="30" use_incoming_packet_handler="true" enable_bundling="false" use_send_queues="false" sock_conn_timeout="300"
-				skip_suspected_members="true" use_concurrent_stack="true" thread_pool.enabled="true" thread_pool.min_threads="1" thread_pool.max_threads="25"
-				thread_pool.keep_alive_time="5000" thread_pool.queue_enabled="false" thread_pool.queue_max_size="100" thread_pool.rejection_policy="run"
-				oob_thread_pool.enabled="true" oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="8" oob_thread_pool.keep_alive_time="5000"
-				oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="100" oob_thread_pool.rejection_policy="run" />
-			<MPING timeout="2000" num_initial_members="2" mcast_port="34540" bind_addr="127.0.0.1" mcast_addr="224.0.0.1" />
-
-
-			<MERGE2 max_interval="30000" min_interval="10000" />
-			<FD_SOCK />
-			<FD max_tries="5" shun="true" timeout="10000" />
-			<VERIFY_SUSPECT timeout="1500" />
-			<pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
-			<UNICAST timeout="300,600,1200,2400,3600" />
-			<pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000" />
-			<pbcast.GMS join_timeout="5000" print_local_addr="true" shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
-			<FRAG2 frag_size="60000" />
-			<pbcast.STREAMING_STATE_TRANSFER />
-			<pbcast.FLUSH timeout="0" />
-
-		</jgroupsConfig>
-
-		<sync />
-	</clustering>
-
-	<loaders passivation="false" shared="true">
-		<preload>
-			<node fqn="/" />
-		</preload>
-		<loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false">
-			<properties>
-				cache.jdbc.table.name=jcrlocks_db1_ws2
-				cache.jdbc.table.create=true
-				cache.jdbc.table.drop=false
-				cache.jdbc.table.primarykey=jcrlocks_db1_ws2_pk
-				cache.jdbc.fqn.column=fqn
-				cache.jdbc.fqn.type=VARCHAR(512)
-				cache.jdbc.node.column=node
-				cache.jdbc.node.type=LONGBLOB
-				cache.jdbc.parent.column=parent
-				cache.jdbc.datasource=jdbcjcr
-          </properties>
-		</loader>
-
-	</loaders>
-
-</jbosscache>

Deleted: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-lock-config_db1_ws3.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-lock-config_db1_ws3.xml	2010-01-29 12:53:47 UTC (rev 1623)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-lock-config_db1_ws3.xml	2010-01-29 13:58:37 UTC (rev 1624)
@@ -1,57 +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="JBoss-Cache-Lock-Cluster_db1_ws3">
-		<stateRetrieval timeout="20000" fetchInMemoryState="false" nonBlocking="true" />
-		<jgroupsConfig>
-
-			<TCP bind_addr="127.0.0.1" start_port="9830" loopback="true" recv_buf_size="20000000" send_buf_size="640000" discard_incompatible_packets="true"
-				max_bundle_size="64000" max_bundle_timeout="30" use_incoming_packet_handler="true" enable_bundling="false" use_send_queues="false" sock_conn_timeout="300"
-				skip_suspected_members="true" use_concurrent_stack="true" thread_pool.enabled="true" thread_pool.min_threads="1" thread_pool.max_threads="25"
-				thread_pool.keep_alive_time="5000" thread_pool.queue_enabled="false" thread_pool.queue_max_size="100" thread_pool.rejection_policy="run"
-				oob_thread_pool.enabled="true" oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="8" oob_thread_pool.keep_alive_time="5000"
-				oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="100" oob_thread_pool.rejection_policy="run" />
-			<MPING timeout="2000" num_initial_members="2" mcast_port="34540" bind_addr="127.0.0.1" mcast_addr="224.0.0.1" />
-
-
-			<MERGE2 max_interval="30000" min_interval="10000" />
-			<FD_SOCK />
-			<FD max_tries="5" shun="true" timeout="10000" />
-			<VERIFY_SUSPECT timeout="1500" />
-			<pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
-			<UNICAST timeout="300,600,1200,2400,3600" />
-			<pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000" />
-			<pbcast.GMS join_timeout="5000" print_local_addr="true" shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
-			<FRAG2 frag_size="60000" />
-			<pbcast.STREAMING_STATE_TRANSFER />
-			<pbcast.FLUSH timeout="0" />
-
-		</jgroupsConfig>
-
-		<sync />
-	</clustering>
-
-	<loaders passivation="false" shared="true">
-		<preload>
-			<node fqn="/" />
-		</preload>
-		<loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false">
-			<properties>
-				cache.jdbc.table.name=jcrlocks_db1_ws3
-				cache.jdbc.table.create=true
-				cache.jdbc.table.drop=false
-				cache.jdbc.table.primarykey=jcrlocks_db1_ws3_pk
-				cache.jdbc.fqn.column=fqn
-				cache.jdbc.fqn.type=VARCHAR(512)
-				cache.jdbc.node.column=node
-				cache.jdbc.node.type=LONGBLOB
-				cache.jdbc.parent.column=parent
-				cache.jdbc.datasource=jdbcjcr
-          </properties>
-		</loader>
-
-	</loaders>
-
-</jbosscache>

Deleted: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-lock-config_db1tck_ws.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-lock-config_db1tck_ws.xml	2010-01-29 12:53:47 UTC (rev 1623)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-lock-config_db1tck_ws.xml	2010-01-29 13:58:37 UTC (rev 1624)
@@ -1,57 +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="JBoss-Cache-Lock-Cluster_db1tck_ws">
-		<stateRetrieval timeout="20000" fetchInMemoryState="false" nonBlocking="true" />
-		<jgroupsConfig>
-
-			<TCP bind_addr="127.0.0.1" start_port="9840" loopback="true" recv_buf_size="20000000" send_buf_size="640000" discard_incompatible_packets="true"
-				max_bundle_size="64000" max_bundle_timeout="30" use_incoming_packet_handler="true" enable_bundling="false" use_send_queues="false" sock_conn_timeout="300"
-				skip_suspected_members="true" use_concurrent_stack="true" thread_pool.enabled="true" thread_pool.min_threads="1" thread_pool.max_threads="25"
-				thread_pool.keep_alive_time="5000" thread_pool.queue_enabled="false" thread_pool.queue_max_size="100" thread_pool.rejection_policy="run"
-				oob_thread_pool.enabled="true" oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="8" oob_thread_pool.keep_alive_time="5000"
-				oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="100" oob_thread_pool.rejection_policy="run" />
-			<MPING timeout="2000" num_initial_members="2" mcast_port="34540" bind_addr="127.0.0.1" mcast_addr="224.0.0.1" />
-
-
-			<MERGE2 max_interval="30000" min_interval="10000" />
-			<FD_SOCK />
-			<FD max_tries="5" shun="true" timeout="10000" />
-			<VERIFY_SUSPECT timeout="1500" />
-			<pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
-			<UNICAST timeout="300,600,1200,2400,3600" />
-			<pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000" />
-			<pbcast.GMS join_timeout="5000" print_local_addr="true" shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
-			<FRAG2 frag_size="60000" />
-			<pbcast.STREAMING_STATE_TRANSFER />
-			<pbcast.FLUSH timeout="0" />
-
-		</jgroupsConfig>
-
-		<sync />
-	</clustering>
-
-	<loaders passivation="false" shared="true">
-		<preload>
-			<node fqn="/" />
-		</preload>
-		<loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false">
-			<properties>
-				cache.jdbc.table.name=jcrlocks_db1tck_ws
-				cache.jdbc.table.create=true
-				cache.jdbc.table.drop=false
-				cache.jdbc.table.primarykey=jcrlocks_db1tck_ws_pk
-				cache.jdbc.fqn.column=fqn
-				cache.jdbc.fqn.type=VARCHAR(512)
-				cache.jdbc.node.column=node
-				cache.jdbc.node.type=LONGBLOB
-				cache.jdbc.parent.column=parent
-				cache.jdbc.datasource=jdbcjcr
-          </properties>
-		</loader>
-
-	</loaders>
-
-</jbosscache>

Deleted: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-lock-config_db1tck_ws1.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-lock-config_db1tck_ws1.xml	2010-01-29 12:53:47 UTC (rev 1623)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-lock-config_db1tck_ws1.xml	2010-01-29 13:58:37 UTC (rev 1624)
@@ -1,57 +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="JBoss-Cache-Lock-Cluster_db1tck_ws1">
-		<stateRetrieval timeout="20000" fetchInMemoryState="false" nonBlocking="true" />
-		<jgroupsConfig>
-
-			<TCP bind_addr="127.0.0.1" start_port="9850" loopback="true" recv_buf_size="20000000" send_buf_size="640000" discard_incompatible_packets="true"
-				max_bundle_size="64000" max_bundle_timeout="30" use_incoming_packet_handler="true" enable_bundling="false" use_send_queues="false" sock_conn_timeout="300"
-				skip_suspected_members="true" use_concurrent_stack="true" thread_pool.enabled="true" thread_pool.min_threads="1" thread_pool.max_threads="25"
-				thread_pool.keep_alive_time="5000" thread_pool.queue_enabled="false" thread_pool.queue_max_size="100" thread_pool.rejection_policy="run"
-				oob_thread_pool.enabled="true" oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="8" oob_thread_pool.keep_alive_time="5000"
-				oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="100" oob_thread_pool.rejection_policy="run" />
-			<MPING timeout="2000" num_initial_members="2" mcast_port="34540" bind_addr="127.0.0.1" mcast_addr="224.0.0.1" />
-
-
-			<MERGE2 max_interval="30000" min_interval="10000" />
-			<FD_SOCK />
-			<FD max_tries="5" shun="true" timeout="10000" />
-			<VERIFY_SUSPECT timeout="1500" />
-			<pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
-			<UNICAST timeout="300,600,1200,2400,3600" />
-			<pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000" />
-			<pbcast.GMS join_timeout="5000" print_local_addr="true" shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
-			<FRAG2 frag_size="60000" />
-			<pbcast.STREAMING_STATE_TRANSFER />
-			<pbcast.FLUSH timeout="0" />
-
-		</jgroupsConfig>
-
-		<sync />
-	</clustering>
-
-	<loaders passivation="false" shared="true">
-		<preload>
-			<node fqn="/" />
-		</preload>
-		<loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false">
-			<properties>
-				cache.jdbc.table.name=jcrlocks_db1tck_ws1
-				cache.jdbc.table.create=true
-				cache.jdbc.table.drop=false
-				cache.jdbc.table.primarykey=jcrlocks_db1tck_ws1_pk
-				cache.jdbc.fqn.column=fqn
-				cache.jdbc.fqn.type=VARCHAR(512)
-				cache.jdbc.node.column=node
-				cache.jdbc.node.type=LONGBLOB
-				cache.jdbc.parent.column=parent
-				cache.jdbc.datasource=jdbcjcr
-          </properties>
-		</loader>
-
-	</loaders>
-
-</jbosscache>

Deleted: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-lock-config_db1tck_ws2.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-lock-config_db1tck_ws2.xml	2010-01-29 12:53:47 UTC (rev 1623)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-lock-config_db1tck_ws2.xml	2010-01-29 13:58:37 UTC (rev 1624)
@@ -1,57 +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="JBoss-Cache-Lock-Cluster_db1tck_ws2">
-		<stateRetrieval timeout="20000" fetchInMemoryState="false" nonBlocking="true" />
-		<jgroupsConfig>
-
-			<TCP bind_addr="127.0.0.1" start_port="9860" loopback="true" recv_buf_size="20000000" send_buf_size="640000" discard_incompatible_packets="true"
-				max_bundle_size="64000" max_bundle_timeout="30" use_incoming_packet_handler="true" enable_bundling="false" use_send_queues="false" sock_conn_timeout="300"
-				skip_suspected_members="true" use_concurrent_stack="true" thread_pool.enabled="true" thread_pool.min_threads="1" thread_pool.max_threads="25"
-				thread_pool.keep_alive_time="5000" thread_pool.queue_enabled="false" thread_pool.queue_max_size="100" thread_pool.rejection_policy="run"
-				oob_thread_pool.enabled="true" oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="8" oob_thread_pool.keep_alive_time="5000"
-				oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="100" oob_thread_pool.rejection_policy="run" />
-			<MPING timeout="2000" num_initial_members="2" mcast_port="34540" bind_addr="127.0.0.1" mcast_addr="224.0.0.1" />
-
-
-			<MERGE2 max_interval="30000" min_interval="10000" />
-			<FD_SOCK />
-			<FD max_tries="5" shun="true" timeout="10000" />
-			<VERIFY_SUSPECT timeout="1500" />
-			<pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
-			<UNICAST timeout="300,600,1200,2400,3600" />
-			<pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000" />
-			<pbcast.GMS join_timeout="5000" print_local_addr="true" shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
-			<FRAG2 frag_size="60000" />
-			<pbcast.STREAMING_STATE_TRANSFER />
-			<pbcast.FLUSH timeout="0" />
-
-		</jgroupsConfig>
-
-		<sync />
-	</clustering>
-
-	<loaders passivation="false" shared="true">
-		<preload>
-			<node fqn="/" />
-		</preload>
-		<loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false">
-			<properties>
-				cache.jdbc.table.name=jcrlocks_db1tck_ws2
-				cache.jdbc.table.create=true
-				cache.jdbc.table.drop=false
-				cache.jdbc.table.primarykey=jcrlocks_db1tck_ws2_pk
-				cache.jdbc.fqn.column=fqn
-				cache.jdbc.fqn.type=VARCHAR(512)
-				cache.jdbc.node.column=node
-				cache.jdbc.node.type=LONGBLOB
-				cache.jdbc.parent.column=parent
-				cache.jdbc.datasource=jdbcjcr
-          </properties>
-		</loader>
-
-	</loaders>
-
-</jbosscache>

Copied: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-lock.xml (from rev 1617, jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mux/test-jbosscache-lock.xml)
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-lock.xml	                        (rev 0)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-lock.xml	2010-01-29 13:58:37 UTC (rev 1624)
@@ -0,0 +1,39 @@
+<?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 multiplexerStack="jcr.stack" />
+      <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/cluster/test-jbosscache-lock.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config.xml	2010-01-29 12:53:47 UTC (rev 1623)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config.xml	2010-01-29 13:58:37 UTC (rev 1624)
@@ -42,9 +42,6 @@
                      <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="jdbc-source-name" value="jdbcjcr" />
                         </properties>
                         <filters>
                            <filter property-type="Binary" />
@@ -57,29 +54,42 @@
                      <property name="root-nodetype" value="nt:unstructured" />
                   </properties>
                </initializer>
-               <!-- initializer class="org.exoplatform.services.jcr.impl.core.RestoreWorkspaceInitializer">
-                  <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/cluster/test-jbosscache-config-db1-ws.xml" />
+                     <property name="jbosscache-configuration" value="test-jbosscache-data.xml" />
+                     <property name="jgroups-configuration" value="udp-mux.xml" />
+                     <property name="jgroups-multiplexer-stack" value="true" />
+                     <property name="jbosscache-cluster-name" value="JCR-cluster-db1-ws" />
                   </properties>
                </cache>
                <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
                   <properties>
-                     <property name="index-dir" value="target/cluster_nfs/db1/ws" />
+                     <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/cluster/test-jbosscache-indexer-config-exoloader_db1_ws.xml" />
+                     <property name="jbosscache-configuration" value="test-jbosscache-indexer.xml" />
+                     <property name="jgroups-configuration" value="udp-mux.xml" />
+                     <property name="jgroups-multiplexer-stack" value="true" />
+                     <property name="jbosscache-cluster-name" value="JCR-cluster-indexer-db1-ws" />
                      <property name="max-volatile-time" value="60" />
                    </properties>
                </query-handler>
                <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/standalone/cluster/test-jbosscache-lock-config_db1_ws.xml" />
+                     <property name="jbosscache-configuration" value="test-jbosscache-lock.xml" />
+                     <property name="jgroups-configuration" value="udp-mux.xml" />
+                     <property name="jgroups-multiplexer-stack" value="true" />
+                     <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"/>
+                     <property name="jbosscache-cl-cache.jdbc.table.drop" value="false"/>
+                     <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="jcrlocks_db1_ws_pk"/>
+                     <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn"/>
+                     <property name="jbosscache-cl-cache.jdbc.fqn.type" value="VARCHAR(512)"/>
+                     <property name="jbosscache-cl-cache.jdbc.node.column" value="node"/>
+                     <property name="jbosscache-cl-cache.jdbc.node.type" value="LONGBLOB"/>
+                     <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent"/>
+                     <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr"/>
                   </properties>
                </lock-manager>
             </workspace>
@@ -106,28 +116,48 @@
                </container>
                <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
                   <properties>
-                     <property name="jbosscache-configuration" value="conf/standalone/cluster/test-jbosscache-config-db1-ws1.xml" />
+                     <property name="jbosscache-configuration" value="test-jbosscache-data.xml" />
+                     <property name="jgroups-configuration" value="udp-mux.xml" />
+                     <property name="jgroups-multiplexer-stack" value="true" />
+                     <property name="jbosscache-cluster-name" value="JCR-cluster-db1-ws1" />
                   </properties>
                </cache>
                <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
                   <properties>
-                     <property name="index-dir" value="target/cluster_nfs/db1/ws1" />
+                     <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/standalone/cluster/test-jbosscache-indexer-config-exoloader_db1_ws1.xml" />
+                     <property name="jbosscache-configuration" value="test-jbosscache-indexer.xml" />
+                     <property name="jgroups-configuration" value="udp-mux.xml" />
+                     <property name="jgroups-multiplexer-stack" value="true" />
+                     <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="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.CacheableLockManager">
                   <properties>
                      <property name="time-out" value="15m" />
-                     <property name="jbosscache-configuration" value="conf/standalone/cluster/test-jbosscache-lock-config_db1_ws1.xml" />
-                  </properties>
+                     <property name="jbosscache-configuration" value="test-jbosscache-lock.xml" />
+                     <property name="jgroups-configuration" value="udp-mux.xml" />
+                     <property name="jgroups-multiplexer-stack" value="true" />
+                     <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"/>
+                     <property name="jbosscache-cl-cache.jdbc.table.drop" value="false"/>
+                     <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="jcrlocks_db1_ws1_pk"/>
+                     <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn"/>
+                     <property name="jbosscache-cl-cache.jdbc.fqn.type" value="VARCHAR(512)"/>
+                     <property name="jbosscache-cl-cache.jdbc.node.column" value="node"/>
+                     <property name="jbosscache-cl-cache.jdbc.node.type" value="LONGBLOB"/>
+                     <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent"/>
+                     <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr"/>                  </properties>
                </lock-manager>
             </workspace>
 
@@ -153,27 +183,48 @@
                </container>
                <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
                   <properties>
-                     <property name="jbosscache-configuration" value="conf/standalone/cluster/test-jbosscache-config-db1-ws2.xml" />
+                     <property name="jbosscache-configuration" value="test-jbosscache-data.xml" />
+                     <property name="jgroups-configuration" value="udp-mux.xml" />
+                     <property name="jgroups-multiplexer-stack" value="true" />
+                     <property name="jbosscache-cluster-name" value="JCR-cluster-db1-ws2" />
                   </properties>
                </cache>
                <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
                   <properties>
-                     <property name="index-dir" value="target/cluster_nfs/db1/ws2" />
+                     <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/standalone/cluster/test-jbosscache-indexer-config-exoloader_db1_ws2.xml" />
+                     <property name="jbosscache-configuration" value="test-jbosscache-indexer.xml" />
+                     <property name="jgroups-configuration" value="udp-mux.xml" />
+                     <property name="jgroups-multiplexer-stack" value="true" />
+                     <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="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.CacheableLockManager">
                   <properties>
                      <property name="time-out" value="15m" />
-                     <property name="jbosscache-configuration" value="conf/standalone/cluster/test-jbosscache-lock-config_db1_ws2.xml" />
+                     <property name="jbosscache-configuration" value="test-jbosscache-lock.xml" />
+                     <property name="jgroups-configuration" value="udp-mux.xml" />
+                     <property name="jgroups-multiplexer-stack" value="true" />
+                     <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"/>
+                     <property name="jbosscache-cl-cache.jdbc.table.drop" value="false"/>
+                     <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="jcrlocks_db1_ws2_pk"/>
+                     <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn"/>
+                     <property name="jbosscache-cl-cache.jdbc.fqn.type" value="VARCHAR(512)"/>
+                     <property name="jbosscache-cl-cache.jdbc.node.column" value="node"/>
+                     <property name="jbosscache-cl-cache.jdbc.node.type" value="LONGBLOB"/>
+                     <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent"/>
+                     <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr"/>
                   </properties>
                </lock-manager>
             </workspace>
@@ -189,53 +240,81 @@
                      <property name="swap-directory" value="target/temp/swap/ws3" />
                   </properties>
                  <value-storages>
-				 <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="jdbcjcr3" />
-				</properties>
-				<filters>
-					<filter property-type="Binary" />
-				</filters>
-				</value-storage>
-			</value-storages>
-			</container>
-			<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
-				<properties>
-					<property name="jbosscache-configuration" value="conf/standalone/cluster/test-jbosscache-config-db1-ws3.xml" />
-				</properties>
-			</cache>
-			<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
-				<properties>
-					<property name="index-dir" value="target/cluster_nfs/db1/ws3" />
-					<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
-					<property name="jbosscache-configuration" value="conf/standalone/cluster/test-jbosscache-indexer-config-exoloader_db1_ws3.xml" />
-					<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="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" />
+                     <!--
+                       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>
+               <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
+                  <properties>
+                     <property name="jbosscache-configuration" value="test-jbosscache-data.xml" />
+                     <property name="jgroups-configuration" value="udp-mux.xml" />
+                     <property name="jgroups-multiplexer-stack" value="true" />
+                     <property name="jbosscache-cluster-name" value="JCR-cluster-db1-ws3" />
                   </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="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
+                     <property name="jbosscache-configuration" value="test-jbosscache-indexer.xml" />
+                     <property name="jgroups-configuration" value="udp-mux.xml" />
+                     <property name="jgroups-multiplexer-stack" value="true" />
+                     <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="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.CacheableLockManager">
                   <properties>
                      <property name="time-out" value="15m" />
-                     <property name="jbosscache-configuration" value="conf/standalone/cluster/test-jbosscache-lock-config_db1_ws3.xml" />
-                      </properties>
-                    </lock-manager>
-				</workspace>
+                     <property name="jbosscache-configuration" value="test-jbosscache-lock.xml" />
+                     <property name="jgroups-configuration" value="udp-mux.xml" />
+                     <property name="jgroups-multiplexer-stack" value="true" />
+                     <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"/>
+                     <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.fqn.type" value="VARCHAR(512)"/>
+                     <property name="jbosscache-cl-cache.jdbc.node.column" value="node"/>
+                     <property name="jbosscache-cl-cache.jdbc.node.type" value="LONGBLOB"/>
+                     <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent"/>
+                     <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr"/>
+                  </properties>
+               </lock-manager>
+            </workspace>
+
+            
          </workspaces>
       </repository>
 
@@ -275,15 +354,22 @@
                </initializer>
                <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
                   <properties>
-                     <property name="jbosscache-configuration" value="conf/standalone/cluster/test-jbosscache-config-db1tck-ws.xml" />
+                     <property name="jbosscache-configuration" value="test-jbosscache-data.xml" />
+                     <property name="jgroups-configuration" value="udp-mux.xml" />
+                     <property name="jgroups-multiplexer-stack" value="true" />
+                     <property name="jbosscache-cluster-name" value="JCR-cluster-db1tck-ws" />
                   </properties>
                </cache>
                <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
                   <properties>
-                     <property name="index-dir" value="target/cluster_nfs/db1tck/ws" />
+                     <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/standalone/cluster/test-jbosscache-indexer-config-exoloader_db1tck_ws.xml" />
+                     <property name="jbosscache-configuration" value="test-jbosscache-indexer.xml" />
+                     <property name="jgroups-configuration" value="udp-mux.xml" />
+                     <property name="jgroups-multiplexer-stack" value="true" />
+                     <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="support-highlighting" value="true" />
@@ -296,7 +382,20 @@
                <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/standalone/cluster/test-jbosscache-lock-config_db1tck_ws.xml" />
+                     <property name="jbosscache-configuration" value="test-jbosscache-lock.xml" />
+                     <property name="jgroups-configuration" value="udp-mux.xml" />
+                     <property name="jgroups-multiplexer-stack" value="true" />
+                     <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"/>
+                     <property name="jbosscache-cl-cache.jdbc.table.drop" value="false"/>
+                     <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="jcrlocks_db1tck_ws_pk"/>
+                     <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn"/>
+                     <property name="jbosscache-cl-cache.jdbc.fqn.type" value="VARCHAR(512)"/>
+                     <property name="jbosscache-cl-cache.jdbc.node.column" value="node"/>
+                     <property name="jbosscache-cl-cache.jdbc.node.type" value="LONGBLOB"/>
+                     <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent"/>
+                     <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr"/>
                   </properties>
                </lock-manager>
             </workspace>
@@ -329,14 +428,20 @@
                </initializer>
                <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
                   <properties>
-                     <property name="jbosscache-configuration" value="conf/standalone/cluster/test-jbosscache-config-db1tck-ws1.xml" />
+                     <property name="jbosscache-configuration" value="test-jbosscache-data.xml" />
+                     <property name="jgroups-configuration" value="udp-mux.xml" />
+                     <property name="jgroups-multiplexer-stack" value="true" />
+                     <property name="jbosscache-cluster-name" value="JCR-cluster-db1tck-ws1" />
                   </properties>
                </cache>
                <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
                   <properties>
-                     <property name="index-dir" value="target/cluster_nfs/db1tck/ws1" />
+                     <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/standalone/cluster/test-jbosscache-indexer-config-exoloader_db1tck_ws1.xml" />
+                     <property name="jbosscache-configuration" value="test-jbosscache-indexer.xml" />
+                     <property name="jgroups-configuration" value="udp-mux.xml" />
+                     <property name="jgroups-multiplexer-stack" value="true" />
+                     <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" />
@@ -349,7 +454,20 @@
                <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/standalone/cluster/test-jbosscache-lock-config_db1tck_ws1.xml" />
+                     <property name="jbosscache-configuration" value="test-jbosscache-lock.xml" />
+                     <property name="jgroups-configuration" value="udp-mux.xml" />
+                     <property name="jgroups-multiplexer-stack" value="true" />
+                     <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"/>
+                     <property name="jbosscache-cl-cache.jdbc.table.drop" value="false"/>
+                     <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="jcrlocks_db1tck_ws1_pk"/>
+                     <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn"/>
+                     <property name="jbosscache-cl-cache.jdbc.fqn.type" value="VARCHAR(512)"/>
+                     <property name="jbosscache-cl-cache.jdbc.node.column" value="node"/>
+                     <property name="jbosscache-cl-cache.jdbc.node.type" value="LONGBLOB"/>
+                     <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent"/>
+                     <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr"/>
                   </properties>
                </lock-manager>
             </workspace>
@@ -382,14 +500,20 @@
                </initializer>
                <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
                   <properties>
-                     <property name="jbosscache-configuration" value="conf/standalone/cluster/test-jbosscache-config-db1tck-ws2.xml" />
+                     <property name="jbosscache-configuration" value="test-jbosscache-data.xml" />
+                     <property name="jgroups-configuration" value="udp-mux.xml" />
+                     <property name="jgroups-multiplexer-stack" value="true" />
+                     <property name="jbosscache-cluster-name" value="JCR-cluster-db1tck-ws2" />
                   </properties>
                </cache>
                <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
                   <properties>
-                     <property name="index-dir" value="target/cluster_nfs/db1tck/ws2" />
+                     <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/standalone/cluster/test-jbosscache-indexer-config-exoloader_db1tck_ws2.xml" />
+                     <property name="jbosscache-configuration" value="test-jbosscache-indexer.xml" />
+                     <property name="jgroups-configuration" value="udp-mux.xml" />
+                     <property name="jgroups-multiplexer-stack" value="true" />
+                     <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" />
@@ -405,7 +529,20 @@
                <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/standalone/cluster/test-jbosscache-lock-config_db1tck_ws2.xml" />
+                     <property name="jbosscache-configuration" value="test-jbosscache-lock.xml" />
+                     <property name="jgroups-configuration" value="udp-mux.xml" />
+                     <property name="jgroups-multiplexer-stack" value="true" />
+                     <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"/>
+                     <property name="jbosscache-cl-cache.jdbc.table.drop" value="false"/>
+                     <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="jcrlocks_db1tck_ws2_pk"/>
+                     <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn"/>
+                     <property name="jbosscache-cl-cache.jdbc.fqn.type" value="VARCHAR(512)"/>
+                     <property name="jbosscache-cl-cache.jdbc.node.column" value="node"/>
+                     <property name="jbosscache-cl-cache.jdbc.node.type" value="LONGBLOB"/>
+                     <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent"/>
+                     <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr"/>
                   </properties>
                </lock-manager>
             </workspace>

Copied: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/udp-mux.xml (from rev 1617, jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mux/udp-mux.xml)
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/udp-mux.xml	                        (rev 0)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/udp-mux.xml	2010-01-29 13:58:37 UTC (rev 1624)
@@ -0,0 +1,33 @@
+<protocol_stacks>
+   <stack name="jcr.stack">
+      <config>
+         <UDP mcast_addr="228.10.10.10" mcast_port="45588" tos="8" ucast_recv_buf_size="20000000"
+            ucast_send_buf_size="640000" mcast_recv_buf_size="25000000" mcast_send_buf_size="640000" loopback="false"
+            discard_incompatible_packets="true" max_bundle_size="64000" max_bundle_timeout="30"
+            use_incoming_packet_handler="true" ip_ttl="2" enable_bundling="true" enable_diagnostics="true"
+            thread_naming_pattern="cl" use_concurrent_stack="true" thread_pool.enabled="true" thread_pool.min_threads="2"
+            thread_pool.max_threads="8" thread_pool.keep_alive_time="5000" thread_pool.queue_enabled="true"
+            thread_pool.queue_max_size="1000" thread_pool.rejection_policy="discard" oob_thread_pool.enabled="true"
+            oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="8" oob_thread_pool.keep_alive_time="5000"
+            oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="100" oob_thread_pool.rejection_policy="Run" />
+
+         <PING timeout="2000" num_initial_members="3" />
+         <MERGE2 max_interval="30000" min_interval="10000" />
+         <FD_SOCK />
+         <FD timeout="10000" max_tries="5" shun="true" />
+         <VERIFY_SUSPECT timeout="1500" />
+         <BARRIER />
+         <pbcast.NAKACK use_stats_for_retransmission="false" exponential_backoff="150" use_mcast_xmit="true"
+            gc_lag="0" retransmit_timeout="50,300,600,1200" discard_delivered_msgs="true" />
+         <UNICAST timeout="300,600,1200" />
+         <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" max_bytes="1000000" />
+         <VIEW_SYNC avg_send_interval="60000" />
+         <pbcast.GMS print_local_addr="true" join_timeout="3000" shun="false" view_bundling="true" />
+         <FC max_credits="500000" min_threshold="0.20" />
+         <FRAG2 frag_size="60000" />
+         <!--pbcast.STREAMING_STATE_TRANSFER /-->
+         <pbcast.STATE_TRANSFER />
+         <!-- pbcast.FLUSH  /-->
+      </config>
+   </stack>
+</protocol_stacks> 


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



More information about the exo-jcr-commits mailing list