You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/05/22 23:19:08 UTC
svn commit: r1341631 - in /cxf/branches/2.5.x-fixes: ./
systests/transport-jms/
systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/
systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/
systests/transport-jms/src/t...
Author: dkulp
Date: Tue May 22 21:19:08 2012
New Revision: 1341631
URL: http://svn.apache.org/viewvc?rev=1341631&view=rev
Log:
Merged revisions 1338281 via svn merge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1338281 | dkulp | 2012-05-14 12:40:39 -0400 (Mon, 14 May 2012) | 1 line
JMS tests can be forkmode once
........
Modified:
cxf/branches/2.5.x-fixes/ (props changed)
cxf/branches/2.5.x-fixes/systests/transport-jms/pom.xml
cxf/branches/2.5.x-fixes/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerGzipTest.java
cxf/branches/2.5.x-fixes/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerSoap12Test.java
cxf/branches/2.5.x-fixes/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
cxf/branches/2.5.x-fixes/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsClientServerTest.java
cxf/branches/2.5.x-fixes/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsThrottleTest.java
cxf/branches/2.5.x-fixes/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/JMSContinuationsClientServerTest.java
cxf/branches/2.5.x-fixes/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/ProviderJMSContinuationTest.java
cxf/branches/2.5.x-fixes/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/swa/ClientServerSwaTest.java
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.5.x-fixes/systests/transport-jms/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/transport-jms/pom.xml?rev=1341631&r1=1341630&r2=1341631&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/transport-jms/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/systests/transport-jms/pom.xml Tue May 22 21:19:08 2012
@@ -318,8 +318,5 @@
</dependency>
</dependencies>
- <properties>
- <cxf.surefire.fork.mode>pertest</cxf.surefire.fork.mode>
- </properties>
</project>
Modified: cxf/branches/2.5.x-fixes/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerGzipTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerGzipTest.java?rev=1341631&r1=1341630&r2=1341631&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerGzipTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerGzipTest.java Tue May 22 21:19:08 2012
@@ -136,5 +136,6 @@ public class JMSClientServerGzipTest ext
} catch (UndeclaredThrowableException ex) {
throw (Exception)ex.getCause();
}
+ bus.shutdown(true);
}
}
Modified: cxf/branches/2.5.x-fixes/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerSoap12Test.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerSoap12Test.java?rev=1341631&r1=1341630&r2=1341631&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerSoap12Test.java (original)
+++ cxf/branches/2.5.x-fixes/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerSoap12Test.java Tue May 22 21:19:08 2012
@@ -64,7 +64,6 @@ public class JMSClientServerSoap12Test e
assertTrue("server did not launch correctly",
launchServer(Soap12Server.class));
-
}
public URL getWSDLURL(String s) throws Exception {
@@ -136,5 +135,6 @@ public class JMSClientServerSoap12Test e
} catch (UndeclaredThrowableException ex) {
throw (Exception)ex.getCause();
}
+ bus.shutdown(true);
}
}
Modified: cxf/branches/2.5.x-fixes/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java?rev=1341631&r1=1341630&r2=1341631&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java Tue May 22 21:19:08 2012
@@ -122,6 +122,7 @@ public class JMSClientServerTest extends
assertTrue("server did not launch correctly",
launchServer(Server.class, false));
+ createStaticBus();
}
Modified: cxf/branches/2.5.x-fixes/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsClientServerTest.java?rev=1341631&r1=1341630&r2=1341631&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsClientServerTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsClientServerTest.java Tue May 22 21:19:08 2012
@@ -95,6 +95,7 @@ public class HelloWorldContinuationsClie
helloDoneSignal.await(60, TimeUnit.SECONDS);
executor.shutdownNow();
assertEquals("Not all invocations have completed", 0, helloDoneSignal.getCount());
+ bus.shutdown(true);
}
}
Modified: cxf/branches/2.5.x-fixes/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsThrottleTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsThrottleTest.java?rev=1341631&r1=1341630&r2=1341631&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsThrottleTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsThrottleTest.java Tue May 22 21:19:08 2012
@@ -100,6 +100,7 @@ public class HelloWorldContinuationsThro
executor.shutdownNow();
System.out.println("Completed : " + (5 - helloDoneSignal.getCount()));
assertEquals("Not all invocations have completed", 0, helloDoneSignal.getCount());
+ bus.shutdown(true);
}
}
Modified: cxf/branches/2.5.x-fixes/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/JMSContinuationsClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/JMSContinuationsClientServerTest.java?rev=1341631&r1=1341630&r2=1341631&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/JMSContinuationsClientServerTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/JMSContinuationsClientServerTest.java Tue May 22 21:19:08 2012
@@ -57,6 +57,7 @@ public class JMSContinuationsClientServe
assertTrue("server did not launch correctly",
launchServer(Server.class, false));
serversStarted = true;
+ createStaticBus();
}
public URL getWSDLURL(String s) throws Exception {
Modified: cxf/branches/2.5.x-fixes/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/ProviderJMSContinuationTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/ProviderJMSContinuationTest.java?rev=1341631&r1=1341630&r2=1341631&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/ProviderJMSContinuationTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/ProviderJMSContinuationTest.java Tue May 22 21:19:08 2012
@@ -57,6 +57,7 @@ public class ProviderJMSContinuationTest
assertTrue("server did not launch correctly",
launchServer(ProviderServer.class, false));
serversStarted = true;
+ createStaticBus();
}
public URL getWSDLURL(String s) throws Exception {
Modified: cxf/branches/2.5.x-fixes/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/swa/ClientServerSwaTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/swa/ClientServerSwaTest.java?rev=1341631&r1=1341630&r2=1341631&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/swa/ClientServerSwaTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/swa/ClientServerSwaTest.java Tue May 22 21:19:08 2012
@@ -56,6 +56,7 @@ public class ClientServerSwaTest extends
launchServer(EmbeddedJMSBrokerLauncher.class, props, null));
assertTrue("server did not launch correctly", launchServer(Server.class));
+ createStaticBus();
}
@Test
public void testSwa() throws Exception {