[infinispan-commits] Infinispan SVN: r649 - in trunk/core/src: main/resources/config-samples and 1 other directories.

[infinispan-commits at lists.jboss.org]

Author: vblagojevic at jboss.com
Date: 2009-08-11 07:51:40 -0400 (Tue, 11 Aug 2009)
New Revision: 649

Modified:
   trunk/core/src/main/java/org/infinispan/config/GlobalConfiguration.java
   trunk/core/src/main/resources/config-samples/all.xml
   trunk/core/src/test/resources/configs/named-cache-test.xml
Log:
handle transport defaults

Modified: trunk/core/src/main/java/org/infinispan/config/GlobalConfiguration.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/GlobalConfiguration.java	2009-08-10 15:55:52 UTC (rev 648)
+++ trunk/core/src/main/java/org/infinispan/config/GlobalConfiguration.java	2009-08-11 11:51:40 UTC (rev 649)
@@ -78,7 +78,7 @@
    private GlobalJmxStatisticsType globalJmxStatistics = new GlobalJmxStatisticsType();
    
    @XmlElement
-   private TransportType transport = new TransportType();
+   private TransportType transport = new TransportType(null);
   
    @XmlElement
    private SerializationType serialization = new SerializationType();
@@ -540,6 +540,16 @@
       
       private TypedProperties properties = EMPTY_PROPERTIES;
 
+      public TransportType() {
+         super();
+         transportClass = JGroupsTransport.class.getName();
+      }
+      
+      public TransportType(String transportClass) {
+         super();
+         this.transportClass = transportClass;
+      }
+
       @XmlAttribute
       public void setClusterName(String clusterName) {
          testImmutability("clusterName");

Modified: trunk/core/src/main/resources/config-samples/all.xml
===================================================================
--- trunk/core/src/main/resources/config-samples/all.xml	2009-08-10 15:55:52 UTC (rev 648)
+++ trunk/core/src/main/resources/config-samples/all.xml	2009-08-11 11:51:40 UTC (rev 649)
@@ -42,9 +42,7 @@
          There is no added cost to defining a transport but not creating a cache that uses one, since the transport
          is created and initialized lazily.
       -->
-      <transport transportClass="org.infinispan.remoting.transport.jgroups.JGroupsTransport"
-                 clusterName="infinispan-cluster"
-                 distributedSyncTimeout="50000">
+      <transport clusterName="infinispan-cluster" distributedSyncTimeout="50000">
          <!-- Note that the JGroups transport uses sensible defaults if no configuration property is defined. -->
          <properties>
          	<property name="configurationFile" value="udp.xml"/>

Modified: trunk/core/src/test/resources/configs/named-cache-test.xml
===================================================================
--- trunk/core/src/test/resources/configs/named-cache-test.xml	2009-08-10 15:55:52 UTC (rev 648)
+++ trunk/core/src/test/resources/configs/named-cache-test.xml	2009-08-11 11:51:40 UTC (rev 649)
@@ -29,8 +29,7 @@
          </properties>
       </replicationQueueScheduledExecutor>
 
-      <transport transportClass = "org.infinispan.remoting.transport.jgroups.JGroupsTransport" clusterName="infinispan-cluster" 
-      		distributedSyncTimeout="50000">
+      <transport clusterName="infinispan-cluster" distributedSyncTimeout="50000">
          <!-- Note that the JGroups transport uses sensible defaults if no configuration property is defined. -->
          <properties>
          <property name="configurationFile" value="udp.xml"/>