Author: skabashnyuk Date: 2009-11-23 05:00:16 -0500 (Mon, 23 Nov 2009) New Revision: 802 Modified: jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jbosscache-config-exoloader.xml jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jcr-config.xml Log: EXOJCR-199 : All ws on JBC Modified: jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jbosscache-config-exoloader.xml =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jbosscache-config-exoloader.xml 2009-11-23 09:53:45 UTC (rev 801) +++ jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jbosscache-config-exoloader.xml 2009-11-23 10:00:16 UTC (rev 802) @@ -6,51 +6,8 @@ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup" /> - <clustering mode="replication"> - - <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="localhost" 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="true" 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="3" mcast_port="34526" bind_addr="localhost" 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 /> - <!-- Alternatively, to use async replication, comment out the element above and uncomment the element below. --> - <!-- <async /> --> - </clustering> <loaders passivation="false" shared="false"> <!-- loader class="org.jboss.cache.loader.FileCacheLoader" async="false" Modified: jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jcr-config.xml =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jcr-config.xml 2009-11-23 09:53:45 UTC (rev 801) +++ jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jcr-config.xml 2009-11-23 10:00:16 UTC (rev 802) @@ -72,12 +72,14 @@ <property name="path" value="target/temp/lock" /> </properties> </persister> - </lock-manager --> + </lock-manager +--> </workspace> <workspace name="ws1"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <container class="org.exoplatform.services.jcr.impl.storage.jbosscache.JBossCacheWorkspaceDataContainer"> <properties> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config-exoloader.xml" /> <property name="source-name" value="jdbcjcr1" /> <property name="dialect" value="hsqldb" /> <property name="multi-db" value="true" /> @@ -96,12 +98,7 @@ </value-storage> </value-storages> </container> - <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl"> - <properties> - <property name="max-size" value="2k" /> - <property name="live-time" value="20m" /> - </properties> - </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> <properties> <property name="index-dir" value="target/temp/index/db1/ws1" /> @@ -116,8 +113,9 @@ </workspace> <workspace name="ws2"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <container class="org.exoplatform.services.jcr.impl.storage.jbosscache.JBossCacheWorkspaceDataContainer"> <properties> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config-exoloader.xml" /> <property name="source-name" value="jdbcjcr2" /> <property name="dialect" value="hsqldb" /> <property name="multi-db" value="true" /> @@ -136,12 +134,7 @@ </value-storage> </value-storages> </container> - <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl"> - <properties> - <property name="max-size" value="2k" /> - <property name="live-time" value="20m" /> - </properties> - </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> <properties> <property name="index-dir" value="target/temp/index/db1/ws2" /> @@ -158,8 +151,9 @@ <workspace name="ws3"> <!-- for system storage --> <container - class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + class="org.exoplatform.services.jcr.impl.storage.jbosscache.JBossCacheWorkspaceDataContainer"> <properties> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config-exoloader.xml" /> <property name="source-name" value="jdbcjcr3" /> <property name="dialect" value="hsqldb" /> <property name="multi-db" value="true" /> @@ -204,13 +198,6 @@ <property name="root-nodetype" value="nt:unstructured" /> </properties> </initializer> - <cache enabled="true" - class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl"> - <properties> - <property name="max-size" value="2k" /> - <property name="live-time" value="20m" /> - </properties> - </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> <properties> @@ -239,8 +226,9 @@ <workspaces> <workspace name="ws"> <!-- for system storage --> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <container class="org.exoplatform.services.jcr.impl.storage.jbosscache.JBossCacheWorkspaceDataContainer"> <properties> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config-exoloader.xml" /> <property name="source-name" value="jdbcjcrtck" /> <property name="dialect" value="hsqldb" /> <property name="multi-db" value="true" /> @@ -265,12 +253,6 @@ <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" /> </properties> </initializer> - <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl"> - <properties> - <property name="max-size" value="2k" /> - <property name="live-time" value="20m" /> - </properties> - </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> <properties> <property name="index-dir" value="target/temp/index/db1tck/ws" /> @@ -294,8 +276,9 @@ </workspace> <workspace name="ws1"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <container class="org.exoplatform.services.jcr.impl.storage.jbosscache.JBossCacheWorkspaceDataContainer"> <properties> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config-exoloader.xml" /> <property name="source-name" value="jdbcjcr1tck" /> <property name="dialect" value="hsqldb" /> <property name="multi-db" value="true" /> @@ -320,12 +303,6 @@ <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" /> </properties> </initializer> - <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl"> - <properties> - <property name="max-size" value="2k" /> - <property name="live-time" value="20m" /> - </properties> - </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> <properties> <property name="index-dir" value="target/temp/index/db1tck/ws1" /> @@ -340,8 +317,9 @@ </workspace> <workspace name="ws2"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <container class="org.exoplatform.services.jcr.impl.storage.jbosscache.JBossCacheWorkspaceDataContainer"> <properties> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config-exoloader.xml" /> <property name="source-name" value="jdbcjcr2tck" /> <property name="dialect" value="hsqldb" /> <property name="multi-db" value="true" /> @@ -366,12 +344,6 @@ <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" /> </properties> </initializer> - <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl"> - <properties> - <property name="max-size" value="2k" /> - <property name="live-time" value="20m" /> - </properties> - </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> <properties> <property name="index-dir" value="target/temp/index/db1tck/ws2" />