Skip to content
Permalink
Browse files
[CXF-5456] Use the port name for the impl. Not backportable.
git-svn-id: https://svn.apache.org/repos/asf/cxf/trunk@1550275 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
dkulp committed Dec 11, 2013
1 parent ec9c41e commit ba3ffb12d7c745e757c0c585268c5ae95e91afeb
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
@@ -126,7 +126,7 @@ private String getImplName(String port, String service, JavaInterface intf, Tool
}
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);
}
@@ -119,7 +119,7 @@ private String getImplName(String port, String service, JavaInterface intf, Tool
}
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);
}
@@ -126,7 +126,7 @@ public void testBug305773() throws Exception {
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 void testCXF1048() throws Exception {
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 void testCXF1939() throws Exception {
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")
@@ -283,7 +283,7 @@ public void testRPCLit() throws Exception {
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);

0 comments on commit ba3ffb1

Please sign in to comment.