[jboss-cvs] JBoss Messaging SVN: r3369 - in branches/Branch_Stable: tests/src/org/jboss/test/messaging/tools/container and 1 other directory.

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

Author: clebert.suconic at jboss.com
Date: 2007-11-26 19:09:19 -0500 (Mon, 26 Nov 2007)
New Revision: 3369

Modified:
   branches/Branch_Stable/src/etc/remoting/remoting-bisocket-service.xml
   branches/Branch_Stable/tests/src/org/jboss/test/messaging/tools/container/ServiceContainer.java
Log:
http://jira.jboss.org/jira/browse/JBMESSAGING-1165 - Fixing remoting configuration on the testsuite

Modified: branches/Branch_Stable/src/etc/remoting/remoting-bisocket-service.xml
===================================================================
--- branches/Branch_Stable/src/etc/remoting/remoting-bisocket-service.xml	2007-11-26 23:50:52 UTC (rev 3368)
+++ branches/Branch_Stable/src/etc/remoting/remoting-bisocket-service.xml	2007-11-27 00:09:19 UTC (rev 3369)
@@ -28,7 +28,7 @@
                <attribute name="serverBindAddress">${jboss.bind.address}</attribute>
                <attribute name="serverBindPort">4457</attribute>
                <attribute name="clientSocketClass" isParam="true">org.jboss.jms.client.remoting.ClientSocketWrapper</attribute>
-               <attribute name="serverSocketClass" isParam="true">org.jboss.jms.server.remoting.ServerSocketWrapper</attribute>
+               <attribute name="serverSocketClass">org.jboss.jms.server.remoting.ServerSocketWrapper</attribute>
                <attribute name="numberOfCallRetries" isParam="true">1</attribute>
                <attribute name="pingFrequency" isParam="true">214748364</attribute>
                <attribute name="pingWindowFactor" isParam="true">10</attribute>

Modified: branches/Branch_Stable/tests/src/org/jboss/test/messaging/tools/container/ServiceContainer.java
===================================================================
--- branches/Branch_Stable/tests/src/org/jboss/test/messaging/tools/container/ServiceContainer.java	2007-11-26 23:50:52 UTC (rev 3368)
+++ branches/Branch_Stable/tests/src/org/jboss/test/messaging/tools/container/ServiceContainer.java	2007-11-27 00:09:19 UTC (rev 3369)
@@ -1314,12 +1314,13 @@
       for (int i = 0; i < invokerAttributes.getLength(); i++)
       {
          Element attr = (Element) invokerAttributes.item(i);
-         if (attr.getAttribute("isParam").equals(""))
+         String key = attr.getAttribute("name");
+
+         if (attr.getAttribute("isParam").equals("") && (key == null || !key.equals("serverSocketClass")))
          {
             continue;
          }
          
-         String key = attr.getAttribute("name");
          String value = attr.getTextContent().trim();
 
          if (overrideMarshallers &&