Author: mmao
Date: Tue Sep 19 05:15:12 2006
New Revision: 447827
URL: http://svn.apache.org/viewvc?view=rev&rev=447827
Log:
Fixed the provider/dispatch demo
* XML prolog should be the first line in the xml file
* Skip the initialization of wsdl operations in provider service.
* If WebServiceProvider annotation has no values, still a valid provider
Fixed the distribution
* JCA should be included in the top pom.xml, so when build it'll build jca
project.
* Rename the JCA project name to keep consistency with other modules.
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/client/GreetMeDocLiteralReq1.xml
incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/client/GreetMeDocLiteralReq2.xml
incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/client/GreetMeDocLiteralReq3.xml
incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/server/GreetMeDocLiteralResp1.xml
incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/server/GreetMeDocLiteralResp2.xml
incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/server/GreetMeDocLiteralResp3.xml
incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/server/GreeterDOMSourceMessageProvider.java
incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/server/GreeterDOMSourcePayloadProvider.java
incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/server/GreeterSoapMessageProvider.java
incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/server/Server.java
incubator/cxf/trunk/jca/pom.xml
incubator/cxf/trunk/pom.xml
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxwsImplementorInfo.java
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/client/GreetMeDocLiteralReq1.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/client/GreetMeDocLiteralReq1.xml?view=diff&rev=447827&r1=447826&r2=447827
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/client/GreetMeDocLiteralReq1.xml
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/client/GreetMeDocLiteralReq1.xml
Tue Sep 19 05:15:12 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8" ?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,4 +17,4 @@
specific language governing permissions and limitations
under the License.
-->
-<?xml version="1.0" encoding="utf-8" ?><SOAP-ENV:Envelope
xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><SOAP-ENV:Body><ns4:greetMe
xmlns:ns4="http://apache.org/hello_world_soap_http/types";><ns4:requestType>Gil</ns4:requestType></ns4:greetMe></SOAP-ENV:Body></SOAP-ENV:Envelope>
+<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><SOAP-ENV:Body><ns4:greetMe
xmlns:ns4="http://apache.org/hello_world_soap_http/types";><ns4:requestType>Gil</ns4:requestType></ns4:greetMe></SOAP-ENV:Body></SOAP-ENV:Envelope>
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/client/GreetMeDocLiteralReq2.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/client/GreetMeDocLiteralReq2.xml?view=diff&rev=447827&r1=447826&r2=447827
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/client/GreetMeDocLiteralReq2.xml
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/client/GreetMeDocLiteralReq2.xml
Tue Sep 19 05:15:12 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8" ?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,4 +17,4 @@
specific language governing permissions and limitations
under the License.
-->
-<?xml version="1.0" encoding="utf-8" ?><SOAP-ENV:Envelope
xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><SOAP-ENV:Body><ns4:greetMe
xmlns:ns4="http://apache.org/hello_world_soap_http/types";><ns4:requestType>Scott</ns4:requestType></ns4:greetMe></SOAP-ENV:Body></SOAP-ENV:Envelope>
+<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><SOAP-ENV:Body><ns4:greetMe
xmlns:ns4="http://apache.org/hello_world_soap_http/types";><ns4:requestType>Scott</ns4:requestType></ns4:greetMe></SOAP-ENV:Body></SOAP-ENV:Envelope>
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/client/GreetMeDocLiteralReq3.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/client/GreetMeDocLiteralReq3.xml?view=diff&rev=447827&r1=447826&r2=447827
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/client/GreetMeDocLiteralReq3.xml
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/client/GreetMeDocLiteralReq3.xml
Tue Sep 19 05:15:12 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8" ?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,4 +17,4 @@
specific language governing permissions and limitations
under the License.
-->
-<?xml version="1.0" encoding="utf-8" ?><SOAP-ENV:Envelope
xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><SOAP-ENV:Body><ns4:greetMe
xmlns:ns4="http://apache.org/hello_world_soap_http/types";><ns4:requestType>Heron</ns4:requestType></ns4:greetMe></SOAP-ENV:Body></SOAP-ENV:Envelope>
+<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><SOAP-ENV:Body><ns4:greetMe
xmlns:ns4="http://apache.org/hello_world_soap_http/types";><ns4:requestType>Heron</ns4:requestType></ns4:greetMe></SOAP-ENV:Body></SOAP-ENV:Envelope>
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/server/GreetMeDocLiteralResp1.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/server/GreetMeDocLiteralResp1.xml?view=diff&rev=447827&r1=447826&r2=447827
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/server/GreetMeDocLiteralResp1.xml
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/server/GreetMeDocLiteralResp1.xml
Tue Sep 19 05:15:12 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8" ?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<?xml version="1.0" encoding="utf-8" ?>
+
<SOAP-ENV:Envelope
xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:xs="http://www.w3.org/2001/XMLSchema";
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/server/GreetMeDocLiteralResp2.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/server/GreetMeDocLiteralResp2.xml?view=diff&rev=447827&r1=447826&r2=447827
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/server/GreetMeDocLiteralResp2.xml
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/server/GreetMeDocLiteralResp2.xml
Tue Sep 19 05:15:12 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8" ?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<?xml version="1.0" encoding="utf-8" ?>
+
<SOAP-ENV:Envelope
xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:xs="http://www.w3.org/2001/XMLSchema";
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/server/GreetMeDocLiteralResp3.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/server/GreetMeDocLiteralResp3.xml?view=diff&rev=447827&r1=447826&r2=447827
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/server/GreetMeDocLiteralResp3.xml
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/server/GreetMeDocLiteralResp3.xml
Tue Sep 19 05:15:12 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8" ?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-<?xml version="1.0" encoding="utf-8" ?>
<SOAP-ENV:Envelope
xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:xs="http://www.w3.org/2001/XMLSchema";
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/server/GreeterDOMSourceMessageProvider.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/server/GreeterDOMSourceMessageProvider.java?view=diff&rev=447827&r1=447826&r2=447827
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/server/GreeterDOMSourceMessageProvider.java
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/server/GreeterDOMSourceMessageProvider.java
Tue Sep 19 05:15:12 2006
@@ -28,9 +28,7 @@
import javax.xml.ws.ServiceMode;
import javax.xml.ws.WebServiceProvider;
[EMAIL PROTECTED](portName = "SoapPort2", serviceName = "SOAPService2",
- targetNamespace =
"http://apache.org/hello_world_soap_http";,
- wsdlLocation = "file:./wsdl/hello_world.wsdl")
[EMAIL PROTECTED]()
@ServiceMode(value = Service.Mode.MESSAGE)
public class GreeterDOMSourceMessageProvider implements Provider<DOMSource> {
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/server/GreeterDOMSourcePayloadProvider.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/server/GreeterDOMSourcePayloadProvider.java?view=diff&rev=447827&r1=447826&r2=447827
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/server/GreeterDOMSourcePayloadProvider.java
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/server/GreeterDOMSourcePayloadProvider.java
Tue Sep 19 05:15:12 2006
@@ -30,9 +30,7 @@
import javax.xml.ws.Provider;
import javax.xml.ws.WebServiceProvider;
[EMAIL PROTECTED](portName = "SoapPort3", serviceName = "SOAPService3",
- targetNamespace =
"http://apache.org/hello_world_soap_http";,
- wsdlLocation = "file:./wsdl/hello_world.wsdl")
[EMAIL PROTECTED]()
public class GreeterDOMSourcePayloadProvider implements Provider<DOMSource> {
public GreeterDOMSourcePayloadProvider() {
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/server/GreeterSoapMessageProvider.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/server/GreeterSoapMessageProvider.java?view=diff&rev=447827&r1=447826&r2=447827
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/server/GreeterSoapMessageProvider.java
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/server/GreeterSoapMessageProvider.java
Tue Sep 19 05:15:12 2006
@@ -29,7 +29,7 @@
@WebServiceProvider(portName = "SoapPort1", serviceName = "SOAPService1",
targetNamespace =
"http://apache.org/hello_world_soap_http";,
- wsdlLocation = "file:./wsdl/hello_world.wsdl")
+ wsdlLocation = "wsdl/hello_world.wsdl")
@ServiceMode(value = Service.Mode.MESSAGE)
public class GreeterSoapMessageProvider implements Provider<SOAPMessage> {
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/server/Server.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/server/Server.java?view=diff&rev=447827&r1=447826&r2=447827
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/server/Server.java
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/src/demo/hwDispatch/server/Server.java
Tue Sep 19 05:15:12 2006
@@ -21,33 +21,33 @@
import javax.xml.ws.Endpoint;
public class Server {
-
- protected Server() throws Exception {
- System.out.println("Starting Server");
-
- System.out.println("Starting SoapService1");
- Object implementor = new GreeterSoapMessageProvider();
- String address = "http://localhost:9000/SoapContext/SoapPort1";;
- Endpoint.publish(address, implementor);
-
- System.out.println("Starting SoapService2");
- implementor = new GreeterDOMSourceMessageProvider();
- address = "http://localhost:9000/SoapContext/SoapPort2";;
- Endpoint.publish(address, implementor);
-
- System.out.println("Starting SoapService3");
- implementor = new GreeterDOMSourcePayloadProvider();
- address = "http://localhost:9000/SoapContext/SoapPort3";;
- Endpoint.publish(address, implementor);
- }
-
- public static void main(String args[]) throws Exception {
- new Server();
- System.out.println("Server ready...");
-
- Thread.sleep(5 * 60 * 1000);
- System.out.println("Server exiting");
- System.exit(0);
- }
-
-}
+
+ protected Server() throws Exception {
+ System.out.println("Starting Server");
+
+ System.out.println("Starting SoapService1");
+ Object implementor = new GreeterSoapMessageProvider();
+ String address = "http://localhost:9000/SoapContext/SoapPort1";;
+ Endpoint.publish(address, implementor);
+
+ System.out.println("Starting SoapService2");
+ implementor = new GreeterDOMSourceMessageProvider();
+ address = "http://localhost:9000/SoapContext/SoapPort2";;
+ Endpoint.publish(address, implementor);
+
+ System.out.println("Starting SoapService3");
+ implementor = new GreeterDOMSourcePayloadProvider();
+ address = "http://localhost:9000/SoapContext/SoapPort3";;
+ Endpoint.publish(address, implementor);
+ }
+
+ public static void main(String args[]) throws Exception {
+ new Server();
+ System.out.println("Server ready...");
+
+ Thread.sleep(5 * 60 * 1000);
+ System.out.println("Server exiting");
+ System.exit(0);
+ }
+
+}
Modified: incubator/cxf/trunk/jca/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/jca/pom.xml?view=diff&rev=447827&r1=447826&r2=447827
==============================================================================
--- incubator/cxf/trunk/jca/pom.xml (original)
+++ incubator/cxf/trunk/jca/pom.xml Tue Sep 19 05:15:12 2006
@@ -5,7 +5,7 @@
<artifactId>cxf-jca</artifactId>
<packaging>jar</packaging>
<version>2.0-incubator-M1-SNAPSHOT</version>
- <name>CeltiXfire JCA Connection</name>
+ <name>CXF JCA Connection</name>
<url>http://cwiki.apache.org/confluence/display/CXF/CeltiXfire+space</url>
<parent>
Modified: incubator/cxf/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/pom.xml?view=diff&rev=447827&r1=447826&r2=447827
==============================================================================
--- incubator/cxf/trunk/pom.xml (original)
+++ incubator/cxf/trunk/pom.xml Tue Sep 19 05:15:12 2006
@@ -168,6 +168,7 @@
<module>testutils</module>
<module>api</module>
<module>rt</module>
+ <module>jca</module>
<module>systests</module>
<module>integration</module>
</modules>
Modified:
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?view=diff&rev=447827&r1=447826&r2=447827
==============================================================================
---
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
(original)
+++
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
Tue Sep 19 05:15:12 2006
@@ -98,7 +98,7 @@
if (getService() != null) {
return;
}
- if (url != null) {
+ if (url != null && doInitWSDLOperations()) {
LOG.info("Creating Service " + getServiceQName() + " from WSDL.");
WSDLServiceFactory factory = new WSDLServiceFactory(getBus(), url,
getServiceQName());
@@ -127,6 +127,10 @@
}
}
+ protected boolean doInitWSDLOperations() {
+ return true;
+ }
+
protected void initializeWSDLOperations() {
Method[] methods = serviceClass.getMethods();
Arrays.sort(methods, new MethodComparator());
@@ -254,7 +258,7 @@
// initializeFaults(intf, op, method);
}
- protected QName getServiceQName() {
+ protected QName getServiceQName() {
if (serviceName == null) {
serviceName = new QName(getServiceNamespace(), getServiceName());
}
Modified:
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java?view=diff&rev=447827&r1=447826&r2=447827
==============================================================================
---
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
(original)
+++
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
Tue Sep 19 05:15:12 2006
@@ -100,6 +100,13 @@
server.start();
}
+ public boolean doInitWSDLOperations() {
+ if (implInfo != null) {
+ return !implInfo.isWebServiceProvider();
+ }
+ return true;
+ }
+
@Override
protected void initializeWSDLOperation(InterfaceInfo intf, OperationInfo
o, Method selected) {
super.initializeWSDLOperation(intf, o, selected);
@@ -166,11 +173,10 @@
try {
url = new URL(wsdlLocation);
} catch (MalformedURLException ex) {
- // LOG a warning instead of throw exception.
- // url =
- // implInfo.getImplementorClass().getResource(wsdlLocation);
if (url == null) {
- System.err.println("Can't resolve the wsdl location " +
wsdlLocation);
+ LOG.info("Can't resolve the wsdl location:"
+ + wsdlLocation
+ + " (the WSProvider may not need wsdl location)");
}
}
setWsdlURL(url);
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=447827&r1=447826&r2=447827
==============================================================================
---
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 Sep 19 05:15:12 2006
@@ -117,13 +117,14 @@
}
if (StringUtils.isEmpty(portName)) {
- portName = implementorClass.getSimpleName();
+ portName = implementorClass.getSimpleName() + "Port";
}
- if (!StringUtils.isEmpty(namespace) && !StringUtils.isEmpty(portName))
{
+ if (!StringUtils.isEmpty(portName)) {
return new QName(namespace, portName);
- }
- return null;
+ } else {
+ return new QName(namespace, "NoNamedPort");
+ }
}
private void initialise() {
