[jboss-cvs] JBoss Messaging SVN: r2047 - in trunk: tests and 2 other directories.

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

Author: ovidiu.feodorov at jboss.com
Date: 2007-01-25 00:24:43 -0500 (Thu, 25 Jan 2007)
New Revision: 2047

Modified:
   trunk/src/main/org/jboss/jms/client/FailoverCommandCenter.java
   trunk/tests/build.xml
   trunk/tests/src/org/jboss/test/thirdparty/remoting/RemotingTest.java
   trunk/tests/src/org/jboss/test/thirdparty/remoting/util/RemotingTestSubsystem.java
Log:
http://jira.jboss.org/jira/browse/JBMESSAGING-780

Modified: trunk/src/main/org/jboss/jms/client/FailoverCommandCenter.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/FailoverCommandCenter.java	2007-01-25 03:00:26 UTC (rev 2046)
+++ trunk/src/main/org/jboss/jms/client/FailoverCommandCenter.java	2007-01-25 05:24:43 UTC (rev 2047)
@@ -118,6 +118,7 @@
       finally
       {
          valve.open();
+
          if (failoverSuccessful)
          {
             broadcastFailoverEvent(new FailoverEvent(FailoverEvent.FAILOVER_COMPLETED, this));

Modified: trunk/tests/build.xml
===================================================================
--- trunk/tests/build.xml	2007-01-25 03:00:26 UTC (rev 2046)
+++ trunk/tests/build.xml	2007-01-25 05:24:43 UTC (rev 2047)
@@ -350,13 +350,16 @@
    <!-- ======================================================================================== -->
 
    <target name="tests" depends="tests-jar, prepare-testdirs, clear-test-logs">
-      <antcall target="crash-tests"/>
+      <antcall target="crash-tests"/>                                                           
       <antcall target="invm-tests"/>
-      <antcall target="remote-tests"/>  <!-- default remoting configuration (socket) -->
-      <antcall target="clustering-tests"/>
+      <!--
+           default remoting configuration (socket)
+      -->
+      <antcall target="remote-tests"/>
       <antcall target="remote-tests">
          <param name="test.remoting" value="http"/>
       </antcall>
+      <antcall target="clustering-tests"/>
    </target>
 
    <target name="http-tests" depends="tests-jar, prepare-testdirs, clear-test-logs">
@@ -610,12 +613,8 @@
 
             <fileset dir="${build.tests.classes}">
                <include name="**/jms/**/*Test.class"/>
-               <exclude name="**/jms/bridge/**"/>
-
-<!--
+               <exclude name="**/jms/bridge/**"/> <!-- TODO do we really want that? -->
                <include name="**/thirdparty/**/*Test.class"/>
--->
-
                <exclude name="**/jms/stress/**"/>
                <exclude name="**/jms/server/**"/>
                <exclude name="**/jms/persistence/**"/>
@@ -627,8 +626,6 @@
                <exclude name="**/jms/JCAWrapperTest.class"/>
                <exclude name="**/jms/manual/**/*Test.class"/>
                <exclude name="**/jms/clustering/*Test.class"/>
-
-
             </fileset>
          </batchtest>
       </junit>

Modified: trunk/tests/src/org/jboss/test/thirdparty/remoting/RemotingTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/thirdparty/remoting/RemotingTest.java	2007-01-25 03:00:26 UTC (rev 2046)
+++ trunk/tests/src/org/jboss/test/thirdparty/remoting/RemotingTest.java	2007-01-25 05:24:43 UTC (rev 2047)
@@ -248,8 +248,6 @@
       conn2.close();
    }
 
-
-
    // Package protected ----------------------------------------------------------------------------
 
    // Protected ------------------------------------------------------------------------------------

Modified: trunk/tests/src/org/jboss/test/thirdparty/remoting/util/RemotingTestSubsystem.java
===================================================================
--- trunk/tests/src/org/jboss/test/thirdparty/remoting/util/RemotingTestSubsystem.java	2007-01-25 03:00:26 UTC (rev 2046)
+++ trunk/tests/src/org/jboss/test/thirdparty/remoting/util/RemotingTestSubsystem.java	2007-01-25 05:24:43 UTC (rev 2047)
@@ -77,6 +77,10 @@
          return null;
       }
 
+      // before putting invocation in history, clear the request and response payloads, for they
+      // are non-serializable for HTTP invocations, and they are useless for our tests anyway
+      invocation.setRequestPayload(null);
+      invocation.setReturnPayload(null);
       invocationHistory.put(invocation);
 
       if (parameter instanceof CallbackTrigger)