Author: dkulp Date: Tue Feb 7 21:46:20 2012 New Revision: 1241646 URL: http://svn.apache.org/viewvc?rev=1241646&view=rev Log: Merged revisions 1241641 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
................ r1241641 | dkulp | 2012-02-07 16:33:39 -0500 (Tue, 07 Feb 2012) | 10 lines Merged revisions 1241638 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1241638 | dkulp | 2012-02-07 16:31:56 -0500 (Tue, 07 Feb 2012) | 2 lines Fix an issue where a test wasn't actually using a dynamic port like it should. ........ ................ Modified: cxf/branches/2.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationUsingAddNumbersTest.java cxf/branches/2.4.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerServer.java Propchange: cxf/branches/2.4.x-fixes/ ('svn:mergeinfo' removed) Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationUsingAddNumbersTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationUsingAddNumbersTest.java?rev=1241646&r1=1241645&r2=1241646&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationUsingAddNumbersTest.java (original) +++ cxf/branches/2.4.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationUsingAddNumbersTest.java Tue Feb 7 21:46:20 2012 @@ -39,7 +39,6 @@ import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.resource.ResourceManager; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; -import org.apache.cxf.testutil.common.TestUtil; import org.apache.handlers.AddNumbers; import org.apache.handlers.AddNumbersService; import org.apache.handlers.types.AddNumbersResponse; @@ -54,7 +53,7 @@ public class HandlerInvocationUsingAddNu static QName portName = new QName("http://apache.org/handlers";, "AddNumbersPort"); static String addNumbersAddress - = "http://localhost:"; + TestUtil.getPortNumber(HandlerServer.class, 1) + = "http://localhost:"; + HandlerServer.PORT1 + "/handlers/AddNumbersService/AddNumbersPort"; @BeforeClass Modified: cxf/branches/2.4.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerServer.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerServer.java?rev=1241646&r1=1241645&r2=1241646&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerServer.java (original) +++ cxf/branches/2.4.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerServer.java Tue Feb 7 21:46:20 2012 @@ -24,10 +24,13 @@ import org.apache.cxf.testutil.common.Ab import org.apache.cxf.testutil.common.TestUtil; public class HandlerServer extends AbstractBusTestServerBase { - + public static final String PORT1 = TestUtil.getPortNumber(HandlerServer.class, 1); + public static final String PORT2 = TestUtil.getPortNumber(HandlerServer.class, 2); + + protected void run() { - String addNumbersPort = TestUtil.getPortNumber(HandlerServer.class, 1); - String greeterPort = TestUtil.getPortNumber(HandlerServer.class, 2); + String addNumbersPort = PORT1; + String greeterPort = PORT2; Object implementor = new AddNumbersImpl(); String address = "http://localhost:";
