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/03/23 18:30:40 UTC
svn commit: r1304519 - in /cxf/branches/2.3.x-fixes: ./
systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionQueueTest.java
Author: dkulp
Date: Fri Mar 23 17:30:40 2012
New Revision: 1304519
URL: http://svn.apache.org/viewvc?rev=1304519&view=rev
Log:
Merged revisions 1304496 via svn merge from
https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes
........
r1304496 | dkulp | 2012-03-23 13:18:40 -0400 (Fri, 23 Mar 2012) | 17 lines
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.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionQueueTest.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.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.3.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionQueueTest.java?rev=1304519&r1=1304518&r2=1304519&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionQueueTest.java (original)
+++ cxf/branches/2.3.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionQueueTest.java Fri Mar 23 17:30:40 2012
@@ -120,7 +120,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);