Author: dkulp
Date: Fri Jun 11 17:54:08 2010
New Revision: 953793
URL: http://svn.apache.org/viewvc?rev=953793&view=rev
Log:
Merged revisions 951145 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r951145 | dkulp | 2010-06-03 16:33:41 -0400 (Thu, 03 Jun 2010) | 1 line
Update the databinding system tests to use dynamic ports
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsTest.java
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisServer.java
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/CharacterSchemaTest.java
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/MtomTest.java
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/TestServiceTest.java
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/ClientServerXmlBeansTest.java
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/Server.java
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/ServerNoWsdl.java
cxf/branches/2.2.x-fixes/systests/databinding/src/test/resources/aegisJaxWsBeans.xml
cxf/branches/2.2.x-fixes/systests/databinding/src/test/resources/aegisSportsServiceBeans.xml
cxf/branches/2.2.x-fixes/systests/databinding/src/test/resources/extrajaxbclass.xml
cxf/branches/2.2.x-fixes/systests/databinding/src/test/resources/mtomTestBeans.xml
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java?rev=953793&r1=953792&r2=953793&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java
(original)
+++
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java
Fri Jun 11 17:54:08 2010
@@ -43,6 +43,7 @@ import org.junit.BeforeClass;
import org.junit.Test;
public class AegisClientServerTest extends AbstractBusClientServerTestBase {
+ static final String PORT = allocatePort(AegisServer.class);
static final Logger LOG = LogUtils.getLogger(AegisClientServerTest.class);
@BeforeClass
@@ -56,7 +57,7 @@ public class AegisClientServerTest exten
ClientProxyFactoryBean proxyFactory = new ClientProxyFactoryBean();
proxyFactory.setDataBinding(aegisBinding);
proxyFactory.setServiceClass(AuthService.class);
- proxyFactory.setAddress("http://localhost:9002/service";);
+ proxyFactory.setAddress("http://localhost:"; + PORT + "/service");
AuthService service = (AuthService) proxyFactory.create();
assertTrue(service.authenticate("Joe", "Joe", "123"));
assertFalse(service.authenticate("Joe1", "Joe", "fang"));
@@ -86,7 +87,7 @@ public class AegisClientServerTest exten
JaxWsProxyFactoryBean proxyFactory = new JaxWsProxyFactoryBean();
proxyFactory.setDataBinding(aegisBinding);
proxyFactory.setServiceClass(AuthService.class);
- proxyFactory.setAddress("http://localhost:9002/jaxwsAndAegis";);
+ proxyFactory.setAddress("http://localhost:"; + PORT + "/jaxwsAndAegis");
AuthService service = (AuthService) proxyFactory.create();
assertTrue(service.authenticate("Joe", "Joe", "123"));
assertFalse(service.authenticate("Joe1", "Joe", "fang"));
@@ -118,7 +119,7 @@ public class AegisClientServerTest exten
@Test
public void testWSDL() throws Exception {
- URL url = new URL("http://localhost:9002/jaxwsAndAegis?wsdl";);
+ URL url = new URL("http://localhost:"; + PORT + "/jaxwsAndAegis?wsdl");
Document dom = XMLUtils.parse(url.openStream());
TestUtilities util = new TestUtilities(this.getClass());
util.addDefaultNamespaces();
@@ -131,7 +132,7 @@ public class AegisClientServerTest exten
+ "xsd:sequence/xsd:eleme...@nillable='true']",
dom);
- url = new URL("http://localhost:9002/serviceWithCustomNS?wsdl";);
+ url = new URL("http://localhost:"; + PORT +
"/serviceWithCustomNS?wsdl");
dom = XMLUtils.parse(url.openStream());
util.assertValid("//wsdl:definitio...@targetnamespace='http://foo.bar.com']",
dom);
@@ -143,7 +144,7 @@ public class AegisClientServerTest exten
JaxWsProxyFactoryBean proxyFactory = new JaxWsProxyFactoryBean();
proxyFactory.setDataBinding(aegisBinding);
proxyFactory.setServiceClass(SportsService.class);
-
proxyFactory.setWsdlLocation("http://localhost:9002/jaxwsAndAegisSports?wsdl";);
+ proxyFactory.setWsdlLocation("http://localhost:"; + PORT +
"/jaxwsAndAegisSports?wsdl");
SportsService service = (SportsService) proxyFactory.create();
Collection<Team> teams = service.getTeams();
@@ -158,7 +159,7 @@ public class AegisClientServerTest exten
@Test
public void testDynamicClient() throws Exception {
DynamicClientFactory dcf = DynamicClientFactory.newInstance();
- Client client =
dcf.createClient("http://localhost:9002/jaxwsAndAegisSports?wsdl";);
+ Client client = dcf.createClient("http://localhost:"; + PORT +
"/jaxwsAndAegisSports?wsdl");
Object r = client.invoke("getAttributeBean")[0];
Method getAddrPlainString =
r.getClass().getMethod("getAttrPlainString");
Modified:
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsTest.java?rev=953793&r1=953792&r2=953793&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsTest.java
(original)
+++
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsTest.java
Fri Jun 11 17:54:08 2010
@@ -31,6 +31,7 @@ import org.apache.cxf.aegis.databinding.
import org.apache.cxf.helpers.FileUtils;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.systest.aegis.bean.Item;
+import org.apache.cxf.testutil.common.TestUtil;
import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
import org.junit.Assert;
@@ -44,7 +45,8 @@ import org.springframework.test.context.
*/
@ContextConfiguration(locations = { "classpath:aegisJaxWsBeans.xml" })
public class AegisJaxWsTest extends AbstractJUnit4SpringContextTests {
-
+ static final String PORT = TestUtil.getPortNumber(AegisJaxWsTest.class);
+
private AegisJaxWs client;
public AegisJaxWsTest() {
@@ -55,7 +57,7 @@ public class AegisJaxWsTest extends Abst
JaxWsProxyFactoryBean factory = new JaxWsProxyFactoryBean();
factory.setServiceClass(AegisJaxWs.class);
if (sec) {
- factory.setAddress("http://localhost:9167/aegisJaxWsUN";);
+ factory.setAddress("http://localhost:"; + PORT + "/aegisJaxWsUN");
WSS4JOutInterceptor wss4jOut = new WSS4JOutInterceptor();
wss4jOut.setProperty("action", "UsernameToken");
wss4jOut.setProperty("user", "alice");
@@ -65,7 +67,7 @@ public class AegisJaxWsTest extends Abst
factory.getProperties().put("password", "pass");
factory.getOutInterceptors().add(wss4jOut);
} else {
- factory.setAddress("http://localhost:9167/aegisJaxWs";);
+ factory.setAddress("http://localhost:"; + PORT + "/aegisJaxWs");
}
factory.getServiceFactory().setDataBinding(new AegisDatabinding());
Modified:
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisServer.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisServer.java?rev=953793&r1=953792&r2=953793&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisServer.java
(original)
+++
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisServer.java
Fri Jun 11 17:54:08 2010
@@ -31,6 +31,7 @@ import org.mortbay.jetty.webapp.WebAppCo
public class AegisServer extends AbstractBusTestServerBase {
+ static final String PORT = allocatePort(AegisServer.class);
private org.mortbay.jetty.Server server;
@@ -40,7 +41,7 @@ public class AegisServer extends Abstrac
server = new org.mortbay.jetty.Server();
SelectChannelConnector connector = new SelectChannelConnector();
- connector.setPort(9002);
+ connector.setPort(Integer.parseInt(PORT));
server.setConnectors(new Connector[] {connector});
WebAppContext webappcontext = new WebAppContext();
Modified:
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/CharacterSchemaTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/CharacterSchemaTest.java?rev=953793&r1=953792&r2=953793&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/CharacterSchemaTest.java
(original)
+++
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/CharacterSchemaTest.java
Fri Jun 11 17:54:08 2010
@@ -30,6 +30,7 @@ import org.apache.cxf.Bus;
import org.apache.cxf.aegis.type.basic.CharacterAsStringType;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.test.TestUtilities;
+import org.apache.cxf.testutil.common.TestUtil;
import org.junit.Assert;
import org.junit.Test;
@@ -43,7 +44,8 @@ import org.springframework.test.context.
*/
@ContextConfiguration(locations = { "classpath:aegisSportsServiceBeans.xml" })
public class CharacterSchemaTest extends AbstractJUnit4SpringContextTests {
-
+ static final String PORT =
TestUtil.getPortNumber(CharacterSchemaTest.class);
+
private TestUtilities testUtilities;
public CharacterSchemaTest() {
Modified:
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/MtomTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/MtomTest.java?rev=953793&r1=953792&r2=953793&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/MtomTest.java
(original)
+++
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/MtomTest.java
Fri Jun 11 17:54:08 2010
@@ -39,6 +39,7 @@ import org.apache.cxf.frontend.ClientPro
import org.apache.cxf.systest.aegis.mtom.fortest.DataHandlerBean;
import org.apache.cxf.systest.aegis.mtom.fortest.MtomTestImpl;
import org.apache.cxf.test.TestUtilities;
+import org.apache.cxf.testutil.common.TestUtil;
import org.junit.Assert;
import org.junit.Test;
@@ -51,7 +52,8 @@ import org.springframework.test.context.
*/
@ContextConfiguration(locations = { "classpath:mtomTestBeans.xml" })
public class MtomTest extends AbstractJUnit4SpringContextTests {
-
+ static final String PORT = TestUtil.getPortNumber(MtomTest.class);
+
private org.apache.cxf.systest.aegis.mtom.fortest.MtomTestImpl impl;
private org.apache.cxf.systest.aegis.mtom.fortest.MtomTest client;
private TestUtilities testUtilities;
@@ -65,7 +67,7 @@ public class MtomTest extends AbstractJU
aegisBinding.setMtomEnabled(enableClientMTOM);
ClientProxyFactoryBean proxyFac = new ClientProxyFactoryBean();
proxyFac.setDataBinding(aegisBinding);
- proxyFac.setAddress("http://localhost:9002/mtom";);
+ proxyFac.setAddress("http://localhost:"; + PORT + "/mtom");
proxyFac.setServiceClass(org.apache.cxf.systest.aegis.mtom.fortest.MtomTest.class);
Map<String, Object> props = new HashMap<String, Object>();
if (enableClientMTOM) {
@@ -144,7 +146,7 @@ public class MtomTest extends AbstractJU
String url = testUtilities.resolveNamespacePrefix(pieces[0],
elementNode);
Assert.assertEquals(SOAPConstants.XSD, url);
- s =
testUtilities.getServerForAddress("http://localhost:9002/mtomXmime";);
+ s = testUtilities.getServerForAddress("http://localhost:"; + PORT +
"/mtomXmime");
wsdl = testUtilities.getWSDLDocument(s);
Assert.assertNotNull(wsdl);
typeAttrList =
Modified:
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/TestServiceTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/TestServiceTest.java?rev=953793&r1=953792&r2=953793&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/TestServiceTest.java
(original)
+++
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/TestServiceTest.java
Fri Jun 11 17:54:08 2010
@@ -33,6 +33,7 @@ import org.apache.cxf.systest.jaxb.model
import org.apache.cxf.systest.jaxb.model.Widget;
import org.apache.cxf.systest.jaxb.service.TestService;
import org.apache.cxf.test.TestUtilities;
+import org.apache.cxf.testutil.common.TestUtil;
import org.junit.Assert;
import org.junit.Test;
@@ -42,6 +43,7 @@ import org.springframework.test.context.
@ContextConfiguration(locations = { "classpath:extrajaxbclass.xml" })
public class TestServiceTest extends AbstractJUnit4SpringContextTests {
+ static final String PORT = TestUtil.getPortNumber(TestServiceTest.class);
private TestUtilities testUtilities;
@@ -65,7 +67,7 @@ public class TestServiceTest extends Abs
TestService testClient = getTestClient();
((BindingProvider)testClient).getRequestContext()
.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
- "http://localhost:7081/service/TestEndpoint";);
+ "http://localhost:"; + PORT + "/service/TestEndpoint");
Widget widgetFromService = testClient.getWidgetById((long)42);
Assert.assertEquals(expected, widgetFromService);
@@ -74,7 +76,7 @@ public class TestServiceTest extends Abs
@Test
public void testSchema() throws Exception {
- URL url = new URL("http://localhost:7081/service/TestService?wsdl";);
+ URL url = new URL("http://localhost:"; + PORT +
"/service/TestService?wsdl");
String s = IOUtils.toString(url.openStream());
Assert.assertTrue(s, s.contains("application/octet-stream"));
}
Modified:
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/ClientServerXmlBeansTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/ClientServerXmlBeansTest.java?rev=953793&r1=953792&r2=953793&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/ClientServerXmlBeansTest.java
(original)
+++
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/ClientServerXmlBeansTest.java
Fri Jun 11 17:54:08 2010
@@ -33,6 +33,7 @@ import org.apache.cxf.frontend.ClientPro
import org.apache.cxf.interceptor.LoggingInInterceptor;
import org.apache.cxf.interceptor.LoggingOutInterceptor;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import org.apache.cxf.testutil.common.TestUtil;
import org.apache.helloWorldSoapHttp.xmlbeans.types.FaultDetailDocument;
import
org.apache.helloWorldSoapHttp.xmlbeans.types.FaultDetailDocument.FaultDetail;
import org.apache.hello_world_soap_http.xmlbeans.GreetMeFault;
@@ -45,9 +46,10 @@ import org.junit.Test;
/**
*
*/
-//@org.junit.Ignore("randomly fails on Hudson, but dkulp cannot reproduce yet")
public class ClientServerXmlBeansTest extends AbstractBusClientServerTestBase {
-
+ static final String WSDL_PORT = TestUtil.getPortNumber(Server.class);
+ static final String NOWSDL_PORT =
TestUtil.getPortNumber(ServerNoWsdl.class);
+
private static final QName SERVICE_NAME
= new QName("http://apache.org/hello_world_soap_http/xmlbeans";,
"SOAPService");
@@ -68,6 +70,7 @@ public class ClientServerXmlBeansTest ex
SOAPService ss = new SOAPService(wsdl, SERVICE_NAME);
Greeter port = ss.getSoapPort();
+ updateAddressPort(port, WSDL_PORT);
String resp;
ClientProxy.getClient(port).getInInterceptors().add(new
LoggingInInterceptor());
ClientProxy.getClient(port).getOutInterceptors().add(new
LoggingOutInterceptor());
@@ -115,7 +118,8 @@ public class ClientServerXmlBeansTest ex
SOAPService ss = new SOAPService(wsdl, SERVICE_NAME);
QName soapPort = new
QName("http://apache.org/hello_world_soap_http/xmlbeans";, "SoapPort");
- ss.addPort(soapPort, SOAPBinding.SOAP11HTTP_BINDING,
"http://localhost:9010/SoapContext/SoapPort";);
+ ss.addPort(soapPort, SOAPBinding.SOAP11HTTP_BINDING,
"http://localhost:";
+ + NOWSDL_PORT + "/SoapContext/SoapPort");
Greeter port = ss.getPort(soapPort, Greeter.class);
String resp;
ClientProxy.getClient(port).getInInterceptors().add(new
LoggingInInterceptor());
Modified:
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/Server.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/Server.java?rev=953793&r1=953792&r2=953793&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/Server.java
(original)
+++
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/Server.java
Fri Jun 11 17:54:08 2010
@@ -26,8 +26,10 @@ import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.testutil.common.TestUtil;
public class Server extends AbstractBusTestServerBase {
+ static final String PORT = TestUtil.getPortNumber(Server.class);
protected void run() {
// set the configuration file
@@ -35,10 +37,10 @@ public class Server extends AbstractBusT
Bus bus = factory.createBus("org/apache/cxf/systest/xmlbeans/cxf.xml");
BusFactory.setDefaultBus(bus);
setBus(bus);
- Endpoint.publish("http://localhost:9000/SoapContext/SoapPort";,
+ Endpoint.publish("http://localhost:"; + PORT + "/SoapContext/SoapPort",
new GreeterImpl());
-
Endpoint.publish("http://localhost:9000/SOAPDocLitBareService/SoapPort";,
+ Endpoint.publish("http://localhost:"; + PORT +
"/SOAPDocLitBareService/SoapPort",
new PutLastTradePriceImpl());
}
Modified:
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/ServerNoWsdl.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/ServerNoWsdl.java?rev=953793&r1=953792&r2=953793&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/ServerNoWsdl.java
(original)
+++
cxf/branches/2.2.x-fixes/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/ServerNoWsdl.java
Fri Jun 11 17:54:08 2010
@@ -26,8 +26,10 @@ import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.testutil.common.TestUtil;
public class ServerNoWsdl extends AbstractBusTestServerBase {
+ static final String PORT = TestUtil.getPortNumber(ServerNoWsdl.class);
protected void run() {
// set the configuration file
@@ -36,11 +38,11 @@ public class ServerNoWsdl extends Abstra
BusFactory.setDefaultBus(bus);
setBus(bus);
Object implementor = new GreeterImpl();
- String address = "http://localhost:9010/SoapContext/SoapPort";;
+ String address = "http://localhost:"; + PORT + "/SoapContext/SoapPort";
Endpoint.publish(address, implementor);
implementor = new PutLastTradePriceImpl();
-
Endpoint.publish("http://localhost:9010/SOAPDocLitBareService/SoapPort";,
implementor);
+ Endpoint.publish("http://localhost:"; + PORT +
"/SOAPDocLitBareService/SoapPort", implementor);
}
public static void main(String args[]) {
Modified:
cxf/branches/2.2.x-fixes/systests/databinding/src/test/resources/aegisJaxWsBeans.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/databinding/src/test/resources/aegisJaxWsBeans.xml?rev=953793&r1=953792&r2=953793&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/systests/databinding/src/test/resources/aegisJaxWsBeans.xml
(original)
+++
cxf/branches/2.2.x-fixes/systests/databinding/src/test/resources/aegisJaxWsBeans.xml
Fri Jun 11 17:54:08 2010
@@ -37,7 +37,9 @@ http://cxf.apache.org/core http://cxf.ap
<import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
<import
resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml"
/>
-
+
+ <bean
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
<bean id="aegisBean"
class="org.apache.cxf.aegis.databinding.AegisDatabinding"
scope="prototype" />
@@ -51,7 +53,7 @@ http://cxf.apache.org/core http://cxf.ap
<bean id="impl" class="org.apache.cxf.systest.aegis.AegisJaxWsImpl" />
<jaxws:endpoint id="aegisRPCImpl" implementor="#impl"
- address="http://localhost:9167/aegisJaxWs";>
+
address="http://localhost:${testutil.ports.AegisJaxWsTest}/aegisJaxWs";>
<jaxws:serviceFactory>
<ref bean='jaxws-and-aegis-service-factory' />
</jaxws:serviceFactory>
@@ -66,7 +68,7 @@ http://cxf.apache.org/core http://cxf.ap
class="org.apache.cxf.systest.aegis.ServerPasswordCallback"/>
<jaxws:endpoint id="aegisRPCImplUN" implementor="#impl"
- address="http://localhost:9167/aegisJaxWsUN";>
+
address="http://localhost:${testutil.ports.AegisJaxWsTest}/aegisJaxWsUN";>
<jaxws:serviceFactory>
<ref bean='jaxws-and-aegis-service-factory' />
</jaxws:serviceFactory>
Modified:
cxf/branches/2.2.x-fixes/systests/databinding/src/test/resources/aegisSportsServiceBeans.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/databinding/src/test/resources/aegisSportsServiceBeans.xml?rev=953793&r1=953792&r2=953793&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/systests/databinding/src/test/resources/aegisSportsServiceBeans.xml
(original)
+++
cxf/branches/2.2.x-fixes/systests/databinding/src/test/resources/aegisSportsServiceBeans.xml
Fri Jun 11 17:54:08 2010
@@ -37,10 +37,12 @@ http://cxf.apache.org/core http://cxf.ap
<import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
<import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml"
/>
+ <bean
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
<bean id="sportsImpl"
class="org.apache.cxf.systest.aegis.SportsServiceImpl" />
- <simple:server id="sports-server" address="http://localhost:9002/sports";
+ <simple:server id="sports-server"
address="http://localhost:${testutil.ports.CharacterSchemaTest}/sports";
serviceClass="org.apache.cxf.systest.aegis.SportsService">
<simple:dataBinding>
<bean
Modified:
cxf/branches/2.2.x-fixes/systests/databinding/src/test/resources/extrajaxbclass.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/databinding/src/test/resources/extrajaxbclass.xml?rev=953793&r1=953792&r2=953793&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/systests/databinding/src/test/resources/extrajaxbclass.xml
(original)
+++
cxf/branches/2.2.x-fixes/systests/databinding/src/test/resources/extrajaxbclass.xml
Fri Jun 11 17:54:08 2010
@@ -33,9 +33,11 @@ under the License.
<import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
<import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml"
/>
+ <bean
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<!-- Services -->
- <jaxws:server id="testServer"
serviceClass="org.apache.cxf.systest.jaxb.service.TestService"
address="http://localhost:7081/service/TestService";>
+ <jaxws:server id="testServer"
serviceClass="org.apache.cxf.systest.jaxb.service.TestService"
+
address="http://localhost:${testutil.ports.TestServiceTest}/service/TestService";>
<jaxws:properties>
<entry key="jaxb.additionalContextClasses">
@@ -58,7 +60,7 @@ under the License.
<!-- Endpoint -->
<jaxws:endpoint id="testEndpoint"
implementor="org.apache.cxf.systest.jaxb.service.TestServiceImpl"
- address="http://localhost:7081/service/TestEndpoint";>
+
address="http://localhost:${testutil.ports.TestServiceTest}/service/TestEndpoint";>
<jaxws:properties>
<entry key="jaxb.additionalContextClasses">
@@ -75,7 +77,7 @@ under the License.
<!-- Client Proxy -->
- <jaxws:client id="testClient"
address="http://localhost:7081/service/TestService";
serviceClass="org.apache.cxf.systest.jaxb.service.TestService">
+ <jaxws:client id="testClient"
address="http://localhost:${testutil.ports.TestServiceTest}/service/TestService";
serviceClass="org.apache.cxf.systest.jaxb.service.TestService">
<jaxws:inInterceptors>
<bean
class="org.apache.cxf.interceptor.LoggingInInterceptor" />
</jaxws:inInterceptors>
Modified:
cxf/branches/2.2.x-fixes/systests/databinding/src/test/resources/mtomTestBeans.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/databinding/src/test/resources/mtomTestBeans.xml?rev=953793&r1=953792&r2=953793&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/systests/databinding/src/test/resources/mtomTestBeans.xml
(original)
+++
cxf/branches/2.2.x-fixes/systests/databinding/src/test/resources/mtomTestBeans.xml
Fri Jun 11 17:54:08 2010
@@ -36,6 +36,8 @@ http://cxf.apache.org/core http://cxf.ap
<import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
<import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
<import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml"
/>
+
+ <bean
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<cxf:bus>
<cxf:features>
@@ -46,7 +48,7 @@ http://cxf.apache.org/core http://cxf.ap
<bean id="mtomImpl"
class="org.apache.cxf.systest.aegis.mtom.fortest.MtomTestImpl"
/>
- <simple:server id="mtom-server" address="http://localhost:9002/mtom";
+ <simple:server id="mtom-server"
address="http://localhost:${testutil.ports.MtomTest}/mtom";
serviceClass="org.apache.cxf.systest.aegis.mtom.fortest.MtomTest">
<simple:dataBinding>
<bean
@@ -69,7 +71,7 @@ http://cxf.apache.org/core http://cxf.ap
</simple:serviceFactory>
</simple:server>
- <simple:server id="mtom-xmime-server"
address="http://localhost:9002/mtomXmime";
+ <simple:server id="mtom-xmime-server"
address="http://localhost:${testutil.ports.MtomTest}/mtomXmime";
serviceClass="org.apache.cxf.systest.aegis.mtom.fortest.MtomTest">
<simple:dataBinding>
<bean
