[jboss-cvs] JBossAS SVN: r77499 - in trunk: system/src/resources/tests/conf and 2 other directories.

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

Author: dimitris at jboss.org
Date: 2008-08-26 14:38:57 -0400 (Tue, 26 Aug 2008)
New Revision: 77499

Modified:
   trunk/server/src/etc/conf/default/jboss-service.xml
   trunk/system/src/resources/tests/conf/jboss-service-VDFDeploymentScanner.xml
   trunk/testsuite/src/resources/cluster/ejb2/passexp/META-INF/partition-passexp-jboss-beans.xml
   trunk/testsuite/src/resources/cluster/partition/partition-restart-jboss-beans.xml
Log:
JBAS-4522, Remoting Connector attribute "socketTimeout" in jboss-service.xml should be "timeout"

Modified: trunk/server/src/etc/conf/default/jboss-service.xml
===================================================================
--- trunk/server/src/etc/conf/default/jboss-service.xml	2008-08-26 18:30:06 UTC (rev 77498)
+++ trunk/server/src/etc/conf/default/jboss-service.xml	2008-08-26 18:38:57 UTC (rev 77499)
@@ -349,7 +349,7 @@
                <!-- <attribute name="numAcceptThreads">1</attribute>-->
                <!-- <attribute name="maxPoolSize">303</attribute>-->
                <!-- <attribute name="clientMaxPoolSize" isParam="true">304</attribute>-->
-               <attribute name="socketTimeout" isParam="true">600000</attribute>
+               <!-- <attribute name="timeout" isParam="true">600000</attribute>-->
                <attribute name="serverBindAddress">${host}</attribute>
                <attribute name="serverBindPort">${port}</attribute>
                <!-- <attribute name="clientConnectAddress">216.23.33.2</attribute> -->

Modified: trunk/system/src/resources/tests/conf/jboss-service-VDFDeploymentScanner.xml
===================================================================
--- trunk/system/src/resources/tests/conf/jboss-service-VDFDeploymentScanner.xml	2008-08-26 18:30:06 UTC (rev 77498)
+++ trunk/system/src/resources/tests/conf/jboss-service-VDFDeploymentScanner.xml	2008-08-26 18:38:57 UTC (rev 77499)
@@ -371,7 +371,7 @@
            <!-- <attribute name="numAcceptThreads">1</attribute>-->
            <!-- <attribute name="maxPoolSize">303</attribute>-->
            <!-- <attribute name="clientMaxPoolSize" isParam="true">304</attribute>-->
-           <!-- <attribute name="socketTimeout">60000</attribute>-->
+           <!-- <attribute name="timeout">60000</attribute>-->
            <!-- <attribute name="serverBindAddress">${jboss.bind.address}</attribute>-->
            <!-- <attribute name="serverBindPort">6666</attribute>-->
            <!-- <attribute name="clientConnectAddress">216.23.33.2</attribute> -->

Modified: trunk/testsuite/src/resources/cluster/ejb2/passexp/META-INF/partition-passexp-jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/ejb2/passexp/META-INF/partition-passexp-jboss-beans.xml	2008-08-26 18:30:06 UTC (rev 77498)
+++ trunk/testsuite/src/resources/cluster/ejb2/passexp/META-INF/partition-passexp-jboss-beans.xml	2008-08-26 18:38:57 UTC (rev 77499)
@@ -156,7 +156,7 @@
       <constructor>
           <!-- Remember that if you do use more than one param on the uri, will have to include as a CDATA, -->
           <!-- otherwise, parser will complain. -->
-   	   <parameter><![CDATA[socket://${jboss.bind.address:localhost}:24446/?datatype=invocation&marshaller=org.jboss.invocation.unified.marshall.InvocationMarshaller&unmarshaller=org.jboss.invocation.unified.marshall.InvocationUnMarshaller&socketTimeout=60000&enableTcpNoDelay=true]]></parameter>
+   	   <parameter><![CDATA[socket://${jboss.bind.address:localhost}:24446/?datatype=invocation&marshaller=org.jboss.invocation.unified.marshall.InvocationMarshaller&unmarshaller=org.jboss.invocation.unified.marshall.InvocationUnMarshaller&timeout=60000&enableTcpNoDelay=true]]></parameter>
    	   <parameter>
    	     <map class="java.util.HashMap" keyClass="java.lang.String" valueClass="java.lang.String">
    	     <entry><key>dataType</key><value>invocation</value></entry>

Modified: trunk/testsuite/src/resources/cluster/partition/partition-restart-jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/partition/partition-restart-jboss-beans.xml	2008-08-26 18:30:06 UTC (rev 77498)
+++ trunk/testsuite/src/resources/cluster/partition/partition-restart-jboss-beans.xml	2008-08-26 18:38:57 UTC (rev 77499)
@@ -145,7 +145,7 @@
       <constructor>
           <!-- Remember that if you do use more than one param on the uri, will have to include as a CDATA, -->
           <!-- otherwise, parser will complain. -->
-   	   <parameter><![CDATA[socket://${jboss.bind.address:localhost}:14446/?datatype=invocation&marshaller=org.jboss.invocation.unified.marshall.InvocationMarshaller&unmarshaller=org.jboss.invocation.unified.marshall.InvocationUnMarshaller&socketTimeout=60000&enableTcpNoDelay=true]]></parameter>
+   	   <parameter><![CDATA[socket://${jboss.bind.address:localhost}:14446/?datatype=invocation&marshaller=org.jboss.invocation.unified.marshall.InvocationMarshaller&unmarshaller=org.jboss.invocation.unified.marshall.InvocationUnMarshaller&timeout=60000&enableTcpNoDelay=true]]></parameter>
    	   <parameter>
    	     <map class="java.util.HashMap" keyClass="java.lang.String" valueClass="java.lang.String">
    	     <entry><key>dataType</key><value>invocation</value></entry>