Author: asoldano
Date: 2014-12-23 06:24:45 -0500 (Tue, 23 Dec 2014)
New Revision: 19221
Added:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsImpl/WEB-INF/webservices.xml
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/JBWS3792WSImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/JBWS3792WsImplTestCase.java
Log:
[JBWS-3861] Revisiting JBWS-3792 testcase and externalizing the wsdlLocation setup to a
webservices.xml descriptor, which allows build-time expansion of jboss.bind.address
property
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/JBWS3792WSImpl.java
===================================================================
---
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/JBWS3792WSImpl.java 2014-12-23
11:12:16 UTC (rev 19220)
+++
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/JBWS3792WSImpl.java 2014-12-23
11:24:45 UTC (rev 19221)
@@ -27,7 +27,7 @@
serviceName = "JBWS3792WSService",
portName = "JBWS3792WSPort",
targetNamespace = "http://test.jbws3792/",
- wsdlLocation =
"http://localhost:8080/jbws3792-external-wsdl/jbws3792.wsdl",
+ wsdlLocation = "http://bar:8080/jbws3792-external-wsdl/jbws3792.wsdl",
//this is overridden in webservices.xml, to allow using a property that's resolved at
build time
endpointInterface =
"org.jboss.test.ws.jaxws.cxf.jbws3792.wsImpl.JBWS3792WS")
public class JBWS3792WSImpl implements JBWS3792WS {
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/JBWS3792WsImplTestCase.java
===================================================================
---
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/JBWS3792WsImplTestCase.java 2014-12-23
11:12:16 UTC (rev 19220)
+++
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3792/wsImpl/JBWS3792WsImplTestCase.java 2014-12-23
11:24:45 UTC (rev 19221)
@@ -70,6 +70,7 @@
.addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsImpl.JBWS3792WS.class)
.addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsImpl.JBWS3792WSImpl.class)
.addClass(org.jboss.test.ws.jaxws.cxf.jbws3792.wsImpl.JBWS3792WSService.class)
+ .addAsWebInfResource(new FileAsset(new
File(JBossWSTestHelper.getTestResourcesDir() +
"/jaxws/cxf/jbws3792/wsImpl/WEB-INF/webservices.xml")),
"webservices.xml")
.setWebXML(new File(JBossWSTestHelper.getTestResourcesDir()
+ "/jaxws/cxf/jbws3792/wsImpl/WEB-INF/web.xml"))
;
Added:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsImpl/WEB-INF/webservices.xml
===================================================================
---
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsImpl/WEB-INF/webservices.xml
(rev 0)
+++
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsImpl/WEB-INF/webservices.xml 2014-12-23
11:24:45 UTC (rev 19221)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<webservices
xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:wsdl="http://Hello.org"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/javaee_web_services_1_2.xsd"
version="1.2">
+ <webservice-description>
+
<webservice-description-name>JBWS3792WSService</webservice-description-name>
+
<wsdl-file>http://@jboss.bind.address@:8080/jbws3792-external-wsdl/jbws3792.wsdl</wsdl-file>
+ <port-component>
+ <service-impl-bean>
+
<servlet-link>org.jboss.test.ws.jaxws.cxf.jbws3792.wsImpl.JBWS3792WSImpl</servlet-link>
+ </service-impl-bean>
+ </port-component>
+ </webservice-description>
+</webservices>
\ No newline at end of file
Property changes on:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsImpl/WEB-INF/webservices.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native