You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2007/04/10 20:13:27 UTC
svn commit: r527231 - in /incubator/cxf/trunk: buildtools/src/main/resources/
rt/core/src/main/java/org/apache/cxf/catalog/
rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/
rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ systests/src...
Author: dkulp
Date: Tue Apr 10 11:13:23 2007
New Revision: 527231
URL: http://svn.apache.org/viewvc?view=rev&rev=527231
Log:
Don't output wsdlLocation in interface
Change use of testutils to using a catalog so the jar is more reusable.
Modified:
incubator/cxf/trunk/buildtools/src/main/resources/notice-supplements.xml
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/catalog/CatalogWSDLLocator.java
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java
incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/EndpointImplTest.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/basicDOCBare/PutLastTradedPriceImpl.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/callback/CallbackImpl.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/callback/ServerImpl.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerTestImpl.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/TrivialSOAPHandlerAnnotatedGreeterImpl.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLTest.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/Server.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/GreeterImplDoc.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/GreeterImplQueueOneWay.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/GreeterImplTopicOneWay.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/GreeterImplTwoWayJMS.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopTest.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/soap12/GreeterImpl.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPDocLitServerImpl.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/xml/XMLServerImpl.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/GreeterImpl.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/GreeterImpl.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/HttpGreeterImpl.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/ReliableGreeterImpl.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/GreeterImpl.java
incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/anonymous_complex_type/AnonymousComplexTypeImpl.java
incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/calculator/CalculatorImpl.java
incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/greeter_control/GreeterImplBase.java
incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/jaxb_element_test/JaxbElementTestImpl.java
incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/mtom_xop/TestMtomImpl.java
incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/ordered_param_holder/OrderedParamHolderImpl.java
incubator/cxf/trunk/testutils/src/main/java/org/apache/header_test/TestHeaderImpl.java
incubator/cxf/trunk/testutils/src/main/java/org/apache/header_test/rpc/TestRPCHeaderImpl.java
incubator/cxf/trunk/testutils/src/main/java/org/apache/headers/HeaderTesterImpl.java
incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_doc_lit/GreeterImplDoc.java
incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_mixedstyle/GreeterImplMixedStyle.java
incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_soap_http/AnotherDerivedGreeterImpl.java
incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_soap_http/DerivedGreeterImpl.java
incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_soap_http/DocLitBareGreeterImpl.java
incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_soap_http/GreeterEndpointInterface.java
incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_soap_http/GreeterImpl.java
incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_soap_http/RPCLitGreeterImpl.java
incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_xml_http/bare/GreeterImpl.java
incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_xml_http/mixed/GreeterImpl.java
incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_xml_http/wrapped/GreeterFaultImpl.java
incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_xml_http/wrapped/GreeterImpl.java
incubator/cxf/trunk/testutils/src/main/java/org/apache/locator_test/LocatorServiceImpl.java
incubator/cxf/trunk/testutils/src/main/resources/META-INF/jax-ws-catalog.xml
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebServiceAnnotator.java
Modified: incubator/cxf/trunk/buildtools/src/main/resources/notice-supplements.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/buildtools/src/main/resources/notice-supplements.xml?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/buildtools/src/main/resources/notice-supplements.xml (original)
+++ incubator/cxf/trunk/buildtools/src/main/resources/notice-supplements.xml Tue Apr 10 11:13:23 2007
@@ -2,94 +2,85 @@
<supplementalDataModels>
<supplements>
<supplement>
- <![CDATA[
- <project>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <name>Sun JAXB Reference Implementation Runtime</name>
- <organization>
- <name>Sun Microsystems</name>
- <url>http://www.sun.com/</url>
- </organization>
- <licenses>
- <license>
- <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
- <url>http://www.sun.com/cddl/cddl.html</url>
- </license>
- </licenses>
- </project>
- ]]>
+ <project>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <name>Sun JAXB Reference Implementation Runtime</name>
+ <organization>
+ <name>Sun Microsystems</name>
+ <url>http://www.sun.com/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
+ <url>http://www.sun.com/cddl/cddl.html</url>
+ </license>
+ </licenses>
+ </project>
+
</supplement>
<supplement>
- <![CDATA[
- <project>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-xjc</artifactId>
- <name>Sun JAXB Reference Implementation Tools</name>
- <organization>
- <name>Sun Microsystems</name>
- <url>http://www.sun.com/</url>
- </organization>
- <licenses>
- <license>
- <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
- <url>http://www.sun.com/cddl/cddl.html</url>
- </license>
- </licenses>
- </project>
- ]]>
+ <project>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ <name>Sun JAXB Reference Implementation Tools</name>
+ <organization>
+ <name>Sun Microsystems</name>
+ <url>http://www.sun.com/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
+ <url>http://www.sun.com/cddl/cddl.html</url>
+ </license>
+ </licenses>
+ </project>
</supplement>
<supplement>
- <![CDATA[
- <project>
- <groupId>com.sun.xml.messaging.saaj</groupId>
- <artifactId>saaj-impl</artifactId>
- <name>Sun SAAJ Reference Implementation</name>
- <organization>
- <name>Sun Microsystems</name>
- <url>http://www.sun.com/</url>
- </organization>
- </project>
- ]]>
+ <project>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId>
+ <name>Sun SAAJ Reference Implementation</name>
+ <organization>
+ <name>Sun Microsystems</name>
+ <url>http://www.sun.com/</url>
+ </organization>
+ </project>
</supplement>
<supplement>
- <![CDATA[
- <project>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
- <name>Java API for XML-Based Web Services (JAX-WS API)</name>
- <organization>
- <name>Sun Microsystems</name>
- <url>http://www.sun.com/</url>
- </organization>
- <licenses>
- <license>
- <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
- <url>http://www.sun.com/cddl/cddl.html</url>
- </license>
- </licenses>
- </project>
- ]]>
+ <project>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <name>Java API for XML-Based Web Services (JAX-WS API)</name>
+ <organization>
+ <name>Sun Microsystems</name>
+ <url>http://www.sun.com/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
+ <url>http://www.sun.com/cddl/cddl.html</url>
+ </license>
+ </licenses>
+ </project>
</supplement>
<supplement>
- <![CDATA[
- <project>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <name>Java Architecture for XML Binding (JAXB API)</name>
- <organization>
- <name>Sun Microsystems</name>
- <url>http://www.sun.com/</url>
- </organization>
- <licenses>
- <license>
- <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
- <url>http://www.sun.com/cddl/cddl.html</url>
- </license>
- </licenses>
- </project>
- ]]>
+ <project>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <name>Java Architecture for XML Binding (JAXB API)</name>
+ <organization>
+ <name>Sun Microsystems</name>
+ <url>http://www.sun.com/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
+ <url>http://www.sun.com/cddl/cddl.html</url>
+ </license>
+ </licenses>
+ </project>
</supplement>
</supplements>
</supplementalDataModels>
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/catalog/CatalogWSDLLocator.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/catalog/CatalogWSDLLocator.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/catalog/CatalogWSDLLocator.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/catalog/CatalogWSDLLocator.java Tue Apr 10 11:13:23 2007
@@ -19,6 +19,8 @@
package org.apache.cxf.catalog;
import java.io.IOException;
+import java.net.MalformedURLException;
+
import javax.wsdl.xml.WSDLLocator;
import org.xml.sax.InputSource;
@@ -45,6 +47,18 @@
public InputSource getBaseInputSource() {
InputSource result = resolver.resolve(baseUri, null);
+ if (result == null) {
+ try {
+ String s = catalogResolver.resolveSystem(baseUri);
+ if (s != null) {
+ result = resolver.resolve(s, null);
+ }
+ } catch (MalformedURLException e) {
+ //ignore
+ } catch (IOException e) {
+ //ignore
+ }
+ }
baseUri = resolver.getURI();
return result;
}
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java Tue Apr 10 11:13:23 2007
@@ -73,11 +73,17 @@
}
public String getWsdlLocation() {
- if (null != seiAnnotation) {
+ if (null != seiAnnotation
+ && seiAnnotation.wsdlLocation() != null
+ && !"".equals(seiAnnotation.wsdlLocation())) {
return seiAnnotation.wsdlLocation();
- } else if (null != implementorAnnotation) {
+ } else if (null != implementorAnnotation
+ && implementorAnnotation.wsdlLocation() != null
+ && !"".equals(implementorAnnotation.wsdlLocation())) {
return implementorAnnotation.wsdlLocation();
- } else if (null != wsProviderAnnotation) {
+ } else if (null != wsProviderAnnotation
+ && wsProviderAnnotation.wsdlLocation() != null
+ && !"".equals(wsProviderAnnotation.wsdlLocation())) {
return wsProviderAnnotation.wsdlLocation();
}
return null;
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/EndpointImplTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/EndpointImplTest.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/EndpointImplTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/EndpointImplTest.java Tue Apr 10 11:13:23 2007
@@ -77,7 +77,8 @@
serviceFactory.setInvoker(new BeanInvoker(greeter));
serviceFactory.setServiceClass(GreeterImpl.class);
- EndpointImpl endpoint = new EndpointImpl(getBus(), greeter, serviceFactory);
+ EndpointImpl endpoint = new EndpointImpl(getBus(), greeter,
+ new JaxWsServerFactoryBean(serviceFactory));
WebServiceContext ctx = greeter.getContext();
assertNull(ctx);
@@ -101,7 +102,8 @@
serviceFactory.setInvoker(new BeanInvoker(hello));
serviceFactory.setServiceClass(HelloImpl.class);
- EndpointImpl endpoint = new EndpointImpl(getBus(), hello, serviceFactory);
+ EndpointImpl endpoint = new EndpointImpl(getBus(), hello,
+ new JaxWsServerFactoryBean(serviceFactory));
try {
String address = "http://localhost:8080/test";
@@ -121,7 +123,7 @@
serviceFactory.setServiceClass(HelloWrongAnnotation.class);
try {
- new EndpointImpl(getBus(), hello, serviceFactory);
+ new EndpointImpl(getBus(), hello, new JaxWsServerFactoryBean(serviceFactory));
} catch (Exception e) {
String expeced = "Method [sayHi] processing error: SOAPBinding can not on method with RPC style";
assertEquals(expeced, e.getMessage());
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/basicDOCBare/PutLastTradedPriceImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/basicDOCBare/PutLastTradedPriceImpl.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/basicDOCBare/PutLastTradedPriceImpl.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/basicDOCBare/PutLastTradedPriceImpl.java Tue Apr 10 11:13:23 2007
@@ -27,7 +27,8 @@
@javax.jws.WebService(serviceName = "SOAPService",
portName = "SoapPort",
endpointInterface = "org.apache.hello_world_doc_lit_bare.PutLastTradedPricePortType",
- targetNamespace = "http://apache.org/hello_world_doc_lit_bare")
+ targetNamespace = "http://apache.org/hello_world_doc_lit_bare",
+ wsdlLocation = "testutils/doc_lit_bare.wsdl")
public class PutLastTradedPriceImpl implements PutLastTradedPricePortType {
public void sayHi(Holder<TradePriceData> inout) {
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/callback/CallbackImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/callback/CallbackImpl.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/callback/CallbackImpl.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/callback/CallbackImpl.java Tue Apr 10 11:13:23 2007
@@ -25,8 +25,8 @@
@javax.jws.WebService(serviceName = "CallbackService",
portName = "CallbackPort",
endpointInterface = "org.apache.callback.CallbackPortType",
- targetNamespace = "http://apache.org/callback")
- //wsdlLocation = "file:./wsdl/basic_callback.wsdl")
+ targetNamespace = "http://apache.org/callback",
+ wsdlLocation = "testutils/basic_callback_test.wsdl")
public class CallbackImpl implements CallbackPortType {
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/callback/ServerImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/callback/ServerImpl.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/callback/ServerImpl.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/callback/ServerImpl.java Tue Apr 10 11:13:23 2007
@@ -36,7 +36,8 @@
@javax.jws.WebService(serviceName = "SOAPService",
portName = "SOAPPort",
targetNamespace = "http://apache.org/callback",
- endpointInterface = "org.apache.callback.ServerPortType")
+ endpointInterface = "org.apache.callback.ServerPortType",
+ wsdlLocation = "testutils/basic_callback_test.wsdl")
public class ServerImpl implements ServerPortType {
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerTestImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerTestImpl.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerTestImpl.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerTestImpl.java Tue Apr 10 11:13:23 2007
@@ -36,7 +36,8 @@
@WebService(serviceName = "HandlerTestService",
portName = "SoapPort",
endpointInterface = "org.apache.handler_test.HandlerTest",
- targetNamespace = "http://apache.org/handler_test")
+ targetNamespace = "http://apache.org/handler_test",
+ wsdlLocation = "testutils/handler_test.wsdl")
@HandlerChain(file = "./handlers_invocation.xml", name = "TestHandlerChain")
public class HandlerTestImpl implements HandlerTest {
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/TrivialSOAPHandlerAnnotatedGreeterImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/TrivialSOAPHandlerAnnotatedGreeterImpl.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/TrivialSOAPHandlerAnnotatedGreeterImpl.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/TrivialSOAPHandlerAnnotatedGreeterImpl.java Tue Apr 10 11:13:23 2007
@@ -31,7 +31,8 @@
@WebService(serviceName = "GreeterService",
portName = "GreeterPort",
endpointInterface = "org.apache.cxf.greeter_control.Greeter",
- targetNamespace = "http://cxf.apache.org/greeter_control")
+ targetNamespace = "http://cxf.apache.org/greeter_control",
+ wsdlLocation = "testutils/greeter_control.wsdl")
@HandlerChain(file = "trivial_soap_handler.xml")
public class TrivialSOAPHandlerAnnotatedGreeterImpl extends AbstractGreeterImpl {
}
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java Tue Apr 10 11:13:23 2007
@@ -156,7 +156,8 @@
@Test
public void testGetPortOneParam() throws Exception {
- Service service = Service.create(serviceName);
+ URL url = getClass().getResource("/wsdl/hello_world.wsdl");
+ Service service = Service.create(url, serviceName);
Greeter greeter = service.getPort(Greeter.class);
String response = new String("Bonjour");
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLTest.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLTest.java Tue Apr 10 11:13:23 2007
@@ -22,6 +22,7 @@
import java.io.InputStream;
import java.lang.reflect.UndeclaredThrowableException;
import java.net.HttpURLConnection;
+import java.net.URL;
import java.util.HashMap;
import java.util.Map;
@@ -206,11 +207,13 @@
@Test
public void testAddPort() throws Exception {
+ URL url = getClass().getResource("/wsdl/hello_world_xml_wrapped.wsdl");
+
+ Service service = Service.create(url, wrapServiceName);
+ assertNotNull(service);
- Service service = Service.create(wrapServiceName);
service.addPort(wrapFakePortName, "http://cxf.apache.org/bindings/xformat",
"http://localhost:9032/XMLService/XMLPort");
- assertNotNull(service);
String response1 = new String("Hello ");
String response2 = new String("Bonjour");
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/Server.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/Server.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/Server.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/Server.java Tue Apr 10 11:13:23 2007
@@ -64,7 +64,8 @@
@WebService(serviceName = "SOAPServiceBogusAddressTest",
portName = "SoapPort",
endpointInterface = "org.apache.hello_world_soap_http.Greeter",
- targetNamespace = "http://apache.org/hello_world_soap_http")
+ targetNamespace = "http://apache.org/hello_world_soap_http",
+ wsdlLocation = "testutils/hello_world.wsdl")
public class GreeterImplBogus extends GreeterImpl {
}
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/GreeterImplDoc.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/GreeterImplDoc.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/GreeterImplDoc.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/GreeterImplDoc.java Tue Apr 10 11:13:23 2007
@@ -28,7 +28,8 @@
@WebService(serviceName = "SOAPService2",
portName = "SoapPort2",
endpointInterface = "org.apache.hello_world_doc_lit.Greeter",
- targetNamespace = "http://apache.org/hello_world_doc_lit")
+ targetNamespace = "http://apache.org/hello_world_doc_lit",
+ wsdlLocation = "testutils/hello_world_doc_lit.wsdl")
public class GreeterImplDoc implements Greeter {
public String sayHi() {
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/GreeterImplQueueOneWay.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/GreeterImplQueueOneWay.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/GreeterImplQueueOneWay.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/GreeterImplQueueOneWay.java Tue Apr 10 11:13:23 2007
@@ -27,7 +27,8 @@
@WebService(serviceName = "HelloWorldOneWayQueueService",
portName = "HelloWorldOneWayQueuePort",
endpointInterface = "org.apache.cxf.hello_world_jms.HelloWorldOneWayPort",
- targetNamespace = "http://cxf.apache.org/hello_world_jms")
+ targetNamespace = "http://cxf.apache.org/hello_world_jms",
+ wsdlLocation = "testutils/jms_test.wsdl")
public class GreeterImplQueueOneWay implements HelloWorldOneWayPort {
public void greetMeOneWay(String stringParam0) {
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/GreeterImplTopicOneWay.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/GreeterImplTopicOneWay.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/GreeterImplTopicOneWay.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/GreeterImplTopicOneWay.java Tue Apr 10 11:13:23 2007
@@ -25,7 +25,8 @@
@WebService(serviceName = "HelloWorldPubSubService",
portName = "HelloWorldPubSubPort",
endpointInterface = "org.apache.cxf.hello_world_jms.HelloWorldPubSubPort",
- targetNamespace = "http://cxf.apache.org/hello_world_jms")
+ targetNamespace = "http://cxf.apache.org/hello_world_jms",
+ wsdlLocation = "testutils/jms_test.wsdl")
public class GreeterImplTopicOneWay implements HelloWorldPubSubPort {
public void greetMeOneWay(String stringParam0) {
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/GreeterImplTwoWayJMS.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/GreeterImplTwoWayJMS.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/GreeterImplTwoWayJMS.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/GreeterImplTwoWayJMS.java Tue Apr 10 11:13:23 2007
@@ -39,7 +39,8 @@
@WebService(serviceName = "HelloWorldService",
portName = "HelloWorldPort",
endpointInterface = "org.apache.cxf.hello_world_jms.HelloWorldPortType",
- targetNamespace = "http://cxf.apache.org/hello_world_jms")
+ targetNamespace = "http://cxf.apache.org/hello_world_jms",
+ wsdlLocation = "testutils/jms_test.wsdl")
public class GreeterImplTwoWayJMS implements HelloWorldPortType {
@Resource
protected WebServiceContext wsContext;
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopTest.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopTest.java Tue Apr 10 11:13:23 2007
@@ -115,6 +115,7 @@
serviceFactory.setBus(bus);
serviceFactory.setServiceName(serviceName);
serviceFactory.setServiceClass(serviceEndpointInterface);
+ serviceFactory.setWsdlURL(ClientMtomXopTest.class.getResource("/wsdl/mtom_xop.wsdl"));
Service service = serviceFactory.create();
ServiceInfo si = service.getServiceInfo();
EndpointInfo ei = null;
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/soap12/GreeterImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/soap12/GreeterImpl.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/soap12/GreeterImpl.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/soap12/GreeterImpl.java Tue Apr 10 11:13:23 2007
@@ -26,7 +26,8 @@
@javax.jws.WebService(portName = "SoapPort", serviceName = "SOAPService",
targetNamespace = "http://apache.org/hello_world_soap12_http",
- endpointInterface = "org.apache.hello_world_soap12_http.Greeter")
+ endpointInterface = "org.apache.hello_world_soap12_http.Greeter",
+ wsdlLocation = "testutils/hello_world_soap12.wsdl")
public class GreeterImpl implements Greeter {
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPDocLitServerImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPDocLitServerImpl.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPDocLitServerImpl.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPDocLitServerImpl.java Tue Apr 10 11:13:23 2007
@@ -56,7 +56,8 @@
@WebService(serviceName = "SOAPService", portName = "SOAPPort",
endpointInterface = "org.apache.type_test.doc.TypeTestPortType",
- targetNamespace = "http://apache.org/type_test/doc")
+ targetNamespace = "http://apache.org/type_test/doc",
+ wsdlLocation = "testutils/type_test/type_test_doclit_soap.wsdl")
class SOAPTypeTestImpl extends TypeTestImpl implements TypeTestPortType {
}
}
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/xml/XMLServerImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/xml/XMLServerImpl.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/xml/XMLServerImpl.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/xml/XMLServerImpl.java Tue Apr 10 11:13:23 2007
@@ -55,7 +55,8 @@
@WebService(serviceName = "XMLService",
portName = "XMLPort",
endpointInterface = "org.apache.type_test.xml.TypeTestPortType",
- targetNamespace = "http://apache.org/type_test/xml")
+ targetNamespace = "http://apache.org/type_test/xml",
+ wsdlLocation = "testutils/type_test/type_test_xml.wsdl")
@javax.xml.ws.BindingType(value = "http://cxf.apache.org/bindings/xmlformat")
class XMLTypeTestImpl extends TypeTestImpl implements TypeTestPortType {
}
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/GreeterImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/GreeterImpl.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/GreeterImpl.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/GreeterImpl.java Tue Apr 10 11:13:23 2007
@@ -47,7 +47,8 @@
@WebService(serviceName = "SOAPServiceAddressing",
portName = "SoapPort",
endpointInterface = "org.apache.hello_world_soap_http.Greeter",
- targetNamespace = "http://apache.org/hello_world_soap_http")
+ targetNamespace = "http://apache.org/hello_world_soap_http",
+ wsdlLocation = "testutils/hello_world.wsdl")
public class GreeterImpl implements Greeter {
VerificationCache verificationCache;
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/GreeterImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/GreeterImpl.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/GreeterImpl.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/GreeterImpl.java Tue Apr 10 11:13:23 2007
@@ -30,6 +30,7 @@
@WebService(serviceName = "BasicGreeterService",
portName = "GreeterPort",
endpointInterface = "org.apache.cxf.greeter_control.Greeter",
- targetNamespace = "http://cxf.apache.org/greeter_control")
+ targetNamespace = "http://cxf.apache.org/greeter_control",
+ wsdlLocation = "testutils/greeter_control.wsdl")
public class GreeterImpl extends AbstractGreeterImpl {
}
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/HttpGreeterImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/HttpGreeterImpl.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/HttpGreeterImpl.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/HttpGreeterImpl.java Tue Apr 10 11:13:23 2007
@@ -30,7 +30,8 @@
@WebService(serviceName = "BasicGreeterService",
portName = "GreeterPort",
endpointInterface = "org.apache.cxf.greeter_control.Greeter",
- targetNamespace = "http://cxf.apache.org/greeter_control")
+ targetNamespace = "http://cxf.apache.org/greeter_control",
+ wsdlLocation = "testutils/greeter_control.wsdl")
public class HttpGreeterImpl extends AbstractGreeterImpl {
private int greetMeCount;
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/ReliableGreeterImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/ReliableGreeterImpl.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/ReliableGreeterImpl.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/ReliableGreeterImpl.java Tue Apr 10 11:13:23 2007
@@ -30,6 +30,7 @@
@WebService(serviceName = "ReliableGreeterService",
portName = "GreeterPort",
endpointInterface = "org.apache.cxf.greeter_control.Greeter",
- targetNamespace = "http://cxf.apache.org/greeter_control")
+ targetNamespace = "http://cxf.apache.org/greeter_control",
+ wsdlLocation = "testutils/greeter_control.wsdl")
public class ReliableGreeterImpl extends AbstractGreeterImpl {
}
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/GreeterImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/GreeterImpl.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/GreeterImpl.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/GreeterImpl.java Tue Apr 10 11:13:23 2007
@@ -30,6 +30,7 @@
@WebService(serviceName = "GreeterService",
portName = "GreeterPort",
endpointInterface = "org.apache.cxf.greeter_control.Greeter",
- targetNamespace = "http://cxf.apache.org/greeter_control")
+ targetNamespace = "http://cxf.apache.org/greeter_control",
+ wsdlLocation = "testutils/greeter_control.wsdl")
public class GreeterImpl extends AbstractGreeterImpl {
}
Modified: incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/anonymous_complex_type/AnonymousComplexTypeImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/anonymous_complex_type/AnonymousComplexTypeImpl.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/anonymous_complex_type/AnonymousComplexTypeImpl.java (original)
+++ incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/anonymous_complex_type/AnonymousComplexTypeImpl.java Tue Apr 10 11:13:23 2007
@@ -27,8 +27,8 @@
@WebService(serviceName = "anonymous_complex_type_service",
portName = "anonymous_complex_typeSOAP",
endpointInterface = "org.apache.cxf.anonymous_complex_type.AnonymousComplexType",
- targetNamespace = "http://cxf.apache.org/anonymous_complex_type/")
-
+ targetNamespace = "http://cxf.apache.org/anonymous_complex_type/",
+ wsdlLocation = "testutils/anonymous_complex_type.wsdl")
public class AnonymousComplexTypeImpl implements AnonymousComplexType {
public SplitNameResponse.Names splitName(String name) {
Modified: incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/calculator/CalculatorImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/calculator/CalculatorImpl.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/calculator/CalculatorImpl.java (original)
+++ incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/calculator/CalculatorImpl.java Tue Apr 10 11:13:23 2007
@@ -26,7 +26,8 @@
@WebService(serviceName = "CalculatorService",
portName = "CalculatorPort",
targetNamespace = "http://apache.org/cxf/calculator",
- endpointInterface = "org.apache.cxf.calculator.CalculatorPortType")
+ endpointInterface = "org.apache.cxf.calculator.CalculatorPortType",
+ wsdlLocation = "testutils/calculator.wsdl")
public class CalculatorImpl implements CalculatorPortType {
public int add(int number1, int number2) throws AddNumbersFault {
if (number1 < 0 || number2 < 0) {
Modified: incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/greeter_control/GreeterImplBase.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/greeter_control/GreeterImplBase.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/greeter_control/GreeterImplBase.java (original)
+++ incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/greeter_control/GreeterImplBase.java Tue Apr 10 11:13:23 2007
@@ -32,7 +32,8 @@
@WebService(serviceName = "GreeterService",
portName = "GreeterPort",
endpointInterface = "org.apache.cxf.greeter_control.Greeter",
- targetNamespace = "http://cxf.apache.org/greeter_control")
+ targetNamespace = "http://cxf.apache.org/greeter_control",
+ wsdlLocation = "testutils/greeter_control.wsdl")
/* This class does not implement the SEI */
public class GreeterImplBase {
Modified: incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/jaxb_element_test/JaxbElementTestImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/jaxb_element_test/JaxbElementTestImpl.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/jaxb_element_test/JaxbElementTestImpl.java (original)
+++ incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/jaxb_element_test/JaxbElementTestImpl.java Tue Apr 10 11:13:23 2007
@@ -24,7 +24,8 @@
@WebService(serviceName = "jaxb_element_test",
portName = "jaxb_element_testSOAP",
targetNamespace = "http://cxf.apache.org/jaxb_element_test/",
- endpointInterface = "org.apache.cxf.jaxb_element_test.JaxbElementTest")
+ endpointInterface = "org.apache.cxf.jaxb_element_test.JaxbElementTest",
+ wsdlLocation = "testutils/jaxb_element_test.wsdl")
public class JaxbElementTestImpl implements JaxbElementTest {
public String newOperation(String in) {
Modified: incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/mtom_xop/TestMtomImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/mtom_xop/TestMtomImpl.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/mtom_xop/TestMtomImpl.java (original)
+++ incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/mtom_xop/TestMtomImpl.java Tue Apr 10 11:13:23 2007
@@ -27,7 +27,8 @@
@WebService(serviceName = "TestMtomService",
portName = "TestMtomPort",
targetNamespace = "http://cxf.apache.org/mime",
- endpointInterface = "org.apache.cxf.mime.TestMtom")
+ endpointInterface = "org.apache.cxf.mime.TestMtom",
+ wsdlLocation = "testutils/mtom_xop.wsdl")
public class TestMtomImpl implements TestMtom {
Modified: incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/ordered_param_holder/OrderedParamHolderImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/ordered_param_holder/OrderedParamHolderImpl.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/ordered_param_holder/OrderedParamHolderImpl.java (original)
+++ incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/ordered_param_holder/OrderedParamHolderImpl.java Tue Apr 10 11:13:23 2007
@@ -25,7 +25,8 @@
@WebService(serviceName = "ordered_param_holder",
portName = "ordered_param_holderSOAP",
targetNamespace = "http://cxf.apache.org/ordered_param_holder/",
- endpointInterface = "org.apache.cxf.ordered_param_holder.OrderedParamHolder")
+ endpointInterface = "org.apache.cxf.ordered_param_holder.OrderedParamHolder",
+ wsdlLocation = "testutils/ordered_param_holder.wsdl")
public class OrderedParamHolderImpl implements OrderedParamHolder {
Modified: incubator/cxf/trunk/testutils/src/main/java/org/apache/header_test/TestHeaderImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/java/org/apache/header_test/TestHeaderImpl.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/java/org/apache/header_test/TestHeaderImpl.java (original)
+++ incubator/cxf/trunk/testutils/src/main/java/org/apache/header_test/TestHeaderImpl.java Tue Apr 10 11:13:23 2007
@@ -41,7 +41,8 @@
@WebService(serviceName = "SOAPHeaderService",
portName = "SoapHeaderPort",
endpointInterface = "org.apache.header_test.TestHeader",
- targetNamespace = "http://apache.org/header_test")
+ targetNamespace = "http://apache.org/header_test",
+ wsdlLocation = "testutils/soapheader.wsdl")
public class TestHeaderImpl implements TestHeader {
public TestHeader1Response testHeader1(
Modified: incubator/cxf/trunk/testutils/src/main/java/org/apache/header_test/rpc/TestRPCHeaderImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/java/org/apache/header_test/rpc/TestRPCHeaderImpl.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/java/org/apache/header_test/rpc/TestRPCHeaderImpl.java (original)
+++ incubator/cxf/trunk/testutils/src/main/java/org/apache/header_test/rpc/TestRPCHeaderImpl.java Tue Apr 10 11:13:23 2007
@@ -27,7 +27,8 @@
@WebService(serviceName = "SOAPRPCHeaderService",
portName = "SoapRPCHeaderPort",
endpointInterface = "org.apache.header_test.rpc.TestRPCHeader",
- targetNamespace = "http://apache.org/header_test/rpc")
+ targetNamespace = "http://apache.org/header_test/rpc",
+ wsdlLocation = "testutils/soapheader_rpc.wsdl")
public class TestRPCHeaderImpl implements TestRPCHeader {
Modified: incubator/cxf/trunk/testutils/src/main/java/org/apache/headers/HeaderTesterImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/java/org/apache/headers/HeaderTesterImpl.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/java/org/apache/headers/HeaderTesterImpl.java (original)
+++ incubator/cxf/trunk/testutils/src/main/java/org/apache/headers/HeaderTesterImpl.java Tue Apr 10 11:13:23 2007
@@ -33,7 +33,8 @@
@WebService(serviceName = "XMLHeaderService",
portName = "XMLPort9000",
endpointInterface = "org.apache.headers.HeaderTester",
- targetNamespace = "http://apache.org/headers")
+ targetNamespace = "http://apache.org/headers",
+ wsdlLocation = "testutils/soapheader2.wsdl")
public class HeaderTesterImpl implements HeaderTester {
Modified: incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_doc_lit/GreeterImplDoc.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_doc_lit/GreeterImplDoc.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_doc_lit/GreeterImplDoc.java (original)
+++ incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_doc_lit/GreeterImplDoc.java Tue Apr 10 11:13:23 2007
@@ -26,7 +26,8 @@
@WebService(serviceName = "SOAPService",
portName = "SoapPort",
endpointInterface = "org.apache.hello_world_doc_lit.Greeter",
- targetNamespace = "http://apache.org/hello_world_doc_lit")
+ targetNamespace = "http://apache.org/hello_world_doc_lit",
+ wsdlLocation = "testutils/hello_world_doc_lit.wsdl")
public class GreeterImplDoc implements Greeter {
public String sayHi() {
Modified: incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_mixedstyle/GreeterImplMixedStyle.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_mixedstyle/GreeterImplMixedStyle.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_mixedstyle/GreeterImplMixedStyle.java (original)
+++ incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_mixedstyle/GreeterImplMixedStyle.java Tue Apr 10 11:13:23 2007
@@ -28,7 +28,8 @@
@WebService(serviceName = "SOAPService",
portName = "SoapPort",
endpointInterface = "org.apache.hello_world_mixedstyle.Greeter",
- targetNamespace = "http://apache.org/hello_world_mixedstyle")
+ targetNamespace = "http://apache.org/hello_world_mixedstyle",
+ wsdlLocation = "testutils/hello_world_mixedstyle.wsdl")
public class GreeterImplMixedStyle implements Greeter {
public String sayHi() {
Modified: incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_soap_http/AnotherDerivedGreeterImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_soap_http/AnotherDerivedGreeterImpl.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_soap_http/AnotherDerivedGreeterImpl.java (original)
+++ incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_soap_http/AnotherDerivedGreeterImpl.java Tue Apr 10 11:13:23 2007
@@ -37,7 +37,8 @@
import org.apache.hello_world_soap_http.types.TestNillableResponse;
-@javax.jws.WebService(endpointInterface = "org.apache.hello_world_soap_http.Greeter")
+@javax.jws.WebService(endpointInterface = "org.apache.hello_world_soap_http.Greeter",
+ wsdlLocation = "tetutils/hello_world.wsdl")
public class AnotherDerivedGreeterImpl implements GreeterEndpointInterface {
private static final Logger LOG =
Modified: incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_soap_http/DerivedGreeterImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_soap_http/DerivedGreeterImpl.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_soap_http/DerivedGreeterImpl.java (original)
+++ incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_soap_http/DerivedGreeterImpl.java Tue Apr 10 11:13:23 2007
@@ -38,7 +38,8 @@
@javax.jws.WebService(name = "Greeter", serviceName = "SOAPService",
- targetNamespace = "http://apache.org/hello_world_soap_http")
+ targetNamespace = "http://apache.org/hello_world_soap_http",
+ wsdlLocation = "tetutils/hello_world.wsdl")
public class DerivedGreeterImpl implements Greeter {
private static final Logger LOG =
Modified: incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_soap_http/DocLitBareGreeterImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_soap_http/DocLitBareGreeterImpl.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_soap_http/DocLitBareGreeterImpl.java (original)
+++ incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_soap_http/DocLitBareGreeterImpl.java Tue Apr 10 11:13:23 2007
@@ -34,7 +34,8 @@
@WebService(serviceName = "SOAPService_DocLitBare",
portName = "SoapPort2",
endpointInterface = "org.apache.hello_world_soap_http.DocLitBare",
- targetNamespace = "http://apache.org/hello_world_soap_http")
+ targetNamespace = "http://apache.org/hello_world_soap_http",
+ wsdlLocation = "testutils/hello_world.wsdl")
public class DocLitBareGreeterImpl implements DocLitBare {
Modified: incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_soap_http/GreeterEndpointInterface.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_soap_http/GreeterEndpointInterface.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_soap_http/GreeterEndpointInterface.java (original)
+++ incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_soap_http/GreeterEndpointInterface.java Tue Apr 10 11:13:23 2007
@@ -21,7 +21,8 @@
@javax.jws.WebService(name = "Greeter",
serviceName = "SOAPService",
- targetNamespace = "http://apache.org/hello_world_soap_http")
+ targetNamespace = "http://apache.org/hello_world_soap_http",
+ wsdlLocation = "tetutils/hello_world.wsdl")
public interface GreeterEndpointInterface extends Greeter {
Modified: incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_soap_http/GreeterImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_soap_http/GreeterImpl.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_soap_http/GreeterImpl.java (original)
+++ incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_soap_http/GreeterImpl.java Tue Apr 10 11:13:23 2007
@@ -46,7 +46,8 @@
@WebService(serviceName = "SOAPService",
portName = "SoapPort",
endpointInterface = "org.apache.hello_world_soap_http.Greeter",
- targetNamespace = "http://apache.org/hello_world_soap_http")
+ targetNamespace = "http://apache.org/hello_world_soap_http",
+ wsdlLocation = "testutils/hello_world.wsdl")
public class GreeterImpl implements Greeter {
private static final Logger LOG = Logger.getLogger(GreeterImpl.class.getName());
Modified: incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_soap_http/RPCLitGreeterImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_soap_http/RPCLitGreeterImpl.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_soap_http/RPCLitGreeterImpl.java (original)
+++ incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_soap_http/RPCLitGreeterImpl.java Tue Apr 10 11:13:23 2007
@@ -27,7 +27,8 @@
@WebService(name = "GreeterRPCLit", serviceName = "SOAPServiceRPCLit",
portName = "SoapPortRPCLit",
targetNamespace = "http://apache.org/hello_world_rpclit",
- endpointInterface = "org.apache.hello_world_rpclit.GreeterRPCLit")
+ endpointInterface = "org.apache.hello_world_rpclit.GreeterRPCLit",
+ wsdlLocation = "testutils/hello_world_rpc_lit.wsdl")
public class RPCLitGreeterImpl implements GreeterRPCLit {
Modified: incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_xml_http/bare/GreeterImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_xml_http/bare/GreeterImpl.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_xml_http/bare/GreeterImpl.java (original)
+++ incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_xml_http/bare/GreeterImpl.java Tue Apr 10 11:13:23 2007
@@ -24,7 +24,8 @@
@javax.jws.WebService(serviceName = "XMLService",
portName = "XMLPort",
endpointInterface = "org.apache.hello_world_xml_http.bare.Greeter",
- targetNamespace = "http://apache.org/hello_world_xml_http/bare")
+ targetNamespace = "http://apache.org/hello_world_xml_http/bare",
+ wsdlLocation = "testutils/hello_world_xml_bare.wsdl")
@javax.xml.ws.BindingType(value = "http://cxf.apache.org/bindings/xformat")
Modified: incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_xml_http/mixed/GreeterImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_xml_http/mixed/GreeterImpl.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_xml_http/mixed/GreeterImpl.java (original)
+++ incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_xml_http/mixed/GreeterImpl.java Tue Apr 10 11:13:23 2007
@@ -26,7 +26,8 @@
@javax.jws.WebService(serviceName = "XMLService",
portName = "XMLPort",
endpointInterface = "org.apache.hello_world_xml_http.mixed.Greeter",
- targetNamespace = "http://apache.org/hello_world_xml_http/mixed")
+ targetNamespace = "http://apache.org/hello_world_xml_http/mixed",
+ wsdlLocation = "testutils/hello_world_xml_mixed.wsdl")
@javax.xml.ws.BindingType(value = "http://cxf.apache.org/bindings/xformat")
Modified: incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_xml_http/wrapped/GreeterFaultImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_xml_http/wrapped/GreeterFaultImpl.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_xml_http/wrapped/GreeterFaultImpl.java (original)
+++ incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_xml_http/wrapped/GreeterFaultImpl.java Tue Apr 10 11:13:23 2007
@@ -23,7 +23,8 @@
@javax.jws.WebService(serviceName = "XMLService",
portName = "XMLFaultPort",
endpointInterface = "org.apache.hello_world_xml_http.wrapped.Greeter",
- targetNamespace = "http://apache.org/hello_world_xml_http/wrapped")
+ targetNamespace = "http://apache.org/hello_world_xml_http/wrapped",
+ wsdlLocation = "testutils/hello_world_xml_wrapped.wsdl")
@javax.xml.ws.BindingType(value = "http://cxf.apache.org/bindings/xformat")
Modified: incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_xml_http/wrapped/GreeterImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_xml_http/wrapped/GreeterImpl.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_xml_http/wrapped/GreeterImpl.java (original)
+++ incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world_xml_http/wrapped/GreeterImpl.java Tue Apr 10 11:13:23 2007
@@ -24,7 +24,8 @@
@javax.jws.WebService(serviceName = "XMLService",
portName = "XMLPort",
endpointInterface = "org.apache.hello_world_xml_http.wrapped.Greeter",
- targetNamespace = "http://apache.org/hello_world_xml_http/wrapped")
+ targetNamespace = "http://apache.org/hello_world_xml_http/wrapped",
+ wsdlLocation = "testutils/hello_world_xml_wrapped.wsdl")
@javax.xml.ws.BindingType(value = "http://cxf.apache.org/bindings/xformat")
Modified: incubator/cxf/trunk/testutils/src/main/java/org/apache/locator_test/LocatorServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/java/org/apache/locator_test/LocatorServiceImpl.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/java/org/apache/locator_test/LocatorServiceImpl.java (original)
+++ incubator/cxf/trunk/testutils/src/main/java/org/apache/locator_test/LocatorServiceImpl.java Tue Apr 10 11:13:23 2007
@@ -44,7 +44,8 @@
serviceName = "LocatorService",
portName = "LocatorServicePort",
targetNamespace = "http://apache.org/locator",
- endpointInterface = "org.apache.locator.LocatorService")
+ endpointInterface = "org.apache.locator.LocatorService",
+ wsdlLocation = "testutils/locator.wsdl")
public class LocatorServiceImpl implements LocatorService {
static final Logger LOG = Logger.getLogger(LocatorServiceImpl.class.getName());
Modified: incubator/cxf/trunk/testutils/src/main/resources/META-INF/jax-ws-catalog.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/resources/META-INF/jax-ws-catalog.xml?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/resources/META-INF/jax-ws-catalog.xml (original)
+++ incubator/cxf/trunk/testutils/src/main/resources/META-INF/jax-ws-catalog.xml Tue Apr 10 11:13:23 2007
@@ -22,4 +22,5 @@
<rewriteSystem systemIdStartString="doesnotexist" rewritePrefix="../wsdl/catalog"/>
<rewriteSystem systemIdStartString="nopath" rewritePrefix="../wsdl"/>
+ <rewriteSystem systemIdStartString="testutils" rewritePrefix="classpath:/wsdl"/>
</catalog>
Modified: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebServiceAnnotator.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebServiceAnnotator.java?view=diff&rev=527231&r1=527230&r2=527231
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebServiceAnnotator.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebServiceAnnotator.java Tue Apr 10 11:13:23 2007
@@ -35,7 +35,7 @@
}
JavaAnnotation serviceAnnotation = new JavaAnnotation("WebService");
serviceAnnotation.addArgument("targetNamespace", intf.getNamespace());
- serviceAnnotation.addArgument("wsdlLocation", intf.getLocation());
+ //serviceAnnotation.addArgument("wsdlLocation", intf.getLocation());
serviceAnnotation.addArgument("name", intf.getWebServiceName());
intf.addAnnotation(serviceAnnotation.toString());