[jboss-cvs] JBoss Messaging SVN: r1624 - in branches/Branch_HTTP_Experiment: docs/examples/http/etc src/etc/server/default/deploy tests/src/org/jboss/test/messaging/tools/jmx

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

Author: ovidiu.feodorov at jboss.com
Date: 2006-11-22 22:29:46 -0500 (Wed, 22 Nov 2006)
New Revision: 1624

Modified:
   branches/Branch_HTTP_Experiment/docs/examples/http/etc/messaging-http-service.xml
   branches/Branch_HTTP_Experiment/src/etc/server/default/deploy/remoting-service.xml
   branches/Branch_HTTP_Experiment/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java
Log:
got rid of timeout=0 for HTTP configurations - cannot be enforced with Java 4 anyway

Modified: branches/Branch_HTTP_Experiment/docs/examples/http/etc/messaging-http-service.xml
===================================================================
--- branches/Branch_HTTP_Experiment/docs/examples/http/etc/messaging-http-service.xml	2006-11-23 03:28:32 UTC (rev 1623)
+++ branches/Branch_HTTP_Experiment/docs/examples/http/etc/messaging-http-service.xml	2006-11-23 03:29:46 UTC (rev 1624)
@@ -25,7 +25,6 @@
                <attribute name="unmarshaller" isParam="true">org.jboss.jms.server.remoting.JMSWireFormat</attribute>
                <attribute name="serializationtype" isParam="true">jms</attribute>
                <attribute name="dataType" isParam="true">jms</attribute>
-               <attribute name="timeout">0</attribute>
                <attribute name="serverBindAddress">${jboss.bind.address}</attribute>
                <attribute name="serverBindPort">4458</attribute>
                <attribute name="leasePeriod">20000</attribute>

Modified: branches/Branch_HTTP_Experiment/src/etc/server/default/deploy/remoting-service.xml
===================================================================
--- branches/Branch_HTTP_Experiment/src/etc/server/default/deploy/remoting-service.xml	2006-11-23 03:28:32 UTC (rev 1623)
+++ branches/Branch_HTTP_Experiment/src/etc/server/default/deploy/remoting-service.xml	2006-11-23 03:29:46 UTC (rev 1624)
@@ -49,7 +49,6 @@
                <!== Serialization type must be jms - do not change! ==>
                <attribute name="serializationtype" isParam="true">jms</attribute>
                <attribute name="dataType" isParam="true">jms</attribute>
-               <attribute name="timeout">0</attribute>
                <attribute name="serverBindAddress">${jboss.bind.address}</attribute>
                <attribute name="serverBindPort">4458</attribute>
                <attribute name="leasePeriod">20000</attribute>

Modified: branches/Branch_HTTP_Experiment/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java
===================================================================
--- branches/Branch_HTTP_Experiment/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java	2006-11-23 03:28:32 UTC (rev 1623)
+++ branches/Branch_HTTP_Experiment/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java	2006-11-23 03:29:46 UTC (rev 1624)
@@ -989,7 +989,6 @@
                       "unmarshaller=org.jboss.jms.server.remoting.JMSWireFormat&" +
                       "serializationtype=" + serializationType + "&" +
                       "dataType=jms&" +
-                      "timeout=0&" +
                       "socket.check_connection=false&" +
                       "clientLeasePeriod=20000&" +
                       "callbackStore=org.jboss.remoting.callback.BlockingCallbackStore";
@@ -1000,6 +999,10 @@
       {
          params += "&callbackPollPeriod=" + HTTP_CONNECTOR_CALLBACK_POLL_PERIOD;
       }
+      else
+      {
+         params += "timeout=0&";
+      }
 
 //      int freePort = PortUtil.findFreePort(ipAddressOrHostName);