[jboss-cvs] JBoss Messaging SVN: r1942 - in trunk: lib and 1 other directories.

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

Author: ovidiu.feodorov at jboss.com
Date: 2007-01-10 05:38:48 -0500 (Wed, 10 Jan 2007)
New Revision: 1942

Added:
   trunk/lib/jboss-remoting.jar
Modified:
   trunk/messaging.ipr
   trunk/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java
Log:
Found the cause of sluggish failover tests (http://jira.jboss.org/jira/browse/JBMESSAGING-729):
http://jira.jboss.org/jira/browse/JBREM-662

Checked in a temporary patched remoting jar. Eventually, the changes should be available as
2.2.0.Alpha5 (or newer).



Added: trunk/lib/jboss-remoting.jar
===================================================================
(Binary files differ)


Property changes on: trunk/lib/jboss-remoting.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/messaging.ipr
===================================================================
--- trunk/messaging.ipr	2007-01-10 09:41:50 UTC (rev 1941)
+++ trunk/messaging.ipr	2007-01-10 10:38:48 UTC (rev 1942)
@@ -238,15 +238,6 @@
         <root url="file://C:/work/src/jboss-aop_1.5.0.GA/src/aspect-framework/main" />
       </SOURCES>
     </library>
-    <library name="jboss-remoting">
-      <CLASSES>
-        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/remoting/lib/jboss-remoting.jar!/" />
-      </CLASSES>
-      <JAVADOC />
-      <SOURCES>
-        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/remoting/lib/jboss-remoting-src.zip!/" />
-      </SOURCES>
-    </library>
     <library name="jboss-serialization">
       <CLASSES>
         <root url="jar://$PROJECT_DIR$/thirdparty/jboss/serialization/lib/jboss-serialization.jar!/" />
@@ -361,6 +352,15 @@
         <root url="file://C:/work/src/apache-ant-1.6.5/src/main" />
       </SOURCES>
     </library>
+    <library name="jboss-remoting">
+      <CLASSES>
+        <root url="jar://$PROJECT_DIR$/lib/jboss-remoting.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES>
+        <root url="file://C:/work/src/cvs/JBossRemoting-remoting_2_x/src/main" />
+      </SOURCES>
+    </library>
   </component>
   <component name="uidesigner-configuration">
     <option name="INSTRUMENT_CLASSES" value="true" />

Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java	2007-01-10 09:41:50 UTC (rev 1941)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java	2007-01-10 10:38:48 UTC (rev 1942)
@@ -1514,6 +1514,9 @@
       simpleFailover("john", "needle");
    }
 
+
+   // I need this, Clebert.
+
 //   public void testTemp() throws Exception
 //   {
 //      Connection conn = null;
@@ -1628,6 +1631,46 @@
       }
    }
 
+//   public void testTemp() throws Exception
+//   {
+//      Connection conn = null;
+//
+//      try
+//      {
+//         conn = cf.createConnection();
+//         conn.close();
+//
+//         conn = cf.createConnection();
+//
+//         assertEquals(1, ((JBossConnection)conn).getServerID());
+//
+//         // we "cripple" the remoting connection by removing ConnectionListener. This way, failures
+//         // cannot be "cleanly" detected by the client-side pinger, and we'll fail on an invocation
+//         JMSRemotingConnection rc = ((ClientConnectionDelegate)((JBossConnection)conn).
+//            getDelegate()).getRemotingConnection();
+//         rc.removeConnectionListener();
+//
+//         ServerManagement.killAndWait(1);
+//
+//         log.info("########");
+//         log.info("######## KILLED NODE 1");
+//         log.info("########");
+//
+//         Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+//      }
+//      finally
+//      {
+//         if (conn != null)
+//         {
+//            conn.close();
+//         }
+//      }
+//   }
+
+   // Package protected ----------------------------------------------------------------------------
+
+   // Protected ------------------------------------------------------------------------------------
+
    protected void setUp() throws Exception
    {
       nodeCount = 2;