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/08/09 22:23:34 UTC
svn commit: r1371434 -
/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
Author: dkulp
Date: Thu Aug 9 20:23:34 2012
New Revision: 1371434
URL: http://svn.apache.org/viewvc?rev=1371434&view=rev
Log:
Merged revisions 1365660 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........
r1365660 | sergeyb | 2012-07-25 12:32:34 -0400 (Wed, 25 Jul 2012) | 9 lines
Merged revisions 1365658 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1365658 | sergeyb | 2012-07-25 17:25:52 +0100 (Wed, 25 Jul 2012) | 1 line
Attempting to fix JAXRSClientServerSpringBookTest by moving it out of process
........
........
Modified:
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java?rev=1371434&r1=1371433&r2=1371434&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java Thu Aug 9 20:23:34 2012
@@ -65,7 +65,7 @@ public class JAXRSClientServerSpringBook
@BeforeClass
public static void startServers() throws Exception {
assertTrue("server did not launch correctly",
- launchServer(BookServerSpring.class, true));
+ launchServer(BookServerSpring.class));
createStaticBus();
}