Author: dkulp
Date: Wed Dec 11 21:34:48 2013
New Revision: 1550275
URL: http://svn.apache.org/r1550275
Log:
[CXF-5456] Use the port name for the impl. Not backportable.
Modified:
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ImplGenerator.java
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServerGenerator.java
cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
Modified:
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ImplGenerator.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ImplGenerator.java?rev=1550275&r1=1550274&r2=1550275&view=diff
==============================================================================
---
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ImplGenerator.java
(original)
+++
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ImplGenerator.java
Wed Dec 11 21:34:48 2013
@@ -126,7 +126,7 @@ public class ImplGenerator extends Abstr
}
String name = nm.get(service + "/" + port);
if (name == null) {
- name = intf.getName() + "Impl";
+ name = port + "Impl";
name = mapClassName(intf.getPackageName(), name, penv);
nm.put(service + "/" + port, name);
}
Modified:
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServerGenerator.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServerGenerator.java?rev=1550275&r1=1550274&r2=1550275&view=diff
==============================================================================
---
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServerGenerator.java
(original)
+++
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServerGenerator.java
Wed Dec 11 21:34:48 2013
@@ -119,7 +119,7 @@ public class ServerGenerator extends Abs
}
String name = nm.get(service + "/" + port);
if (name == null) {
- name = intf.getName() + "Impl";
+ name = port + "Impl";
name = mapClassName(intf.getPackageName(), name, penv);
nm.put(service + "/" + port, name);
}
Modified:
cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java?rev=1550275&r1=1550274&r2=1550275&view=diff
==============================================================================
---
cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
(original)
+++
cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
Wed Dec 11 21:34:48 2013
@@ -126,7 +126,7 @@ public class CodeGenBugTest extends Abst
env.put(ToolConstants.CFG_WSDLURL,
getLocation("/wsdl2java_wsdl/bug305773/hello_world.wsdl"));
processor.setContext(env);
processor.execute();
- Class<?> clz =
classLoader.loadClass("org.apache.cxf.w2j.hello_world_soap_http.GreeterImpl");
+ Class<?> clz =
classLoader.loadClass("org.apache.cxf.w2j.hello_world_soap_http.SoapPortImpl");
WebService webServiceAnn = AnnotationUtil.getPrivClassAnnotation(clz,
WebService.class);
assertTrue("Impl class should note generate name property value in
webService annotation",
@@ -1037,7 +1037,7 @@ public class CodeGenBugTest extends Abst
env.put(ToolConstants.CFG_WSDLURL,
getLocation("/wsdl2java_wsdl/cxf1048/test.wsdl"));
processor.setContext(env);
processor.execute();
- Class<?> clz =
classLoader.loadClass("org.apache.hello_world_soap_http.PingImpl");
+ Class<?> clz =
classLoader.loadClass("org.apache.hello_world_soap_http.PingSoapPortImpl");
WebService webServiceAnn = AnnotationUtil.getPrivClassAnnotation(clz,
WebService.class);
assertEquals("org.apache.hello_world_soap_http.Ping",
webServiceAnn.endpointInterface());
@@ -1104,8 +1104,8 @@ public class CodeGenBugTest extends Abst
WSDLToJava.main(args);
assertNotNull(output);
- assertTrue(new File(output,
"org/apache/cxf/w2j/hello_world_soap_http/GreeterImpl.java").exists());
- assertTrue(new File(output,
"org/apache/cxf/w2j/hello_world_soap_http/GreeterImpl1.java").exists());
+ assertTrue(new File(output,
"org/apache/cxf/w2j/hello_world_soap_http/Soap_PortImpl.java").exists());
+ assertTrue(new File(output,
"org/apache/cxf/w2j/hello_world_soap_http/SoapPortImpl.java").exists());
assertTrue(new File(output,
"org/apache/cxf/w2j/hello_world_soap_http/TestServiceName.java").exists());
assertTrue(new File(output,
"org/apache/cxf/w2j/hello_world_soap_http/TestServiceName1.java")
Modified:
cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java?rev=1550275&r1=1550274&r2=1550275&view=diff
==============================================================================
---
cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
(original)
+++
cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
Wed Dec 11 21:34:48 2013
@@ -283,7 +283,7 @@ public class CodeGenTest extends Abstrac
Method method = clz.getMethod("sendReceiveData", new Class[]
{paraClass});
assertEquals("MyComplexStruct",
method.getReturnType().getSimpleName());
- clz =
classLoader.loadClass("org.apache.cxf.w2j.hello_world_rpclit.GreeterRPCLitImpl");
+ clz =
classLoader.loadClass("org.apache.cxf.w2j.hello_world_rpclit.SoapPortRPCLitImpl");
assertNotNull(clz);
ws = AnnotationUtil.getPrivClassAnnotation(clz,
javax.jws.WebService.class);
assertNotNull(ws);
