[jboss-cvs] JBoss Messaging SVN: r7817 - in branches/Branch_1_4: src/main/org/jboss/jms/server/connectionfactory and 1 other directory.

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

Author: gaohoward
Date: 2009-09-19 10:48:34 -0400 (Sat, 19 Sep 2009)
New Revision: 7817

Modified:
   branches/Branch_1_4/integration/EAP4/etc/remoting/remoting-bisocket-service.xml
   branches/Branch_1_4/integration/EAP4/etc/remoting/remoting-sslbisocket-service.xml
   branches/Branch_1_4/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactory.java
Log:
JBMESSAGING-1733


Modified: branches/Branch_1_4/integration/EAP4/etc/remoting/remoting-bisocket-service.xml
===================================================================
--- branches/Branch_1_4/integration/EAP4/etc/remoting/remoting-bisocket-service.xml	2009-09-18 13:57:29 UTC (rev 7816)
+++ branches/Branch_1_4/integration/EAP4/etc/remoting/remoting-bisocket-service.xml	2009-09-19 14:48:34 UTC (rev 7817)
@@ -28,12 +28,16 @@
                <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="onewayThreadPool">org.jboss.jms.server.remoting.DirectThreadPool</attribute>
+
+               <!-- the following parameters are useful when there is a firewall between client and server. Uncomment them if so.-->
+               <!--	       
                <attribute name="numberOfCallRetries" isParam="true">5</attribute>
+               <attribute name="writeTimeout" isParam="true">30000</attribute>
                <attribute name="pingFrequency" isParam="true">30000</attribute>
                <attribute name="pingWindowFactor" isParam="true">71582</attribute>
                <attribute name="generalizeSocketException" isParam="true">true</attribute>
-               <attribute name="onewayThreadPool">org.jboss.jms.server.remoting.DirectThreadPool</attribute>               
+               -->               
                <!-- End immutable parameters -->
                
                <attribute name="stopLeaseOnFailure" isParam="true">true</attribute>

Modified: branches/Branch_1_4/integration/EAP4/etc/remoting/remoting-sslbisocket-service.xml
===================================================================
--- branches/Branch_1_4/integration/EAP4/etc/remoting/remoting-sslbisocket-service.xml	2009-09-18 13:57:29 UTC (rev 7816)
+++ branches/Branch_1_4/integration/EAP4/etc/remoting/remoting-sslbisocket-service.xml	2009-09-19 14:48:34 UTC (rev 7817)
@@ -27,11 +27,17 @@
                <attribute name="clientSocketClass" isParam="true">org.jboss.jms.client.remoting.ClientSocketWrapper</attribute>
                <attribute name="serverSocketClass">org.jboss.jms.server.remoting.ServerSocketWrapper</attribute>
                <attribute name="serverSocketFactory">jboss.messaging:service=ServerSocketFactory,type=SSL</attribute>
+               <attribute name="onewayThreadPool">org.jboss.jms.server.remoting.DirectThreadPool</attribute>
+
+               <!-- the following parameters are useful when there is a firewall between client and server. Uncomment them if so.-->
+               <!--	       
                <attribute name="numberOfCallRetries" isParam="true">5</attribute>
+               <attribute name="writeTimeout" isParam="true">30000</attribute>
                <attribute name="pingFrequency" isParam="true">30000</attribute>
                <attribute name="pingWindowFactor" isParam="true">71582</attribute>
                <attribute name="generalizeSocketException" isParam="true">true</attribute>
-               <attribute name="onewayThreadPool">org.jboss.jms.server.remoting.DirectThreadPool</attribute>
+               -->               
+
                <!-- End immutable parameters -->
                
                <attribute name="stopLeaseOnFailure" isParam="true">true</attribute>
@@ -46,7 +52,7 @@
                <attribute name="registerCallbackListener">false</attribute>
                <attribute name="useClientConnectionIdentity" isParam="true">true</attribute>
 	       
-	       <attribute name="timeout" isParam="true">0</attribute>
+	            <attribute name="timeout" isParam="true">0</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_1_4/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactory.java
===================================================================
--- branches/Branch_1_4/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactory.java	2009-09-18 13:57:29 UTC (rev 7816)
+++ branches/Branch_1_4/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactory.java	2009-09-19 14:48:34 UTC (rev 7817)
@@ -153,12 +153,8 @@
 	         	checkParam(params, "marshaller", "org.jboss.jms.wireformat.JMSWireFormat") &&	         		
 		         checkParam(params, "unmarshaller", "org.jboss.jms.wireformat.JMSWireFormat") &&
 		         checkParam(params, "dataType", "jms") &&
-		         checkParam(params, "clientSocketClass", "org.jboss.jms.client.remoting.ClientSocketWrapper") &&
-                         checkParam(params, "numberOfCallRetries", "5") &&
-		         checkParam(params, "pingFrequency", "30000") &&
-		         checkParam(params, "pingWindowFactor", "71582") &&
-                         checkParam(params, "generalizeSocketException", "true");
-	         
+		         checkParam(params, "clientSocketClass", "org.jboss.jms.client.remoting.ClientSocketWrapper");
+
 	         if (!cont)
 	         {
 	         	throw new IllegalArgumentException("Failed to deploy connection factory since remoting configuration seems incorrect.");