cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1366327 - in /cxf/branches/2.5.x-fixes: ./ systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
Date Fri, 27 Jul 2012 10:12:51 GMT
Author: sergeyb
Date: Fri Jul 27 10:12:51 2012
New Revision: 1366327

URL: http://svn.apache.org/viewvc?rev=1366327&view=rev
Log:
Merged revisions 1365631 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

................
  r1365631 | sergeyb | 2012-07-25 16:27:12 +0100 (Wed, 25 Jul 2012) | 9 lines
  
  Merged revisions 1365627 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1365627 | sergeyb | 2012-07-25 16:23:31 +0100 (Wed, 25 Jul 2012) | 1 line
    
    Making JAXRSClientServerBookTest server run out of process
  ........
................

Modified:
    cxf/branches/2.5.x-fixes/   (props changed)
    cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jul 27 10:12:51 2012
@@ -0,0 +1,2 @@
+/cxf/branches/2.6.x-fixes:1365631
+/cxf/trunk:1365627

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

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

Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java?rev=1366327&r1=1366326&r2=1366327&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
(original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
Fri Jul 27 10:12:51 2012
@@ -76,7 +76,7 @@ public class JAXRSClientServerBookTest e
     @BeforeClass
     public static void startServers() throws Exception {
         assertTrue("server did not launch correctly",
-                   launchServer(BookServer.class, true));
+                   launchServer(BookServer.class));
         createStaticBus();
     }
     



Mime
View raw message