Author: ay Date: Wed Jan 30 22:25:12 2013 New Revision: 1440714 URL: http://svn.apache.org/viewvc?rev=1440714&view=rev Log: Merged revisions 1440712 via svn merge from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1440712 | ay | 2013-01-30 23:22:17 +0100 (Wed, 30 Jan 2013) | 17 lines Merged revisions 1440710 via svn merge from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes ........ r1440710 | ay | 2013-01-30 23:16:28 +0100 (Wed, 30 Jan 2013) | 9 lines Merged revisions 1440708 via svn merge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1440708 | ay | 2013-01-30 23:14:45 +0100 (Wed, 30 Jan 2013) | 1 line a minor fix for CXF-4794 test in cleaning up the second EP ........ ........ ........ Modified: cxf/branches/2.5.x-fixes/ (props changed) cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Server.java Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Server.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Server.java?rev=1440714&r1=1440713&r2=1440714&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Server.java (original) +++ cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Server.java Wed Jan 30 22:25:12 2013 @@ -26,17 +26,23 @@ import org.apache.cxf.testutil.common.Ab public class Server extends AbstractBusTestServerBase { public static final String PORT = allocatePort(Server.class); - + Endpoint ep; + Endpoint ep11; + protected void run() { Object implementor = new GreeterImpl(); String address = "http://localhost:"; + PORT + "/SoapContext/SoapPort"; - Endpoint.publish(address, implementor); + ep = Endpoint.publish(address, implementor); implementor = new org.apache.hello_world_soap_http.GreeterImpl(); address = "http://localhost:"; + PORT + "/SoapContext/Soap11Port"; - ep = Endpoint.publish(address, implementor); + ep11 = Endpoint.publish(address, implementor); } + public void tearDown() throws Exception { + ep.stop(); + ep11.stop(); + } public static void main(String[] args) { try {
