[exo-jcr-commits] exo-jcr SVN: r1481 - in jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf: standalone and 1 other directory.

Author: areshetnyak Date: 2010-01-19 09:43:16 -0500 (Tue, 19 Jan 2010) New Revision: 1481 Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-config-ws.xml jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-config-ws1.xml jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-indexer-config-exoloader_db1_ws.xml jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-indexer-config-exoloader_db1_ws1.xml jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-lock-config_db1_ws.xml jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-lock-config_db1_ws1.xml jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-config.xml jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-lockconfig.xml jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-lockconfig_db1_ws.xml jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-lockconfig_db1_ws1.xml Log: EXOJCR-417 : The cleanup cluster configuration is done. Add multiplexerStack parameter to all jgroupsConfig. Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-config-ws.xml =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-config-ws.xml 2010-01-19 13:03:08 UTC (rev 1480) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-config-ws.xml 2010-01-19 14:43:16 UTC (rev 1481) @@ -15,7 +15,7 @@ "enable_bundling" is set to false, because of notice, that appeared during running --> - <jgroupsConfig> + <jgroupsConfig multiplexerStack="fc-fast-minimalthreads"> <!-- UDP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false" ip_ttl="2" loopback="false" Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-config-ws1.xml =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-config-ws1.xml 2010-01-19 13:03:08 UTC (rev 1480) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-config-ws1.xml 2010-01-19 14:43:16 UTC (rev 1481) @@ -15,7 +15,7 @@ "enable_bundling" is set to false, because of notice, that appeared during running --> - <jgroupsConfig> + <jgroupsConfig multiplexerStack="fc-fast-minimalthreads" > <!-- UDP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false" ip_ttl="2" loopback="false" Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-indexer-config-exoloader_db1_ws.xml =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-indexer-config-exoloader_db1_ws.xml 2010-01-19 13:03:08 UTC (rev 1480) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-indexer-config-exoloader_db1_ws.xml 2010-01-19 14:43:16 UTC (rev 1481) @@ -9,7 +9,7 @@ <clustering mode="replication" clusterName="JBoss-Cache-Indexer-Cluster_db1_ws"> <stateRetrieval timeout="20000" fetchInMemoryState="false" nonBlocking="true"/> - <jgroupsConfig> + <jgroupsConfig multiplexerStack="fc-fast-minimalthreads"> <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" @@ -50,9 +50,9 @@ </clustering> <!-- Eviction configuration --> <eviction wakeUpInterval="5000"> - <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" eventQueueSize="1000000"> + <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" eventQueueSize="1000000"> <property name="maxNodes" value="10000" /> - <property name="timeToLive" value="120000" /> + <property name="minTimeToLive" value="60000" /> </default> </eviction> Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-indexer-config-exoloader_db1_ws1.xml =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-indexer-config-exoloader_db1_ws1.xml 2010-01-19 13:03:08 UTC (rev 1480) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-indexer-config-exoloader_db1_ws1.xml 2010-01-19 14:43:16 UTC (rev 1481) @@ -9,7 +9,7 @@ <clustering mode="replication" clusterName="JBoss-Cache-Indexer-Cluster_db1_ws1"> <stateRetrieval timeout="20000" fetchInMemoryState="false" nonBlocking="true"/> - <jgroupsConfig> + <jgroupsConfig multiplexerStack="fc-fast-minimalthreads"> <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" @@ -50,9 +50,9 @@ </clustering> <!-- Eviction configuration --> <eviction wakeUpInterval="5000"> - <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" eventQueueSize="1000000"> + <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" eventQueueSize="1000000"> <property name="maxNodes" value="10000" /> - <property name="timeToLive" value="120000" /> + <property name="minTimeToLive" value="60000" /> </default> </eviction> Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-lock-config_db1_ws.xml =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-lock-config_db1_ws.xml 2010-01-19 13:03:08 UTC (rev 1480) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-lock-config_db1_ws.xml 2010-01-19 14:43:16 UTC (rev 1481) @@ -1,13 +1,13 @@ <?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="3600000"/> + <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> + <jgroupsConfig multiplexerStack="fc-fast-minimalthreads"> - <TCP bind_addr="127.0.0.1" start_port="9700" loopback="true" + <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" @@ -46,7 +46,7 @@ <sync /> </clustering> - <loaders passivation="false" shared="false"> + <loaders passivation="false" shared="true"> <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false"> <properties> @@ -59,10 +59,7 @@ cache.jdbc.node.column=node cache.jdbc.node.type=LONGBLOB cache.jdbc.parent.column=parent - cache.jdbc.driver=com.mysql.jdbc.Driver - cache.jdbc.url=jdbc:mysql://localhost/cluster_jcr1 - cache.jdbc.user=root - cache.jdbc.password=admin + cache.jdbc.datasource=jdbcjcr </properties> </loader> Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-lock-config_db1_ws1.xml =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-lock-config_db1_ws1.xml 2010-01-19 13:03:08 UTC (rev 1480) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-lock-config_db1_ws1.xml 2010-01-19 14:43:16 UTC (rev 1481) @@ -1,13 +1,13 @@ <?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="3600000"/> + <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000"/> <clustering mode="replication" clusterName="JBoss-Cache-Indexer-Cluster_db1_ws1"> <stateRetrieval timeout="20000" fetchInMemoryState="false" nonBlocking="true"/> - <jgroupsConfig> + <jgroupsConfig multiplexerStack="fc-fast-minimalthreads"> - <TCP bind_addr="127.0.0.1" start_port="9750" loopback="true" + <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" @@ -46,7 +46,7 @@ <sync /> </clustering> - <loaders passivation="false" shared="false"> + <loaders passivation="false" shared="true"> <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false"> <properties> @@ -59,10 +59,7 @@ cache.jdbc.node.column=node cache.jdbc.node.type=LONGBLOB cache.jdbc.parent.column=parent - cache.jdbc.driver=com.mysql.jdbc.Driver - cache.jdbc.url=jdbc:mysql://localhost/cluster_jcr2 - cache.jdbc.user=root - cache.jdbc.password=admin + cache.jdbc.datasource=jdbcjcr1 </properties> </loader> Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-config.xml =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-config.xml 2010-01-19 13:03:08 UTC (rev 1480) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-config.xml 2010-01-19 14:43:16 UTC (rev 1481) @@ -1,7 +1,7 @@ <?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="3600000"/> + <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000"/> <!-- Configure the TransactionManager --> <transaction transactionManagerLookupClass="org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup" /> @@ -11,9 +11,9 @@ <!-- Eviction configuration --> <eviction wakeUpInterval="5000"> - <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" eventQueueSize="1000000"> + <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" eventQueueSize="1000000"> <property name="maxNodes" value="5000" /> - <property name="timeToLive" value="60000" /> + <property name="minTimeToLive" value="60000" /> </default> </eviction> Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-lockconfig.xml =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-lockconfig.xml 2010-01-19 13:03:08 UTC (rev 1480) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-lockconfig.xml 2010-01-19 14:43:16 UTC (rev 1481) @@ -1,7 +1,7 @@ <?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="3600000"/> + <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000"/> <!-- loaders passivation="false" shared="false"> Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-lockconfig_db1_ws.xml =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-lockconfig_db1_ws.xml 2010-01-19 13:03:08 UTC (rev 1480) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-lockconfig_db1_ws.xml 2010-01-19 14:43:16 UTC (rev 1481) @@ -1,9 +1,9 @@ <?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="3600000"/> + <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000"/> - <loaders passivation="false" shared="false"> + <loaders passivation="false" shared="true"> <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="true" ignoreModifications="false" purgeOnStartup="false"> @@ -15,12 +15,9 @@ cache.jdbc.fqn.column=fqn cache.jdbc.fqn.type=VARCHAR(512) cache.jdbc.node.column=node - cache.jdbc.node.type=VARBINARY(65535) + cache.jdbc.node.type=OBJECT cache.jdbc.parent.column=parent - cache.jdbc.driver=org.hsqldb.jdbcDriver - cache.jdbc.url=jdbc:hsqldb:file:target/temp/data/exojcr - cache.jdbc.user=sa - cache.jdbc.password= + cache.jdbc.datasource=jdbcjcr </properties> </loader> Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-lockconfig_db1_ws1.xml =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-lockconfig_db1_ws1.xml 2010-01-19 13:03:08 UTC (rev 1480) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-lockconfig_db1_ws1.xml 2010-01-19 14:43:16 UTC (rev 1481) @@ -1,9 +1,9 @@ <?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="3600000"/> + <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000"/> - <loaders passivation="false" shared="false"> + <loaders passivation="false" shared="true"> <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="true" ignoreModifications="false" purgeOnStartup="false"> @@ -15,12 +15,9 @@ cache.jdbc.fqn.column=fqn cache.jdbc.fqn.type=VARCHAR(512) cache.jdbc.node.column=node - cache.jdbc.node.type=VARBINARY(65535) + cache.jdbc.node.type=OBJECT cache.jdbc.parent.column=parent - cache.jdbc.driver=org.hsqldb.jdbcDriver - cache.jdbc.url=jdbc:hsqldb:file:target/temp/data/exojcr - cache.jdbc.user=sa - cache.jdbc.password= + cache.jdbc.datasource=jdbcjcr </properties> </loader>