Author: rsearls
Date: 2014-07-15 10:04:56 -0400 (Tue, 15 Jul 2014)
New Revision: 18801
Added:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/catalog/META-INF/wsdl/HelloService.wsdl
Removed:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/catalog/META-INF/wsdl/Hello.wsdl
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/catalog/HelloWsImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/catalog/OasisCatalogHelloWSTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/catalog/META-INF/jax-ws-catalog.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/catalog/META-INF/wsdl/Hello_schema1.xsd
Log:
[JBWS-3788] added test for server side (cxf) catalog processing
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/catalog/HelloWsImpl.java
===================================================================
---
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/catalog/HelloWsImpl.java 2014-07-14
12:30:24 UTC (rev 18800)
+++
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/catalog/HelloWsImpl.java 2014-07-15
14:04:56 UTC (rev 18801)
@@ -27,7 +27,7 @@
import javax.jws.WebService;
-@WebService(wsdlLocation = "META-INF/wsdl/Hello.wsdl",
+@WebService(wsdlLocation = "META-INF/wsdl/HelloService.wsdl",
name = org.jboss.test.ws.jaxws.cxf.catalog.HelloWs.NAME,
serviceName = org.jboss.test.ws.jaxws.cxf.catalog.HelloWs.NAME,
targetNamespace = org.jboss.test.ws.jaxws.cxf.catalog.HelloWs.TARGET_NAMESPACE,
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/catalog/OasisCatalogHelloWSTestCase.java
===================================================================
---
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/catalog/OasisCatalogHelloWSTestCase.java 2014-07-14
12:30:24 UTC (rev 18800)
+++
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/catalog/OasisCatalogHelloWSTestCase.java 2014-07-15
14:04:56 UTC (rev 18801)
@@ -38,12 +38,22 @@
.addClass(org.jboss.test.ws.jaxws.cxf.catalog.HelloResponse.class)
.addClass(org.jboss.test.ws.jaxws.cxf.catalog.HelloWsImpl.class)
.addClass(org.jboss.test.ws.jaxws.cxf.catalog.HelloWs.class)
+ .add(new FileAsset(new File(JBossWSTestHelper.getTestResourcesDir() +
+ "/jaxws/cxf/catalog/META-INF/jax-ws-catalog.xml")),
+ "META-INF/jax-ws-catalog.xml")
+
+ // stnd file locations required for successful deployment
.addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir()
- + "/jaxws/cxf/catalog/META-INF/wsdl/Hello.wsdl"),
"wsdl/Hello.wsdl")
+ + "/jaxws/cxf/catalog/META-INF/wsdl/HelloService.wsdl"),
"wsdl/HelloService.wsdl")
.addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir()
+ "/jaxws/cxf/catalog/META-INF/wsdl/Hello_schema1.xsd"),
"wsdl/Hello_schema1.xsd")
- .add(new FileAsset(new File(JBossWSTestHelper.getTestResourcesDir() +
"/jaxws/cxf/catalog/META-INF/jax-ws-catalog.xml")),
- "META-INF/jax-ws-catalog.xml")
+
+ // sever side catalog maps to these files.
+ .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir()
+ + "/jaxws/cxf/catalog/META-INF/wsdl/HelloService.wsdl"),
"wsdl/foo/HelloService.wsdl")
+ .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir()
+ + "/jaxws/cxf/catalog/META-INF/wsdl/Hello_schema1.xsd"),
"wsdl/foo/Hello_schema1.xsd")
+
;
}
});
@@ -114,4 +124,25 @@
}
}
+
+ public void testCatalogOnServerSide() throws Exception
+ {
+ Bus bus = BusFactory.newInstance().createBus();
+ try {
+ BusFactory.setThreadDefaultBus(bus);
+
+ QName serviceName = new QName(
+ org.jboss.test.ws.jaxws.cxf.catalog.HelloWs.TARGET_NAMESPACE,
+ org.jboss.test.ws.jaxws.cxf.catalog.HelloWs.NAME);
+ URL wsdlURL = new URL(endpointAddress + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ HelloWs proxy = service.getPort(HelloWs.class);
+ HelloRequest helloReq = new HelloRequest();
+ helloReq.setInput("Anyone home?");
+ proxy.doHello(helloReq);
+
+ } finally {
+ bus.shutdown(true);
+ }
+ }
}
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/catalog/META-INF/jax-ws-catalog.xml
===================================================================
---
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/catalog/META-INF/jax-ws-catalog.xml 2014-07-14
12:30:24 UTC (rev 18800)
+++
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/catalog/META-INF/jax-ws-catalog.xml 2014-07-15
14:04:56 UTC (rev 18801)
@@ -1,6 +1,11 @@
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"
prefer="system">
+ <!-- client side test -->
<rewriteSystem
systemIdStartString="http://org.jboss.ws/cxf/catalogclient"
rewritePrefix="http://org.foo.bar/client"/>
+ <!-- server side deployed app test -->
+ <systemSuffix systemIdSuffix="Hello_schema1.xsd"
uri="wsdl/foo/Hello_schema1.xsd"/>
+ <rewriteSystem systemIdStartString="META-INF/wsdl"
rewritePrefix="wsdl/foo"/>
+
</catalog>
\ No newline at end of file
Deleted:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/catalog/META-INF/wsdl/Hello.wsdl
===================================================================
(Binary files differ)
Copied:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/catalog/META-INF/wsdl/HelloService.wsdl
(from rev 18799,
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/catalog/META-INF/wsdl/Hello.wsdl)
===================================================================
(Binary files differ)
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/catalog/META-INF/wsdl/Hello_schema1.xsd
===================================================================
(Binary files differ)
Show replies by date