[jboss-cvs] JBossAS SVN: r80714 - in trunk/testsuite/src/resources/cluster: partition and 1 other directory.

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

Author: bstansberry at jboss.com
Date: 2008-11-08 23:48:53 -0500 (Sat, 08 Nov 2008)
New Revision: 80714

Modified:
   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:
Remove unneeded dependency

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-11-09 03:13:42 UTC (rev 80713)
+++ trunk/testsuite/src/resources/cluster/ejb2/passexp/META-INF/partition-passexp-jboss-beans.xml	2008-11-09 04:48:53 UTC (rev 80714)
@@ -158,21 +158,18 @@
       <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&timeout=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&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>
    	     <entry><key>marshaller</key><value>org.jboss.invocation.unified.marshall.InvocationMarshaller</value></entry>
    	     <entry><key>unmarshaller</key><value>org.jboss.invocation.unified.marshall.InvocationUnMarshaller</value></entry>
-   	     <entry><key>socketTimeout</key><value>600000</value></entry>
    	     <entry><key>serverBindAddress</key><value>${jboss.bind.address:localhost}</value></entry>
    	     <entry><key>serverBindPort</key><value>24446</value></entry>
    	     <entry><key>enableTcpNoDelay</key><value>true</value></entry>
    	     </map>
    	   </parameter>
    	 </constructor>
-   	 
-      <depends>jboss.remoting:service=NetworkRegistry</depends>
    </bean>
    
    <bean name="PassExpHAJNDI"

Modified: trunk/testsuite/src/resources/cluster/partition/partition-restart-jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/partition/partition-restart-jboss-beans.xml	2008-11-09 03:13:42 UTC (rev 80713)
+++ trunk/testsuite/src/resources/cluster/partition/partition-restart-jboss-beans.xml	2008-11-09 04:48:53 UTC (rev 80714)
@@ -147,21 +147,18 @@
       <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&timeout=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&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>
    	     <entry><key>marshaller</key><value>org.jboss.invocation.unified.marshall.InvocationMarshaller</value></entry>
    	     <entry><key>unmarshaller</key><value>org.jboss.invocation.unified.marshall.InvocationUnMarshaller</value></entry>
-   	     <entry><key>socketTimeout</key><value>600000</value></entry>
    	     <entry><key>serverBindAddress</key><value>${jboss.bind.address:localhost}</value></entry>
    	     <entry><key>serverBindPort</key><value>14446</value></entry>
    	     <entry><key>enableTcpNoDelay</key><value>true</value></entry>
    	     </map>
    	   </parameter>
    	 </constructor>
-   	 
-      <depends>jboss.remoting:service=NetworkRegistry</depends>
    </bean>
    
    <bean name="RestartPartitionHAJNDI"