cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1304496 - in /cxf/branches/2.4.x-fixes: ./ systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/CachedOutMessageTest.java systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionQueueTest.java
Date Fri, 23 Mar 2012 17:18:40 GMT
Author: dkulp
Date: Fri Mar 23 17:18:40 2012
New Revision: 1304496

URL: http://svn.apache.org/viewvc?rev=1304496&view=rev
Log:
Merged revisions 1304488 via  svn merge from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes

........
  r1304488 | dkulp | 2012-03-23 13:08:01 -0400 (Fri, 23 Mar 2012) | 9 lines
  
  Merged revisions 1304482 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1304482 | dkulp | 2012-03-23 12:58:32 -0400 (Fri, 23 Mar 2012) | 2 lines
  
    Use the correct ports
  
  ........
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/CachedOutMessageTest.java
    cxf/branches/2.4.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionQueueTest.java

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

Modified: cxf/branches/2.4.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/CachedOutMessageTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/CachedOutMessageTest.java?rev=1304496&r1=1304495&r2=1304496&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/CachedOutMessageTest.java
(original)
+++ cxf/branches/2.4.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/CachedOutMessageTest.java
Fri Mar 23 17:18:40 2012
@@ -97,7 +97,7 @@ public class CachedOutMessageTest extend
         System.setProperty("org.apache.cxf.io.CachedOutputStream.Threshold", "16");
 
         assertTrue("server did not launch correctly", 
-                   launchServer(Server.class));
+                   launchServer(Server.class, true));
     }
 
     @AfterClass
@@ -129,7 +129,7 @@ public class CachedOutMessageTest extend
         
         GreeterService gs = new GreeterService();
         final Greeter greeter = gs.getGreeterPort();
-        updateAddressPort(greeter, DecoupledClientServerTest.PORT);
+        updateAddressPort(greeter, PORT);
         LOG.fine("Created greeter client.");
        
         ConnectionHelper.setKeepAliveConnection(greeter, true);

Modified: cxf/branches/2.4.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionQueueTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionQueueTest.java?rev=1304496&r1=1304495&r2=1304496&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionQueueTest.java
(original)
+++ cxf/branches/2.4.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionQueueTest.java
Fri Mar 23 17:18:40 2012
@@ -119,7 +119,7 @@ public class RetransmissionQueueTest ext
         
         GreeterService gs = new GreeterService();
         final Greeter greeter = gs.getGreeterPort();
-        updateAddressPort(greeter, DecoupledClientServerTest.PORT);
+        updateAddressPort(greeter, PORT);
         LOG.fine("Created greeter client.");
        
         ConnectionHelper.setKeepAliveConnection(greeter, true);



Mime
View raw message