[jboss-cvs] JBoss Messaging SVN: r6940 - in trunk: tests/config and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: timfox
Date: 2009-05-20 12:23:57 -0400 (Wed, 20 May 2009)
New Revision: 6940

Modified:
   trunk/src/main/org/jboss/messaging/ra/JBMRAProperties.java
   trunk/src/main/org/jboss/messaging/ra/JBMResourceAdapter.java
   trunk/tests/config/jbm-jms-for-JMSServerDeployerTest.xml
Log:
more tweaks

Modified: trunk/src/main/org/jboss/messaging/ra/JBMRAProperties.java
===================================================================
--- trunk/src/main/org/jboss/messaging/ra/JBMRAProperties.java	2009-05-20 16:17:19 UTC (rev 6939)
+++ trunk/src/main/org/jboss/messaging/ra/JBMRAProperties.java	2009-05-20 16:23:57 UTC (rev 6940)
@@ -59,7 +59,7 @@
    private Long discoveryInitialWaitTimeout;
 
    /** */
-   private String loadBalancingPolicyClassName;
+   private String connectionLoadBalancingPolicyClassName;
 
    /** */
    private Long pingPeriod;
@@ -269,28 +269,28 @@
     * Get load balancing policy class name
     * @return The value
     */
-   public String getLoadBalancingPolicyClassName()
+   public String getConnectionLoadBalancingPolicyClassName()
    {
       if (trace)
       {
          log.trace("getLoadBalancingPolicyClassName()");
       }
 
-      return loadBalancingPolicyClassName;
+      return connectionLoadBalancingPolicyClassName;
    }
 
    /**
     * Set load balancing policy class name
-    * @param loadBalancingPolicyClassName The value
+    * @param connectionLoadBalancingPolicyClassName The value
     */
-   public void setLoadBalancingPolicyClassName(final String loadBalancingPolicyClassName)
+   public void setConnectionLoadBalancingPolicyClassName(final String loadBalancingPolicyClassName)
    {
       if (trace)
       {
          log.trace("setLoadBalancingPolicyClassName(" + loadBalancingPolicyClassName + ")");
       }
 
-      this.loadBalancingPolicyClassName = loadBalancingPolicyClassName;
+      this.connectionLoadBalancingPolicyClassName = loadBalancingPolicyClassName;
    }
 
    /**
@@ -1009,7 +1009,7 @@
                                                                                                     you.getDiscoveryGroupPort()) &&
                 Util.compare(discoveryRefreshTimeout, you.getDiscoveryRefreshTimeout()) &&
                 Util.compare(discoveryInitialWaitTimeout, you.getDiscoveryInitialWaitTimeout()) &&
-                Util.compare(loadBalancingPolicyClassName, you.getLoadBalancingPolicyClassName()) &&
+                Util.compare(connectionLoadBalancingPolicyClassName, you.getConnectionLoadBalancingPolicyClassName()) &&
                 Util.compare(pingPeriod, you.getPingPeriod()) &&
                 Util.compare(connectionTTL, you.getConnectionTTL()) &&
                 Util.compare(callTimeout, you.getCallTimeout()) &&
@@ -1057,7 +1057,7 @@
       hash += 31 * hash + (discoveryGroupPort != null ? discoveryGroupPort.hashCode() : 0);
       hash += 31 * hash + (discoveryRefreshTimeout != null ? discoveryRefreshTimeout.hashCode() : 0);
       hash += 31 * hash + (discoveryInitialWaitTimeout != null ? discoveryInitialWaitTimeout.hashCode() : 0);
-      hash += 31 * hash + (loadBalancingPolicyClassName != null ? loadBalancingPolicyClassName.hashCode() : 0);
+      hash += 31 * hash + (connectionLoadBalancingPolicyClassName != null ? connectionLoadBalancingPolicyClassName.hashCode() : 0);
       hash += 31 * hash + (pingPeriod != null ? pingPeriod.hashCode() : 0);
       hash += 31 * hash + (connectionTTL != null ? connectionTTL.hashCode() : 0);
       hash += 31 * hash + (callTimeout != null ? callTimeout.hashCode() : 0);

Modified: trunk/src/main/org/jboss/messaging/ra/JBMResourceAdapter.java
===================================================================
--- trunk/src/main/org/jboss/messaging/ra/JBMResourceAdapter.java	2009-05-20 16:17:19 UTC (rev 6939)
+++ trunk/src/main/org/jboss/messaging/ra/JBMResourceAdapter.java	2009-05-20 16:23:57 UTC (rev 6940)
@@ -409,7 +409,7 @@
          log.trace("getLoadBalancingPolicyClassName()");
       }
 
-      return raProperties.getLoadBalancingPolicyClassName();
+      return raProperties.getConnectionLoadBalancingPolicyClassName();
    }
 
    /**
@@ -424,7 +424,7 @@
          log.trace("setLoadBalancingPolicyClassName(" + loadBalancingPolicyClassName + ")");
       }
 
-      raProperties.setLoadBalancingPolicyClassName(loadBalancingPolicyClassName);
+      raProperties.setConnectionLoadBalancingPolicyClassName(loadBalancingPolicyClassName);
    }
 
    /**

Modified: trunk/tests/config/jbm-jms-for-JMSServerDeployerTest.xml
===================================================================
--- trunk/tests/config/jbm-jms-for-JMSServerDeployerTest.xml	2009-05-20 16:17:19 UTC (rev 6939)
+++ trunk/tests/config/jbm-jms-for-JMSServerDeployerTest.xml	2009-05-20 16:23:57 UTC (rev 6940)
@@ -28,7 +28,7 @@
       <connection-ttl>2345</connection-ttl>
       <discovery-initial-wait-timeout>678</discovery-initial-wait-timeout>
       <failover-on-server-shutdown>false</failover-on-server-shutdown>
-      <load-balancing-policy-class-name>FooClass</load-balancing-policy-class-name>
+      <connection-load-balancing-policy-class-name>FooClass</connection-load-balancing-policy-class-name>
       <max-connections>12</max-connections>
       <reconnect-attempts>34</reconnect-attempts>
       <retry-interval>5</retry-interval>