[infinispan-commits] Infinispan SVN: r539 - in trunk/core/src: test/java/org/infinispan/config/parsing and 1 other directories.

[infinispan-commits at lists.jboss.org]

Author: vblagojevic at jboss.com
Date: 2009-07-09 09:15:00 -0400 (Thu, 09 Jul 2009)
New Revision: 539

Modified:
   trunk/core/src/main/java/org/infinispan/config/GlobalConfiguration.java
   trunk/core/src/test/java/org/infinispan/config/parsing/XmlFileParsingTest.java
   trunk/core/src/test/resources/configs/named-cache-test.xml
Log:
more tests

Modified: trunk/core/src/main/java/org/infinispan/config/GlobalConfiguration.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/GlobalConfiguration.java	2009-07-09 13:03:27 UTC (rev 538)
+++ trunk/core/src/main/java/org/infinispan/config/GlobalConfiguration.java	2009-07-09 13:15:00 UTC (rev 539)
@@ -213,7 +213,8 @@
 
    @ConfigurationAttribute(name = "transportClass", 
             containingElement = "transport", 
-            description = "Transport class, by default null i.e. no transport")
+            description = "Transport class, by default null i.e. no transport",
+            defaultValue = "org.infinispan.remoting.transport.jgroups.JGroupsTransport")
    public void setTransportClass(String transportClass) {
       testImmutability("transportClass");
       this.transportClass = transportClass;

Modified: trunk/core/src/test/java/org/infinispan/config/parsing/XmlFileParsingTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/config/parsing/XmlFileParsingTest.java	2009-07-09 13:03:27 UTC (rev 538)
+++ trunk/core/src/test/java/org/infinispan/config/parsing/XmlFileParsingTest.java	2009-07-09 13:15:00 UTC (rev 539)
@@ -3,6 +3,7 @@
 import org.infinispan.config.CacheLoaderManagerConfig;
 import org.infinispan.config.Configuration;
 import org.infinispan.config.GlobalConfiguration;
+import org.infinispan.config.GlobalConfiguration.ShutdownHookBehavior;
 import org.infinispan.distribution.DefaultConsistentHash;
 import org.infinispan.loaders.file.FileCacheStoreConfig;
 import org.infinispan.util.concurrent.IsolationLevel;
@@ -49,8 +50,11 @@
       assert gc.getReplicationQueueScheduledExecutorProperties().getProperty("threadNamePrefix").equals("ReplicationQueueThread");
 
       assert gc.getTransportClass().equals("org.infinispan.remoting.transport.jgroups.JGroupsTransport");
-      assert gc.getTransportProperties().isEmpty();
-
+      assert gc.getClusterName().equals("infinispan-cluster");
+      assert gc.getDistributedSyncTimeout() == 50000;
+      
+      assert gc.getShutdownHookBehavior().equals(ShutdownHookBehavior.REGISTER);
+      
       assert gc.getMarshallerClass().equals("org.infinispan.marshall.VersionAwareMarshaller");
       assert gc.getMarshallVersionString().equals("1.0");
 

Modified: trunk/core/src/test/resources/configs/named-cache-test.xml
===================================================================
--- trunk/core/src/test/resources/configs/named-cache-test.xml	2009-07-09 13:03:27 UTC (rev 538)
+++ trunk/core/src/test/resources/configs/named-cache-test.xml	2009-07-09 13:15:00 UTC (rev 539)
@@ -21,13 +21,19 @@
          <property name="threadNamePrefix" value="ReplicationQueueThread"/>
       </replicationQueueScheduledExecutor>
 
-      <transport transportClass="org.infinispan.remoting.transport.jgroups.JGroupsTransport"/>
+      <transport transportClass = "org.infinispan.remoting.transport.jgroups.JGroupsTransport" clusterName="infinispan-cluster" 
+      		distributedSyncTimeout="50000">
+         <!-- Note that the JGroups transport uses sensible defaults if no configuration property is defined. -->
+         <property name="configurationFile" value="udp.xml"/>
+         <!-- See the JGroupsTransport javadocs for more flags -->
+      </transport>
 
       <serialization marshallerClass="org.infinispan.marshall.VersionAwareMarshaller" version="1.0"/>
       <globalJmxStatistics enabled="false" jmxDomain="funky_domain"
                            mBeanServerLookup="org.infinispan.jmx.PerThreadMBeanServerLookup"
                            allowDuplicateDomains="true"/>
-
+                           
+      <shutdown hookBehavior="REGISTER"/>                           
    </global>
 
    <default>