Author: jason.greene(a)jboss.com Date: 2008-03-15 01:34:02 -0400 (Sat, 15 Mar 2008) New Revision: 5438 Added: pojo/trunk/src/main/release/etc/META-INF/ pojo/trunk/src/main/release/etc/META-INF/replSync-service.xml Removed: pojo/trunk/src/main/release/etc/META-INF/replSync-service.xml pojo/trunk/src/main/release/etc/replSync-service.xml Modified: pojo/trunk/src/main/release/build.xml pojo/trunk/src/test/java/org/jboss/cache/pojo/testng/TestListener.java Log: Merge Modified: pojo/trunk/src/main/release/build.xml =================================================================== --- pojo/trunk/src/main/release/build.xml 2008-03-15 05:32:59 UTC (rev 5437) +++ pojo/trunk/src/main/release/build.xml 2008-03-15 05:34:02 UTC (rev 5438) @@ -124,6 +124,7 @@ <testng outputDir="${reports}" haltOnFailure="true" + listener="org.jboss.cache.pojo.testng.TestListener" timeOut="${all.test.timeout}" verbose="2"> <classpath> Copied: pojo/trunk/src/main/release/etc/META-INF (from rev 5437, pojo/branches/2.1/src/main/release/etc/META-INF) Deleted: pojo/trunk/src/main/release/etc/META-INF/replSync-service.xml =================================================================== --- pojo/branches/2.1/src/main/release/etc/META-INF/replSync-service.xml 2008-03-15 05:32:59 UTC (rev 5437) +++ pojo/trunk/src/main/release/etc/META-INF/replSync-service.xml 2008-03-15 05:34:02 UTC (rev 5438) @@ -1,175 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ===================================================================== --> -<!-- --> -<!-- Sample TreeCache Service Configuration --> -<!-- --> -<!-- ===================================================================== --> - -<server> - - <!-- ==================================================================== --> - <!-- Defines TreeCache configuration --> - <!-- ==================================================================== --> - - <mbean code="org.jboss.cache.jmx.CacheJmxWrapper" - 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> - - <!-- - Isolation level : SERIALIZABLE - REPEATABLE_READ (default) - READ_COMMITTED - READ_UNCOMMITTED - NONE - --> - <attribute name="IsolationLevel">REPEATABLE_READ</attribute> - - <!-- - Valid modes are LOCAL - REPL_ASYNC - REPL_SYNC - INVALIDATION_ASYNC - INVALIDATION_SYNC - --> - <attribute name="CacheMode">REPL_SYNC</attribute> - - <!-- - Just used for async repl: use a replication queue - --> - <attribute name="UseReplQueue">false</attribute> - - <!-- - Replication interval for replication queue (in ms) - --> - <attribute name="ReplQueueInterval">0</attribute> - - <!-- - Max number of elements which trigger replication - --> - <attribute name="ReplQueueMaxElements">0</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 max_xmit_size="60000" - 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" - join_retry_timeout="2000" shun="false" - view_bundling="true" view_ack_collection_timeout="5000"/> - <FRAG2 frag_size="60000"/> - <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/> - <!-- <pbcast.STATE_TRANSFER/> --> - <pbcast.FLUSH timeout="0"/> - </config> - </attribute> - - - <!-- - Whether or not to fetch state on joining a cluster - NOTE this used to be called FetchStateOnStartup and has been renamed to be more descriptive. - --> - <attribute name="FetchInMemoryState">true</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">15000</attribute> - - <!-- - Number of milliseconds to wait until all responses for a - synchronous call have been received. - --> - <attribute name="SyncReplTimeout">15000</attribute> - - <!-- Max number of milliseconds to wait for a lock acquisition --> - <attribute name="LockAcquisitionTimeout">10000</attribute> - - <!-- - Indicate whether to use region based marshalling or not. Set this to true if you are running under a scoped - class loader, e.g., inside an application server. Default is "false". - --> - <attribute name="UseRegionBasedMarshalling">true</attribute> - </mbean> - - - <!-- Uncomment to get a graphical view of the TreeCache MBean above --> - <!-- <mbean code="org.jboss.cache.TreeCacheView" name="jboss.cache:service=TreeCacheView">--> - <!-- <depends>jboss.cache:service=TreeCache</depends>--> - <!-- <attribute name="CacheService">jboss.cache:service=TreeCache</attribute>--> - <!-- </mbean>--> - - -</server> Copied: pojo/trunk/src/main/release/etc/META-INF/replSync-service.xml (from rev 5437, pojo/branches/2.1/src/main/release/etc/META-INF/replSync-service.xml) =================================================================== --- pojo/trunk/src/main/release/etc/META-INF/replSync-service.xml (rev 0) +++ pojo/trunk/src/main/release/etc/META-INF/replSync-service.xml 2008-03-15 05:34:02 UTC (rev 5438) @@ -0,0 +1,175 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ===================================================================== --> +<!-- --> +<!-- Sample TreeCache Service Configuration --> +<!-- --> +<!-- ===================================================================== --> + +<server> + + <!-- ==================================================================== --> + <!-- Defines TreeCache configuration --> + <!-- ==================================================================== --> + + <mbean code="org.jboss.cache.jmx.CacheJmxWrapper" + 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> + + <!-- + Isolation level : SERIALIZABLE + REPEATABLE_READ (default) + READ_COMMITTED + READ_UNCOMMITTED + NONE + --> + <attribute name="IsolationLevel">REPEATABLE_READ</attribute> + + <!-- + Valid modes are LOCAL + REPL_ASYNC + REPL_SYNC + INVALIDATION_ASYNC + INVALIDATION_SYNC + --> + <attribute name="CacheMode">REPL_SYNC</attribute> + + <!-- + Just used for async repl: use a replication queue + --> + <attribute name="UseReplQueue">false</attribute> + + <!-- + Replication interval for replication queue (in ms) + --> + <attribute name="ReplQueueInterval">0</attribute> + + <!-- + Max number of elements which trigger replication + --> + <attribute name="ReplQueueMaxElements">0</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 max_xmit_size="60000" + 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" + join_retry_timeout="2000" shun="false" + view_bundling="true" view_ack_collection_timeout="5000"/> + <FRAG2 frag_size="60000"/> + <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/> + <!-- <pbcast.STATE_TRANSFER/> --> + <pbcast.FLUSH timeout="0"/> + </config> + </attribute> + + + <!-- + Whether or not to fetch state on joining a cluster + NOTE this used to be called FetchStateOnStartup and has been renamed to be more descriptive. + --> + <attribute name="FetchInMemoryState">true</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">15000</attribute> + + <!-- + Number of milliseconds to wait until all responses for a + synchronous call have been received. + --> + <attribute name="SyncReplTimeout">15000</attribute> + + <!-- Max number of milliseconds to wait for a lock acquisition --> + <attribute name="LockAcquisitionTimeout">10000</attribute> + + <!-- + Indicate whether to use region based marshalling or not. Set this to true if you are running under a scoped + class loader, e.g., inside an application server. Default is "false". + --> + <attribute name="UseRegionBasedMarshalling">true</attribute> + </mbean> + + + <!-- Uncomment to get a graphical view of the TreeCache MBean above --> + <!-- <mbean code="org.jboss.cache.TreeCacheView" name="jboss.cache:service=TreeCacheView">--> + <!-- <depends>jboss.cache:service=TreeCache</depends>--> + <!-- <attribute name="CacheService">jboss.cache:service=TreeCache</attribute>--> + <!-- </mbean>--> + + +</server> Deleted: pojo/trunk/src/main/release/etc/replSync-service.xml =================================================================== --- pojo/trunk/src/main/release/etc/replSync-service.xml 2008-03-15 05:32:59 UTC (rev 5437) +++ pojo/trunk/src/main/release/etc/replSync-service.xml 2008-03-15 05:34:02 UTC (rev 5438) @@ -1,175 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ===================================================================== --> -<!-- --> -<!-- Sample TreeCache Service Configuration --> -<!-- --> -<!-- ===================================================================== --> - -<server> - - <!-- ==================================================================== --> - <!-- Defines TreeCache configuration --> - <!-- ==================================================================== --> - - <mbean code="org.jboss.cache.jmx.CacheJmxWrapper" - 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> - - <!-- - Isolation level : SERIALIZABLE - REPEATABLE_READ (default) - READ_COMMITTED - READ_UNCOMMITTED - NONE - --> - <attribute name="IsolationLevel">REPEATABLE_READ</attribute> - - <!-- - Valid modes are LOCAL - REPL_ASYNC - REPL_SYNC - INVALIDATION_ASYNC - INVALIDATION_SYNC - --> - <attribute name="CacheMode">REPL_SYNC</attribute> - - <!-- - Just used for async repl: use a replication queue - --> - <attribute name="UseReplQueue">false</attribute> - - <!-- - Replication interval for replication queue (in ms) - --> - <attribute name="ReplQueueInterval">0</attribute> - - <!-- - Max number of elements which trigger replication - --> - <attribute name="ReplQueueMaxElements">0</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 max_xmit_size="60000" - 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" - join_retry_timeout="2000" shun="false" - view_bundling="true" view_ack_collection_timeout="5000"/> - <FRAG2 frag_size="60000"/> - <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/> - <!-- <pbcast.STATE_TRANSFER/> --> - <pbcast.FLUSH timeout="0"/> - </config> - </attribute> - - - <!-- - Whether or not to fetch state on joining a cluster - NOTE this used to be called FetchStateOnStartup and has been renamed to be more descriptive. - --> - <attribute name="FetchInMemoryState">true</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">15000</attribute> - - <!-- - Number of milliseconds to wait until all responses for a - synchronous call have been received. - --> - <attribute name="SyncReplTimeout">15000</attribute> - - <!-- Max number of milliseconds to wait for a lock acquisition --> - <attribute name="LockAcquisitionTimeout">10000</attribute> - - <!-- - Indicate whether to use region based marshalling or not. Set this to true if you are running under a scoped - class loader, e.g., inside an application server. Default is "false". - --> - <attribute name="UseRegionBasedMarshalling">true</attribute> - </mbean> - - - <!-- Uncomment to get a graphical view of the TreeCache MBean above --> - <!-- <mbean code="org.jboss.cache.TreeCacheView" name="jboss.cache:service=TreeCacheView">--> - <!-- <depends>jboss.cache:service=TreeCache</depends>--> - <!-- <attribute name="CacheService">jboss.cache:service=TreeCache</attribute>--> - <!-- </mbean>--> - - -</server> Modified: pojo/trunk/src/test/java/org/jboss/cache/pojo/testng/TestListener.java =================================================================== --- pojo/trunk/src/test/java/org/jboss/cache/pojo/testng/TestListener.java 2008-03-15 05:32:59 UTC (rev 5437) +++ pojo/trunk/src/test/java/org/jboss/cache/pojo/testng/TestListener.java 2008-03-15 05:34:02 UTC (rev 5438) @@ -1,45 +1,27 @@ package org.jboss.cache.pojo.testng; -import org.testng.ITestContext; -import org.testng.ITestListener; import org.testng.ITestResult; import org.testng.TestListenerAdapter; public class TestListener extends TestListenerAdapter { - public void onStart(ITestContext arg0) + public void onTestFailure(ITestResult arg0) { - System.out.println("Running: " + arg0.getName()); - + System.out.println("Failed: " + getName(arg0)); } - public void onTestFailedButWithinSuccessPercentage(ITestResult arg0) + private String getName(ITestResult arg0) { - // TODO Auto-generated method stub - + return arg0.getTestClass().getName() + "." + arg0.getName(); } - public void onTestFailure(ITestResult arg0) - { - // TODO Auto-generated method stub - - } - public void onTestSkipped(ITestResult arg0) { - // TODO Auto-generated method stub - + System.out.println("Skiped: " + getName(arg0)); } public void onTestStart(ITestResult arg0) { - System.out.println("Running test:" + arg0.getTestClass().getName() + "." + arg0.getName()); + System.out.println("Running test: " + getName(arg0)); } - - public void onTestSuccess(ITestResult arg0) - { - // TODO Auto-generated method stub - - } - }