[jboss-cvs] JBoss Messaging SVN: r3975 - in branches/Branch_JBossMessaging_1_4_0_SP3_CP: src/etc/remoting and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Mar 28 10:02:03 EDT 2008
Author: timfox
Date: 2008-03-28 10:02:03 -0400 (Fri, 28 Mar 2008)
New Revision: 3975
Modified:
branches/Branch_JBossMessaging_1_4_0_SP3_CP/build-thirdparty.xml
branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/etc/remoting/remoting-bisocket-service.xml
branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/etc/remoting/remoting-sslbisocket-service.xml
branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactory.java
Log:
http://jira.jboss.org/jira/browse/JBMESSAGING-1268
Modified: branches/Branch_JBossMessaging_1_4_0_SP3_CP/build-thirdparty.xml
===================================================================
--- branches/Branch_JBossMessaging_1_4_0_SP3_CP/build-thirdparty.xml 2008-03-28 13:38:19 UTC (rev 3974)
+++ branches/Branch_JBossMessaging_1_4_0_SP3_CP/build-thirdparty.xml 2008-03-28 14:02:03 UTC (rev 3975)
@@ -89,7 +89,7 @@
<componentref name="trove" version="1.0.2-brew"/>
<componentref name="jboss/common" version="1.2.0.GA-brew"/>
<componentref name="jboss/aop" version="1.5.5.GA"/>
- <componentref name="jboss/remoting" version="2.2.2.SP5"/>
+ <componentref name="jboss/remoting" version="2.2.2.SP7"/>
<componentref name="jboss/jbossts14" version="4.2.3.SP3"/>
<componentref name="jbossas/core-libs" version="4.2.0.GA"/>
Modified: branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/etc/remoting/remoting-bisocket-service.xml
===================================================================
--- branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/etc/remoting/remoting-bisocket-service.xml 2008-03-28 13:38:19 UTC (rev 3974)
+++ branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/etc/remoting/remoting-bisocket-service.xml 2008-03-28 14:02:03 UTC (rev 3975)
@@ -23,12 +23,12 @@
<attribute name="marshaller" isParam="true">org.jboss.jms.wireformat.JMSWireFormat</attribute>
<attribute name="unmarshaller" isParam="true">org.jboss.jms.wireformat.JMSWireFormat</attribute>
<attribute name="dataType" isParam="true">jms</attribute>
- <attribute name="socket.check_connection" isParam="true">false</attribute>
- <attribute name="timeout" isParam="true">0</attribute>
+ <attribute name="socket.check_connection" isParam="true">false</attribute>
<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">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>
@@ -39,6 +39,8 @@
<!-- Periodicity of client pings. Server window by default is twice this figure -->
<attribute name="clientLeasePeriod" isParam="true">10000</attribute>
+
+ <attribute name="timeout" isParam="true">10000</attribute>
<!-- Number of seconds to wait for a connection in the client pool to become free -->
<attribute name="numberOfRetries" isParam="true">10</attribute>
Modified: branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/etc/remoting/remoting-sslbisocket-service.xml
===================================================================
--- branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/etc/remoting/remoting-sslbisocket-service.xml 2008-03-28 13:38:19 UTC (rev 3974)
+++ branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/etc/remoting/remoting-sslbisocket-service.xml 2008-03-28 14:02:03 UTC (rev 3975)
@@ -21,8 +21,7 @@
<attribute name="marshaller" isParam="true">org.jboss.jms.wireformat.JMSWireFormat</attribute>
<attribute name="unmarshaller" isParam="true">org.jboss.jms.wireformat.JMSWireFormat</attribute>
<attribute name="dataType" isParam="true">jms</attribute>
- <attribute name="socket.check_connection" isParam="true">false</attribute>
- <attribute name="timeout" isParam="true">0</attribute>
+ <attribute name="socket.check_connection" isParam="true">false</attribute>
<attribute name="serverBindAddress">${jboss.bind.address}</attribute>
<attribute name="serverBindPort">5457</attribute>
<attribute name="clientSocketClass" isParam="true">org.jboss.jms.client.remoting.ClientSocketWrapper</attribute>
@@ -38,6 +37,8 @@
<!-- Periodicity of client pings. Server window by default is twice this figure -->
<attribute name="clientLeasePeriod" isParam="true">10000</attribute>
+
+ <attribute name="timeout" isParam="true">10000</attribute>
<!-- Number of seconds to wait for a connection in the client pool to become free -->
<attribute name="numberOfRetries" isParam="true">10</attribute>
@@ -46,7 +47,7 @@
the max number of sessions/consumers you expect -->
<attribute name="JBM_clientMaxPoolSize" isParam="true">200</attribute>
- <!-- The maximum time to wait before timing out on trying to write a message to socket for delivery -->
+ <!-- The maximum time to wait before timing out on trying to write a message to socket for delivery -->
<attribute name="callbackTimeout">10000</attribute>
<!-- Use these parameters to specify values for binding and connecting control connections to
Modified: branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactory.java
===================================================================
--- branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactory.java 2008-03-28 13:38:19 UTC (rev 3974)
+++ branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactory.java 2008-03-28 14:02:03 UTC (rev 3975)
@@ -144,7 +144,6 @@
checkParam(params, "marshaller", "org.jboss.jms.wireformat.JMSWireFormat") &&
checkParam(params, "unmarshaller", "org.jboss.jms.wireformat.JMSWireFormat") &&
checkParam(params, "dataType", "jms") &&
- checkParam(params, "timeout", "0") &&
checkParam(params, "clientSocketClass", "org.jboss.jms.client.remoting.ClientSocketWrapper") &&
checkParam(params, "numberOfCallRetries", "1") &&
checkParam(params, "pingFrequency", "214748364") &&
More information about the jboss-cvs-commits
mailing list