svn commit: r1365660 - in /cxf/branches/2.6.x-fixes: ./ systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java

[sergeyb]

Author: sergeyb
Date: Wed Jul 25 16:32:34 2012
New Revision: 1365660

URL: http://svn.apache.org/viewvc?rev=1365660&view=rev
Log:
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.6.x-fixes/   (props changed)
    
cxf/branches/2.6.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1365658

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.6.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java?rev=1365660&r1=1365659&r2=1365660&view=diff
==============================================================================
--- 
cxf/branches/2.6.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
 (original)
+++ 
cxf/branches/2.6.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
 Wed Jul 25 16:32:34 2012
@@ -67,7 +67,7 @@ public class JAXRSClientServerSpringBook
     public static void startServers() throws Exception {
         AbstractResourceInfo.clearAllMaps();
         assertTrue("server did not launch correctly", 
-                   launchServer(BookServerSpring.class, true));
+                   launchServer(BookServerSpring.class));
         createStaticBus();
     }