Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2ED1790F0 for ; Fri, 23 Mar 2012 17:19:02 +0000 (UTC) Received: (qmail 11031 invoked by uid 500); 23 Mar 2012 17:19:02 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 10984 invoked by uid 500); 23 Mar 2012 17:19:02 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 10976 invoked by uid 99); 23 Mar 2012 17:19:01 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Mar 2012 17:19:01 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Mar 2012 17:19:00 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9322B2388847; Fri, 23 Mar 2012 17:18:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120323171840.9322B2388847@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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);