Author: jason.greene(a)jboss.com Date: 2008-02-20 23:27:37 -0500 (Wed, 20 Feb 2008) New Revision: 5369 Added: pojo/branches/2.1/src/test/resources/META-INF/ pojo/branches/2.1/src/test/resources/META-INF/pojocache-passivation-service.xml pojo/branches/2.1/src/test/resources/META-INF/pojocache-passivation-service2.xml pojo/branches/2.1/src/test/resources/log4j.xml Modified: pojo/branches/2.1/pom.xml pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/LocalConcurrentTest.java pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/region/LocalConcurrentTest.java Log: Reenable concurrent tests Move pojo specific configs from core cache to pojo cache Prepare for CR4 Modified: pojo/branches/2.1/pom.xml =================================================================== --- pojo/branches/2.1/pom.xml 2008-02-21 04:22:10 UTC (rev 5368) +++ pojo/branches/2.1/pom.xml 2008-02-21 04:27:37 UTC (rev 5369) @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <properties> <jbosscache-pojo-version>2.1.0.CR4</jbosscache-pojo-version> - <jbosscache-core-version>2.1.0.CR3</jbosscache-core-version> + <jbosscache-core-version>2.1.0.CR4</jbosscache-core-version> <jboss.aop.version>2.0.0.CR3</jboss.aop.version> </properties> <parent> Modified: pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/LocalConcurrentTest.java =================================================================== --- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/LocalConcurrentTest.java 2008-02-21 04:22:10 UTC (rev 5368) +++ pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/LocalConcurrentTest.java 2008-02-21 04:27:37 UTC (rev 5369) @@ -34,7 +34,7 @@ * @version $Revision$ * @author<a href="mailto:bwang@jboss.org">Ben Wang</a> December 2004 */ -@Test(groups = {"functional"}, enabled = false) +@Test(groups = {"functional"}) public class LocalConcurrentTest { static PojoCache cache_; Modified: pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/region/LocalConcurrentTest.java =================================================================== --- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/region/LocalConcurrentTest.java 2008-02-21 04:22:10 UTC (rev 5368) +++ pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/region/LocalConcurrentTest.java 2008-02-21 04:27:37 UTC (rev 5369) @@ -34,7 +34,7 @@ * @version $Revision$ * @author<a href="mailto:bwang@jboss.org">Ben Wang</a> December 2004 */ -@Test(groups = {"functional"}, enabled = false) +@Test(groups = {"functional"}) public class LocalConcurrentTest { static PojoCache cache_; Added: pojo/branches/2.1/src/test/resources/META-INF/pojocache-passivation-service.xml =================================================================== --- pojo/branches/2.1/src/test/resources/META-INF/pojocache-passivation-service.xml (rev 0) +++ pojo/branches/2.1/src/test/resources/META-INF/pojocache-passivation-service.xml 2008-02-21 04:27:37 UTC (rev 5369) @@ -0,0 +1,194 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ===================================================================== --> +<!-- --> +<!-- Sample TreeCache Service Configuration --> +<!-- --> +<!-- ===================================================================== --> + +<server> + + <!-- ==================================================================== --> + <!-- Defines TreeCache configuration --> + <!-- ==================================================================== --> + + <mbean code="org.jboss.cache.pojo.jmx.PojoCacheJmxWrapper" + name="jboss.cache:service=TreeCache"> + + <depends>jboss:service=Naming</depends> + <depends>jboss:service=TransactionManager</depends> + + <!-- + Configure the TransactionManager + --> + <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup + </attribute> + + + <!-- + Node locking level : SERIALIZABLE + REPEATABLE_READ (default) + READ_COMMITTED + READ_UNCOMMITTED + NONE + --> + <attribute name="IsolationLevel">REPEATABLE_READ</attribute> + + <!-- + Valid modes are LOCAL + REPL_ASYNC + REPL_SYNC + --> + <attribute name="CacheMode">REPL_SYNC</attribute> + + <!-- Name of cluster. Needs to be the same for all TreeCache nodes in a + cluster in order to find each other. + --> + <attribute name="ClusterName">JBossCache-Cluster</attribute> + + <!--Uncomment next three statements to enable JGroups multiplexer. +This configuration is dependent on the JGroups multiplexer being +registered in an MBean server such as JBossAS. --> + <!-- + <depends>jgroups.mux:name=Multiplexer</depends> + <attribute name="MultiplexerService">jgroups.mux:name=Multiplexer</attribute> + <attribute name="MultiplexerStack">fc-fast-minimalthreads</attribute> + --> + + <!-- JGroups protocol stack properties. + ClusterConfig isn't used if the multiplexer is enabled and successfully initialized. + --> + <attribute name="ClusterConfig"> + <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="false" + enable_diagnostics="true" + + use_concurrent_stack="true" + + thread_naming_pattern="pl" + + thread_pool.enabled="true" + thread_pool.min_threads="1" + thread_pool.max_threads="25" + thread_pool.keep_alive_time="30000" + thread_pool.queue_enabled="true" + thread_pool.queue_max_size="10" + thread_pool.rejection_policy="Run" + + oob_thread_pool.enabled="true" + oob_thread_pool.min_threads="1" + oob_thread_pool.max_threads="4" + oob_thread_pool.keep_alive_time="10000" + oob_thread_pool.queue_enabled="true" + oob_thread_pool.queue_max_size="10" + 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"/> + <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0" + retransmit_timeout="300,600,1200,2400,4800" + discard_delivered_msgs="true"/> + <UNICAST timeout="300,600,1200,2400,3600"/> + <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" + max_bytes="400000"/> + <pbcast.GMS print_local_addr="true" join_timeout="5000" shun="false" + view_bundling="true" view_ack_collection_timeout="5000"/> + <FC max_credits="20000000" min_threshold="0.10"/> + <FRAG2 frag_size="60000"/> + <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/> + <!-- <pbcast.STATE_TRANSFER/> --> + <pbcast.FLUSH timeout="0"/> + </config> + </attribute> + + + <!-- + The max amount of time (in milliseconds) we wait until the + state (ie. the contents of the cache) are retrieved from + existing members in a clustered environment + --> + <attribute name="StateRetrievalTimeout">20000</attribute> + + <!-- + Number of milliseconds to wait until all responses for a + synchronous call have been received. + --> + <attribute name="SyncReplTimeout">20000</attribute> + + <!-- Max number of milliseconds to wait for a lock acquisition --> + <attribute name="LockAcquisitionTimeout">15000</attribute> + + + <!-- Specific eviction policy configurations. This is LRU --> + <!-- + PojoCache passivation only allows configuration of global region. If you need to + configure multiple regions, you can turn on the marshalling region such that + internal JBoss region is stored under the individual region. + --> + <attribute name="EvictionPolicyConfig"> + <config> + <attribute name="wakeUpIntervalSeconds">3</attribute> + <!-- This defaults to 200000 if not specified --> + <attribute name="eventQueueSize">200000</attribute> + <!-- Name of the DEFAULT eviction policy class. --> + <attribute name="policyClass">org.jboss.cache.eviction.LRUPolicy</attribute> + + + <!-- Cache wide default --> + <region name="/_default_"> + <attribute name="maxNodes">5000</attribute> + <attribute name="timeToLiveSeconds">3</attribute> + </region> + </config> + </attribute> + + <!-- Cache Loader configuration block --> + <attribute name="CacheLoaderConfig"> + <config> + <!-- if passivation is true, only the first cache loader is used; the rest are ignored --> + <passivation>true</passivation> + <preload>/</preload> + <shared>false</shared> + + <!-- we can now have multiple cache loaders, which get chained --> + <cacheloader> + <class>org.jboss.cache.loader.FileCacheLoader</class> + <!-- same as the old CacheLoaderConfig attribute + location=/tmp this can be part of the properties. + location=/tmp/JBossCacheFileCacheLoader + --> + <properties> + location=pojoloader + </properties> + <!-- whether the cache loader writes are asynchronous --> + <async>false</async> + <!-- only one cache loader in the chain may set fetchPersistentState to true. + An exception is thrown if more than one cache loader sets this to true. --> + <fetchPersistentState>true</fetchPersistentState> + <!-- determines whether this cache loader ignores writes - defaults to false. --> + <ignoreModifications>false</ignoreModifications> + </cacheloader> + + </config> + </attribute> + + </mbean> + + +</server> Added: pojo/branches/2.1/src/test/resources/META-INF/pojocache-passivation-service2.xml =================================================================== --- pojo/branches/2.1/src/test/resources/META-INF/pojocache-passivation-service2.xml (rev 0) +++ pojo/branches/2.1/src/test/resources/META-INF/pojocache-passivation-service2.xml 2008-02-21 04:27:37 UTC (rev 5369) @@ -0,0 +1,194 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ===================================================================== --> +<!-- --> +<!-- Sample TreeCache Service Configuration --> +<!-- --> +<!-- ===================================================================== --> + +<server> + + <!-- ==================================================================== --> + <!-- Defines TreeCache configuration --> + <!-- ==================================================================== --> + + <mbean code="org.jboss.cache.pojo.jmx.PojoCacheJmxWrapper" + name="jboss.cache:service=TreeCache"> + + <depends>jboss:service=Naming</depends> + <depends>jboss:service=TransactionManager</depends> + + <!-- + Configure the TransactionManager + --> + <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup + </attribute> + + + <!-- + Node locking level : SERIALIZABLE + REPEATABLE_READ (default) + READ_COMMITTED + READ_UNCOMMITTED + NONE + --> + <attribute name="IsolationLevel">REPEATABLE_READ</attribute> + + <!-- + Valid modes are LOCAL + REPL_ASYNC + REPL_SYNC + --> + <attribute name="CacheMode">REPL_SYNC</attribute> + + <!-- Name of cluster. Needs to be the same for all TreeCache nodes in a + cluster in order to find each other. + --> + <attribute name="ClusterName">JBossCache-Cluster</attribute> + + <!--Uncomment next three statements to enable JGroups multiplexer. +This configuration is dependent on the JGroups multiplexer being +registered in an MBean server such as JBossAS. --> + <!-- + <depends>jgroups.mux:name=Multiplexer</depends> + <attribute name="MultiplexerService">jgroups.mux:name=Multiplexer</attribute> + <attribute name="MultiplexerStack">fc-fast-minimalthreads</attribute> + --> + + <!-- JGroups protocol stack properties. + ClusterConfig isn't used if the multiplexer is enabled and successfully initialized. + --> + <attribute name="ClusterConfig"> + <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="false" + enable_diagnostics="true" + + use_concurrent_stack="true" + + thread_naming_pattern="pl" + + thread_pool.enabled="true" + thread_pool.min_threads="1" + thread_pool.max_threads="25" + thread_pool.keep_alive_time="30000" + thread_pool.queue_enabled="true" + thread_pool.queue_max_size="10" + thread_pool.rejection_policy="Run" + + oob_thread_pool.enabled="true" + oob_thread_pool.min_threads="1" + oob_thread_pool.max_threads="4" + oob_thread_pool.keep_alive_time="10000" + oob_thread_pool.queue_enabled="true" + oob_thread_pool.queue_max_size="10" + 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"/> + <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0" + retransmit_timeout="300,600,1200,2400,4800" + discard_delivered_msgs="true"/> + <UNICAST timeout="300,600,1200,2400,3600"/> + <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" + max_bytes="400000"/> + <pbcast.GMS print_local_addr="true" join_timeout="5000" shun="false" + view_bundling="true" view_ack_collection_timeout="5000"/> + <FC max_credits="20000000" min_threshold="0.10"/> + <FRAG2 frag_size="60000"/> + <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/> + <!-- <pbcast.STATE_TRANSFER/> --> + <pbcast.FLUSH timeout="0"/> + </config> + </attribute> + + + <!-- + The max amount of time (in milliseconds) we wait until the + state (ie. the contents of the cache) are retrieved from + existing members in a clustered environment + --> + <attribute name="StateRetrievalTimeout">20000</attribute> + + <!-- + Number of milliseconds to wait until all responses for a + synchronous call have been received. + --> + <attribute name="SyncReplTimeout">20000</attribute> + + <!-- Max number of milliseconds to wait for a lock acquisition --> + <attribute name="LockAcquisitionTimeout">15000</attribute> + + + <!-- Specific eviction policy configurations. This is LRU --> + <!-- + PojoCache passivation only allows configuration of global region. If you need to + configure multiple regions, you can turn on the marshalling region such that + internal JBoss region is stored under the individual region. + --> + <attribute name="EvictionPolicyConfig"> + <config> + <attribute name="wakeUpIntervalSeconds">3</attribute> + <!-- This defaults to 200000 if not specified --> + <attribute name="eventQueueSize">200000</attribute> + <!-- Name of the DEFAULT eviction policy class. --> + <attribute name="policyClass">org.jboss.cache.eviction.LRUPolicy</attribute> + + + <!-- Cache wide default --> + <region name="/_default_"> + <attribute name="maxNodes">5000</attribute> + <attribute name="timeToLiveSeconds">3</attribute> + </region> + </config> + </attribute> + + <!-- Cache Loader configuration block --> + <attribute name="CacheLoaderConfig"> + <config> + <!-- if passivation is true, only the first cache loader is used; the rest are ignored --> + <passivation>true</passivation> + <preload>/</preload> + <shared>false</shared> + + <!-- we can now have multiple cache loaders, which get chained --> + <cacheloader> + <class>org.jboss.cache.loader.FileCacheLoader</class> + <!-- same as the old CacheLoaderConfig attribute + location=/tmp this can be part of the properties. + location=/tmp/JBossCacheFileCacheLoader + --> + <properties> + location=pojoloader2 + </properties> + <!-- whether the cache loader writes are asynchronous --> + <async>false</async> + <!-- only one cache loader in the chain may set fetchPersistentState to true. + An exception is thrown if more than one cache loader sets this to true. --> + <fetchPersistentState>true</fetchPersistentState> + <!-- determines whether this cache loader ignores writes - defaults to false. --> + <ignoreModifications>false</ignoreModifications> + </cacheloader> + + </config> + </attribute> + + </mbean> + + +</server> Added: pojo/branches/2.1/src/test/resources/log4j.xml =================================================================== --- pojo/branches/2.1/src/test/resources/log4j.xml (rev 0) +++ pojo/branches/2.1/src/test/resources/log4j.xml 2008-02-21 04:27:37 UTC (rev 5369) @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> + +<!-- ===================================================================== --> +<!-- --> +<!-- Log4j Configuration --> +<!-- --> +<!-- ===================================================================== --> + +<!-- $Id: log4j.xml 5286 2008-02-01 12:13:53Z mircea.markus $ --> + +<!-- + | For more configuration infromation and examples see the Jakarta Log4j + | owebsite: http://jakarta.apache.org/log4j + --> + +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> + + <!-- ================================= --> + <!-- Preserve messages in a local file --> + <!-- ================================= --> + + <!-- A time/date based rolling appender --> + <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender"> + <param name="File" value="output/jbosscache.log"/> + <param name="Append" value="true"/> + + <!-- Rollover at midnight each day --> + <param name="DatePattern" value="'.'yyyy-MM-dd"/> + + <!-- Rollover at the top of each hour + <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/> + --> + <param name="Threshold" value="DEBUG"/> + + <layout class="org.apache.log4j.PatternLayout"> + <!-- The default pattern: Date Priority [Category] Message\n --> + <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n"/> + + <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n + <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/> + --> + </layout> + </appender> + + <!-- ============================== --> + <!-- Append messages to the console --> + <!-- ============================== --> + + <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> + <param name="Threshold" value="TRACE"/> + <param name="Target" value="System.out"/> + + <layout class="org.apache.log4j.PatternLayout"> + <!-- The default pattern: Date Priority [Category] Message\n --> + <param name="ConversionPattern" value="%d %-5p [%c{1}] (%t) %m%n"/> + </layout> + </appender> + + + <!-- ================ --> + <!-- Limit categories --> + <!-- ================ --> + + <category name="org.jboss.cache"> + <priority value="WARN"/> + </category> + + <category name="org.jboss.tm"> + <priority value="WARN"/> + </category> + + <category name="org.jgroups"> + <priority value="WARN"/> + </category> + + <!-- ======================= --> + <!-- Setup the Root category --> + <!-- ======================= --> + + <root> + <!--<appender-ref ref="CONSOLE"/>--> + <appender-ref ref="FILE"/> + </root> + +</log4j:configuration>