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 2008/02/12 21:51:09 UTC
svn commit: r627095 [2/3] - in /incubator/cxf/trunk:
api/src/main/java/org/apache/cxf/service/model/
maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/
rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/
rt/bindings/corba...
Modified: incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java?rev=627095&r1=627094&r2=627095&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java (original)
+++ incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java Tue Feb 12 12:50:56 2008
@@ -69,7 +69,7 @@
}
@Test
- public void testDocLitWrappedWithWrapperClass() {
+ public void testDocLitWrappedWithWrapperClass() throws Exception {
builder.setServiceClass(org.apache.cxf.tools.fortest.withannotation.doc.StockWrapped.class);
ServiceInfo service = builder.createService();
generator.setServiceModel(service);
@@ -80,7 +80,7 @@
String expectedFile = this.getClass()
.getResource("expected/expected_doc_lit_wrapped_with_wrapperclass.wsdl").getFile();
- assertFileEquals(expectedFile, output.getAbsolutePath());
+ assertWsdlEquals(new File(expectedFile), output);
}
@Test
@@ -130,7 +130,7 @@
String expectedFile = this.getClass().getResource("expected/expected_doc_lit_wrapped_localName.wsdl")
.getFile();
- assertFileEquals(expectedFile, output.getAbsolutePath());
+ assertWsdlEquals(new File(expectedFile), output);
}
@Test
@@ -251,7 +251,7 @@
assertTrue(file.exists());
String expectedFile = this.getClass().getResource("expected/soap_header.wsdl").getFile();
- assertFileEquals(new File(expectedFile), file);
+ assertWsdlEquals(new File(expectedFile), file);
}
// TODO: assertFileEquals
@@ -291,7 +291,7 @@
assertTrue(s.indexOf("EchoPort") != -1);
String expectedFile = this.getClass()
.getResource("expected/expected_rpclist_no_sei.wsdl").getFile();
- assertFileEquals(expectedFile, output.getAbsolutePath());
+ assertWsdlEquals(new File(expectedFile), output);
}
@Test
Modified: incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java?rev=627095&r1=627094&r2=627095&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java Tue Feb 12 12:50:56 2008
@@ -26,6 +26,7 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -146,7 +147,7 @@
// TODO: wsdl2.0 support
}
}
- Map<String, InterfaceInfo> interfaces = new HashMap<String, InterfaceInfo>();
+ Map<String, InterfaceInfo> interfaces = new LinkedHashMap<String, InterfaceInfo>();
Map<String, Element> schemas = (Map<String, Element>)serviceList.get(0)
.getProperty(WSDLServiceBuilder.WSDL_SCHEMA_ELEMENT_LIST);
Modified: incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java?rev=627095&r1=627094&r2=627095&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java Tue Feb 12 12:50:56 2008
@@ -59,11 +59,8 @@
private Map<String, Plugin> plugins = new LinkedHashMap<String, Plugin>();
private Map<String, FrontEnd> frontends = new LinkedHashMap<String, FrontEnd>();
- private Map<String, FrontEndProfile> frontendProfiles = new LinkedHashMap<String, FrontEndProfile>();
private Map<String, DataBinding> databindings = new LinkedHashMap<String, DataBinding>();
- private Map<String, DataBindingProfile> databindingProfiles
- = new LinkedHashMap<String, DataBindingProfile>();
private Unmarshaller unmarshaller;
@@ -389,30 +386,24 @@
}
public FrontEndProfile getFrontEndProfile(String name) {
- FrontEndProfile profile = frontendProfiles.get(name);
- if (profile == null) {
-
- FrontEnd frontend = getFrontEnd(name);
-
- profile = loadFrontEndProfile(getFrontEndProfileClass(frontend));
+ FrontEndProfile profile = null;
+ FrontEnd frontend = getFrontEnd(name);
- for (FrontEndGenerator generator : getFrontEndGenerators(frontend)) {
- profile.registerGenerator(generator);
- }
-
- if (frontend.getProcessor() != null) {
- profile.setProcessor(loadProcessor(getProcessorClass(frontend)));
- }
- if (frontend.getContainer() != null) {
- profile.setContainerClass(loadContainerClass(getContainerClass(frontend)));
- profile.setToolspec(getToolspec(frontend));
- }
- if (frontend.getBuilder() != null) {
- profile.setWSDLBuilder(loadBuilder(getBuilderClass(frontend)));
- }
+ profile = loadFrontEndProfile(getFrontEndProfileClass(frontend));
+ for (FrontEndGenerator generator : getFrontEndGenerators(frontend)) {
+ profile.registerGenerator(generator);
+ }
- frontendProfiles.put(name, profile);
+ if (frontend.getProcessor() != null) {
+ profile.setProcessor(loadProcessor(getProcessorClass(frontend)));
+ }
+ if (frontend.getContainer() != null) {
+ profile.setContainerClass(loadContainerClass(getContainerClass(frontend)));
+ profile.setToolspec(getToolspec(frontend));
+ }
+ if (frontend.getBuilder() != null) {
+ profile.setWSDLBuilder(loadBuilder(getBuilderClass(frontend)));
}
return profile;
}
@@ -439,12 +430,9 @@
}
public DataBindingProfile getDataBindingProfile(String name) {
- DataBindingProfile profile = databindingProfiles.get(name);
- if (profile == null) {
- DataBinding databinding = getDataBinding(name);
- profile = loadDataBindingProfile(databinding.getPackage() + "." + databinding.getProfile());
- databindingProfiles.put(name, profile);
- }
+ DataBindingProfile profile = null;
+ DataBinding databinding = getDataBinding(name);
+ profile = loadDataBindingProfile(databinding.getPackage() + "." + databinding.getProfile());
return profile;
}
Modified: incubator/cxf/trunk/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java?rev=627095&r1=627094&r2=627095&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java Tue Feb 12 12:50:56 2008
@@ -25,6 +25,7 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -127,7 +128,7 @@
// TODO: wsdl2.0 support
}
}
- Map<String, InterfaceInfo> interfaces = new HashMap<String, InterfaceInfo>();
+ Map<String, InterfaceInfo> interfaces = new LinkedHashMap<String, InterfaceInfo>();
Map<String, Element> schemas = (Map<String, Element>)serviceList.get(0)
.getProperty(WSDLServiceBuilder.WSDL_SCHEMA_ELEMENT_LIST);
Modified: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/WSDLToJavaProcessor.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/WSDLToJavaProcessor.java?rev=627095&r1=627094&r2=627095&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/WSDLToJavaProcessor.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/WSDLToJavaProcessor.java Tue Feb 12 12:50:56 2008
@@ -21,7 +21,7 @@
import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import javax.xml.namespace.QName;
@@ -42,7 +42,7 @@
import org.apache.cxf.tools.wsdlto.frontend.jaxws.processor.internal.annotator.XmlSeeAlsoAnnotator;
public class WSDLToJavaProcessor extends WSDLToProcessor implements ClassNameProcessor {
- private static final String MODEL_MAP = WSDLToProcessor.class.getName()
+ public static final String MODEL_MAP = WSDLToProcessor.class.getName()
+ ".MODEL_MAP";
@@ -70,7 +70,7 @@
JavaModel javaModel = null;
Map<QName, JavaModel> map = CastUtils.cast((Map)context.get(MODEL_MAP));
if (map == null) {
- map = new HashMap<QName, JavaModel>();
+ map = new LinkedHashMap<QName, JavaModel>();
context.put(MODEL_MAP, map);
}
if (map.containsKey(serviceInfo.getName())) {
Modified: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.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/ParameterProcessor.java?rev=627095&r1=627094&r2=627095&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java Tue Feb 12 12:50:56 2008
@@ -20,8 +20,8 @@
package org.apache.cxf.tools.wsdlto.frontend.jaxws.processor.internal;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.Iterator;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.logging.Level;
@@ -496,7 +496,7 @@
List<String> parameterList) throws ToolException {
Map<QName, MessagePartInfo> inputPartsMap = inputMessage.getMessagePartsMap();
- Map<QName, MessagePartInfo> outputPartsMap = new HashMap<QName, MessagePartInfo>();
+ Map<QName, MessagePartInfo> outputPartsMap = new LinkedHashMap<QName, MessagePartInfo>();
if (outputMessage != null) {
outputPartsMap = outputMessage.getMessagePartsMap();
Modified: incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java?rev=627095&r1=627094&r2=627095&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java Tue Feb 12 12:50:56 2008
@@ -98,7 +98,7 @@
env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/bug305773/hello_world.wsdl"));
processor.setContext(env);
processor.execute();
- Class clz = classLoader.loadClass("org.apache.hello_world_soap_http.GreeterImpl");
+ Class clz = classLoader.loadClass("org.apache.cxf.w2j.hello_world_soap_http.GreeterImpl");
WebService webServiceAnn = AnnotationUtil.getPrivClassAnnotation(clz, WebService.class);
assertEquals("Greeter", webServiceAnn.name());
@@ -122,7 +122,8 @@
@Test
public void testNamespacePackageMapping1() throws Exception {
- env.addNamespacePackageMap("http://apache.org/hello_world_soap_http/types", "org.apache.types");
+ env.addNamespacePackageMap("http://cxf.apache.org/w2j/hello_world_soap_http/types",
+ "org.apache.types");
env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world.wsdl"));
processor.setContext(env);
processor.execute();
@@ -145,8 +146,9 @@
@Test
public void testNamespacePackageMapping2() throws Exception {
- env.addNamespacePackageMap("http://apache.org/hello_world_soap_http", "org.apache");
- env.addNamespacePackageMap("http://apache.org/hello_world_soap_http/types", "org.apache.types");
+ env.addNamespacePackageMap("http://cxf.apache.org/w2j/hello_world_soap_http", "org.apache");
+ env.addNamespacePackageMap("http://cxf.apache.org/w2j/hello_world_soap_http/types",
+ "org.apache.types");
env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world.wsdl"));
processor.setContext(env);
processor.execute();
@@ -217,7 +219,7 @@
File iona = new File(com, "iona");
assertFalse("Generated file has been excluded", iona.exists());
- File implFile = new File(output, "org/apache/hello_world_soap_http/Greeter.java");
+ File implFile = new File(output, "org/apache/cxf/w2j/hello_world_soap_http/Greeter.java");
String str = FileUtils.getStringFromFile(implFile);
assertTrue(str.indexOf("com.iona.BareDocumentResponse") > 0);
@@ -315,7 +317,7 @@
}
try {
Class clz = classLoader
- .loadClass("org.apache.hello_world_soap_http.types.CreateProcess$MyProcess");
+ .loadClass("org.apache.cxf.w2j.hello_world_soap_http.types.CreateProcess$MyProcess");
assertNotNull("Customization binding code should be generated", clz);
} catch (ClassNotFoundException e) {
fail("Can not load the inner class MyProcess, the customization failed: \n" + e.getMessage());
@@ -336,7 +338,7 @@
}
try {
Class clz = classLoader
- .loadClass("org.apache.hello_world_soap_http.types.CreateProcess$MyProcess");
+ .loadClass("org.apache.cxf.w2j.hello_world_soap_http.types.CreateProcess$MyProcess");
assertNotNull("Customization binding code should be generated", clz);
} catch (ClassNotFoundException e) {
e.printStackTrace();
@@ -362,9 +364,9 @@
env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/helloworld_noservice_import.wsdl"));
processor.setContext(env);
processor.execute();
- Class cls = classLoader.loadClass("org.apache.hello_world1.Greeter");
+ Class cls = classLoader.loadClass("org.apache.cxf.w2j.hello_world1.Greeter");
assertNotNull(cls);
- cls = classLoader.loadClass("org.apache.hello_world2.Greeter2");
+ cls = classLoader.loadClass("org.apache.cxf.w2j.hello_world2.Greeter2");
}
@Test
@@ -375,11 +377,14 @@
processor.setContext(env);
processor.execute();
- Class clz = classLoader.loadClass("org.apache.hello_world_soap_http.service.SOAPServiceTest1");
+ Class clz = classLoader
+ .loadClass("org.apache.cxf.w2j.hello_world_soap_http.service.SOAPServiceTest1");
WebServiceClient webServiceClient = AnnotationUtil
.getPrivClassAnnotation(clz, WebServiceClient.class);
- assertEquals("http://apache.org/hello_world_soap_http/service", webServiceClient.targetNamespace());
- File file = new File(output, "org/apache/hello_world_soap_http/Greeter_SoapPortTest1_Client.java");
+ assertEquals("http://cxf.apache.org/w2j/hello_world_soap_http/service",
+ webServiceClient.targetNamespace());
+ File file = new File(output,
+ "org/apache/cxf/w2j/hello_world_soap_http/Greeter_SoapPortTest1_Client.java");
FileInputStream fin = new FileInputStream(file);
byte[] buffer = new byte[30000];
int index = -1;
@@ -388,7 +393,7 @@
while (size != -1) {
bout.write(buffer, 0, size);
index = bout.toString()
- .indexOf("new QName(\"http://apache.org/hello_world_soap_http/service\","
+ .indexOf("new QName(\"http://cxf.apache.org/w2j/hello_world_soap_http/service\","
+ " \"SOAPService_Test1\")");
if (index > 0) {
break;
@@ -510,7 +515,8 @@
WSDLToJava.main(args);
assertFileEquals(getClass().getResource("expected/expected_hello_mime").getFile(),
- output.getCanonicalPath() + "/org/apache/hello_world_mime/Hello.java");
+ output.getCanonicalPath()
+ + "/org/apache/cxf/w2j/hello_world_mime/Hello.java");
}
@Test
@@ -538,7 +544,7 @@
processor.execute();
- Class clz = classLoader.loadClass("org.apache.hello_world_soap_http.Greeter");
+ Class clz = classLoader.loadClass("org.apache.cxf.w2j.hello_world_soap_http.Greeter");
assertEquals(3, clz.getDeclaredMethods().length);
}
@@ -554,15 +560,17 @@
processor.setContext(env);
processor.execute();
- File file = new File(output, "org/apache/hello_world_soap_http");
+ File file = new File(output, "org/apache/cxf/w2j/hello_world_soap_http");
assertEquals(4, file.list().length);
- file = new File(output, "org/apache/hello_world_soap_http/DocLitBare_DocLitBarePort_Client.java");
+ file = new File(output,
+ "org/apache/cxf/w2j/hello_world_soap_http/DocLitBare_DocLitBarePort_Client.java");
assertTrue("DocLitBare_DocLitBarePort_Client is not found", file.exists());
- file = new File(output, "org/apache/hello_world_soap_http/DocLitBare_DocLitBarePort_Server.java");
+ file = new File(output,
+ "org/apache/cxf/w2j/hello_world_soap_http/DocLitBare_DocLitBarePort_Server.java");
assertTrue("DocLitBare_DocLitBarePort_Server is not found", file.exists());
- file = new File(output, "org/apache/hello_world_soap_http/Greeter_GreeterPort_Client.java");
+ file = new File(output, "org/apache/cxf/w2j/hello_world_soap_http/Greeter_GreeterPort_Client.java");
assertTrue("Greeter_GreeterPort_Client is not found", file.exists());
- file = new File(output, "org/apache/hello_world_soap_http/Greeter_GreeterPort_Server.java");
+ file = new File(output, "org/apache/cxf/w2j/hello_world_soap_http/Greeter_GreeterPort_Server.java");
assertTrue("Greeter_GreeterPort_Server is not found", file.exists());
}
@@ -582,7 +590,7 @@
processor.setContext(env);
processor.execute();
- File file = new File(output, "org/apache/hello_world_soap_http/MyService.java");
+ File file = new File(output, "org/apache/cxf/w2j/hello_world_soap_http/MyService.java");
assertTrue("MyService is not found", file.exists());
}
@@ -595,10 +603,10 @@
processor.setContext(env);
processor.execute();
- File file = new File(output, "org/apache/hello_world_soap_http/SOAPService.java");
+ File file = new File(output, "org/apache/cxf/w2j/hello_world_soap_http/SOAPService.java");
assertTrue("SOAPService is not found", file.exists());
- file = new File(output, "org/apache/hello_world_soap_http/MyService.java");
+ file = new File(output, "org/apache/cxf/w2j/hello_world_soap_http/MyService.java");
assertFalse("MyService should not be generated", file.exists());
}
@@ -614,8 +622,9 @@
fail("exception should be thrown");
} catch (Exception e) {
String expectedErrorMsg = "Part <in> in Message "
- + "<{http://apache.org/hello_world_soap_http}greetMeRequest> referenced Type "
- + "<{http://apache.org/hello_world_soap_http/types}greetMee> can not be found in the schemas";
+ + "<{http://cxf.apache.org/w2j/hello_world_soap_http}greetMeRequest> referenced Type "
+ + "<{http://cxf.apache.org/w2j/hello_world_soap_http/types}greetMee> can not be "
+ + "found in the schemas";
assertTrue("Fail to create java parameter exception should be thrown",
e.getMessage().indexOf(expectedErrorMsg) > -1);
}
@@ -633,10 +642,10 @@
processor.execute();
File file = new File(output.getCanonicalPath() + "/build.xml");
String str = FileUtils.getStringFromFile(file);
- assertTrue(str.indexOf("org.apache.hello_world_soap_http.Greeter_SoapPortTest1_Client") > -1);
- assertTrue(str.indexOf("org.apache.hello_world_soap_http.Greeter_SoapPortTest2_Client") > -1);
- assertTrue(str.indexOf("org.apache.hello_world_soap_http.Greeter_SoapPortTest1_Server") > -1);
- assertTrue(str.indexOf("org.apache.hello_world_soap_http.Greeter_SoapPortTest2_Server") > -1);
+ assertTrue(str.indexOf("org.apache.cxf.w2j.hello_world_soap_http.Greeter_SoapPortTest1_Client") > -1);
+ assertTrue(str.indexOf("org.apache.cxf.w2j.hello_world_soap_http.Greeter_SoapPortTest2_Client") > -1);
+ assertTrue(str.indexOf("org.apache.cxf.w2j.hello_world_soap_http.Greeter_SoapPortTest1_Server") > -1);
+ assertTrue(str.indexOf("org.apache.cxf.w2j.hello_world_soap_http.Greeter_SoapPortTest2_Server") > -1);
}
@Test
@@ -751,10 +760,10 @@
processor.setContext(env);
processor.execute();
Class clz = classLoader
- .loadClass("org.apache.hello_world.messages.CustomizedFault");
+ .loadClass("org.apache.cxf.w2j.hello_world.messages.CustomizedFault");
assertNotNull("Customization Fault Class is not generated", clz);
Class serviceClz = classLoader
- .loadClass("org.apache.hello_world.services.CustomizedService");
+ .loadClass("org.apache.cxf.w2j.hello_world.services.CustomizedService");
assertNotNull("Customization Fault Class is not generated", serviceClz);
}
@@ -767,7 +776,7 @@
processor.setContext(env);
processor.execute();
- Class clz = classLoader.loadClass("org.apache.hello_world_soap_http.Greeter");
+ Class<?> clz = classLoader.loadClass("org.apache.cxf.w2j.hello_world_soap_http.Greeter");
Method method1 = clz.getMethod("greetMeSometimeAsync", new Class[] {java.lang.String.class,
javax.xml.ws.AsyncHandler.class});
@@ -796,7 +805,8 @@
env.put(ToolConstants.CFG_BINDING, getLocation("/wsdl2java_wsdl/cxf1094/jaxbbinding.xml"));
processor.setContext(env);
processor.execute();
- Class clz = classLoader.loadClass("org.apache.hello_world_soap_http.types.CreateProcess$MyProcess");
+ Class clz = classLoader
+ .loadClass("org.apache.cxf.w2j.hello_world_soap_http.types.CreateProcess$MyProcess");
assertNotNull("Failed to generate customized class for hello_world.wsdl" , clz);
env.put(ToolConstants.CFG_WSDLURL,
@@ -817,7 +827,7 @@
processor.setContext(env);
processor.execute();
Class clz = classLoader
- .loadClass("org.apache.hello_world_soap_http.Greeter");
+ .loadClass("org.apache.cxf.w2j.hello_world_soap_http.Greeter");
assertNotNull("Failed to generate SEI class", clz);
Method[] methods = clz.getMethods();
assertEquals("jaxws binding file parse error, number of generated method is not expected"
@@ -896,7 +906,7 @@
processor.execute();
File file = new File(output, "org/mypkg");
assertEquals(23, file.listFiles().length);
- Class clz = classLoader.loadClass("org.mypkg.MyService");
+ Class<?> clz = classLoader.loadClass("org.mypkg.MyService");
assertNotNull("Customized service class is not found", clz);
clz = classLoader.loadClass("org.mypkg.MyGreeter");
assertNotNull("Customized SEI class is not found", clz);
Modified: incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenOptionTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenOptionTest.java?rev=627095&r1=627094&r2=627095&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenOptionTest.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenOptionTest.java Tue Feb 12 12:50:56 2008
@@ -76,7 +76,7 @@
processor.execute();
Class greeterServer = classLoader
- .loadClass("org.apache.hello_world_soap_http.Greeter_SoapPort_Server");
+ .loadClass("org.apache.cxf.w2j.hello_world_soap_http.Greeter_SoapPort_Server");
assertNotNull("Server should be generated", greeterServer);
}
@@ -91,7 +91,7 @@
processor.execute();
Class greeterServer = classLoader
- .loadClass("org.apache.hello_world_soap_http.Greeter_SoapPort_Server");
+ .loadClass("org.apache.cxf.w2j.hello_world_soap_http.Greeter_SoapPort_Server");
assertNotNull("Server should be generated", greeterServer);
}
@@ -110,7 +110,7 @@
File apache = new File(org, "apache");
assertTrue(apache.exists());
- Class clz = classLoader.loadClass("org.apache.hello_world_async_soap_http.GreeterAsync");
+ Class clz = classLoader.loadClass("org.apache.cxf.w2j.hello_world_async_soap_http.GreeterAsync");
assertEquals(3, clz.getMethods().length);
}
@@ -124,7 +124,7 @@
processor.setContext(env);
processor.execute();
- File file = new File(output, "org/apache/hello_world_soap_http");
+ File file = new File(output, "org/apache/cxf/w2j/hello_world_soap_http");
assertEquals(2, file.list().length);
}
Modified: incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java?rev=627095&r1=627094&r2=627095&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java Tue Feb 12 12:50:56 2008
@@ -257,7 +257,11 @@
assertTrue(org.exists());
File apache = new File(org, "apache");
assertTrue(apache.exists());
- File helloworldsoaphttp = new File(apache, "hello_world_rpclit");
+ File cxf = new File(apache, "cxf");
+ assertTrue(cxf.exists());
+ File w2j = new File(cxf, "w2j");
+ assertTrue(w2j.exists());
+ File helloworldsoaphttp = new File(w2j, "hello_world_rpclit");
assertTrue(helloworldsoaphttp.exists());
File types = new File(helloworldsoaphttp, "types");
assertTrue(types.exists());
@@ -267,27 +271,28 @@
files = types.listFiles();
assertEquals(files.length, 3);
- Class<?> clz = classLoader.loadClass("org.apache.hello_world_rpclit.GreeterRPCLit");
+ Class<?> clz = classLoader.loadClass("org.apache.cxf.w2j.hello_world_rpclit.GreeterRPCLit");
javax.jws.WebService ws = AnnotationUtil.getPrivClassAnnotation(clz, javax.jws.WebService.class);
SOAPBinding soapBindingAnno = AnnotationUtil.getPrivClassAnnotation(clz, SOAPBinding.class);
assertEquals("LITERAL", soapBindingAnno.use().toString());
assertEquals("RPC", soapBindingAnno.style().toString());
-
+
assertEquals("Generate operation error", 3, clz.getMethods().length);
- Class<?> paraClass = classLoader.loadClass("org.apache.hello_world_rpclit.types.MyComplexStruct");
+ Class<?> paraClass = classLoader
+ .loadClass("org.apache.cxf.w2j.hello_world_rpclit.types.MyComplexStruct");
Method method = clz.getMethod("sendReceiveData", new Class[] {paraClass});
assertEquals("MyComplexStruct", method.getReturnType().getSimpleName());
- clz = classLoader.loadClass("org.apache.hello_world_rpclit.GreeterRPCLitImpl");
+ clz = classLoader.loadClass("org.apache.cxf.w2j.hello_world_rpclit.GreeterRPCLitImpl");
assertNotNull(clz);
ws = AnnotationUtil.getPrivClassAnnotation(clz, javax.jws.WebService.class);
assertNotNull(ws);
assertTrue("Webservice annotation wsdlLocation should begin with file", ws.wsdlLocation()
.startsWith("file"));
- assertEquals("org.apache.hello_world_rpclit.GreeterRPCLit", ws.endpointInterface());
+ assertEquals("org.apache.cxf.w2j.hello_world_rpclit.GreeterRPCLit", ws.endpointInterface());
assertEquals("GreeterRPCLit", ws.name());
}
@@ -304,13 +309,17 @@
assertTrue(org.exists());
File apache = new File(org, "apache");
assertTrue(apache.exists());
- File async = new File(apache, "hello_world_async_soap_http");
+ File cxf = new File(apache, "cxf");
+ assertTrue(cxf.exists());
+ File w2j = new File(cxf, "w2j");
+ assertTrue(w2j.exists());
+ File async = new File(w2j, "hello_world_async_soap_http");
assertTrue(async.exists());
File[] files = async.listFiles();
assertEquals(4, files.length);
- Class<?> clz = classLoader.loadClass("org.apache.hello_world_async_soap_http.GreeterAsync");
+ Class<?> clz = classLoader.loadClass("org.apache.cxf.w2j.hello_world_async_soap_http.GreeterAsync");
Method method1 = clz.getMethod("greetMeSometimeAsync", new Class[] {java.lang.String.class,
javax.xml.ws.AsyncHandler.class});
@@ -339,7 +348,11 @@
assertTrue(org.exists());
File apache = new File(org, "apache");
assertTrue(apache.exists());
- File helloworldsoaphttp = new File(apache, "hello_world_soap12_http");
+ File cxf = new File(apache, "cxf");
+ assertTrue(cxf.exists());
+ File w2j = new File(cxf, "w2j");
+ assertTrue(w2j.exists());
+ File helloworldsoaphttp = new File(w2j, "hello_world_soap12_http");
assertTrue(helloworldsoaphttp.exists());
File types = new File(helloworldsoaphttp, "types");
assertTrue(types.exists());
@@ -348,7 +361,7 @@
files = types.listFiles();
assertEquals(7, files.length);
- Class<?> clz = classLoader.loadClass("org.apache.hello_world_soap12_http.Greeter");
+ Class<?> clz = classLoader.loadClass("org.apache.cxf.w2j.hello_world_soap12_http.Greeter");
assertTrue("class " + clz.getName() + " modifier is not public", Modifier
.isPublic(clz.getModifiers()));
assertTrue("class " + clz.getName() + " modifier is interface", Modifier.isInterface(clz
@@ -368,7 +381,8 @@
RequestWrapper requestWrapperAnn = AnnotationUtil.getPrivMethodAnnotation(method,
RequestWrapper.class);
- assertEquals("org.apache.hello_world_soap12_http.types.SayHi", requestWrapperAnn.className());
+ assertEquals("org.apache.cxf.w2j.hello_world_soap12_http.types.SayHi",
+ requestWrapperAnn.className());
ResponseWrapper resposneWrapperAnn = AnnotationUtil.getPrivMethodAnnotation(method,
ResponseWrapper.class);
@@ -388,7 +402,8 @@
}
Class[] exceptionCls = method.getExceptionTypes();
assertEquals(1, exceptionCls.length);
- assertEquals("org.apache.hello_world_soap12_http.PingMeFault", exceptionCls[0].getName());
+ assertEquals("org.apache.cxf.w2j.hello_world_soap12_http.PingMeFault",
+ exceptionCls[0].getName());
}
@Test
@@ -403,7 +418,11 @@
assertTrue(org.exists());
File apache = new File(org, "apache");
assertTrue(apache.exists());
- File helloworldsoaphttp = new File(apache, "hello_world_soap_http");
+ File cxf = new File(apache, "cxf");
+ assertTrue(cxf.exists());
+ File w2j = new File(cxf, "w2j");
+ assertTrue(w2j.exists());
+ File helloworldsoaphttp = new File(w2j, "hello_world_soap_http");
assertTrue(helloworldsoaphttp.exists());
File types = new File(helloworldsoaphttp, "types");
assertTrue(types.exists());
@@ -412,7 +431,7 @@
files = types.listFiles();
assertEquals(17, files.length);
- Class<?> clz = classLoader.loadClass("org.apache.hello_world_soap_http.Greeter");
+ Class<?> clz = classLoader.loadClass("org.apache.cxf.w2j.hello_world_soap_http.Greeter");
assertTrue("class " + clz.getName() + " modifier is not public", Modifier
.isPublic(clz.getModifiers()));
assertTrue("class " + clz.getName() + " modifier is interface", Modifier.isInterface(clz
@@ -432,7 +451,7 @@
RequestWrapper requestWrapperAnn = AnnotationUtil.getPrivMethodAnnotation(method,
RequestWrapper.class);
- assertEquals("org.apache.hello_world_soap_http.types.SayHi", requestWrapperAnn.className());
+ assertEquals("org.apache.cxf.w2j.hello_world_soap_http.types.SayHi", requestWrapperAnn.className());
ResponseWrapper resposneWrapperAnn = AnnotationUtil.getPrivMethodAnnotation(method,
ResponseWrapper.class);
@@ -447,7 +466,7 @@
assertEquals("String", method.getReturnType().getSimpleName());
WebParam webParamAnn = AnnotationUtil.getWebParam(method, "requestType");
//if is wrapped, tns should be empty
- assertEquals("http://apache.org/hello_world_soap_http/types", webParamAnn.targetNamespace());
+ assertEquals("http://cxf.apache.org/w2j/hello_world_soap_http/types", webParamAnn.targetNamespace());
//assertEquals("", webParamAnn.targetNamespace());
method = clz.getMethod("greetMeOneWay", new Class[] {String.class});
Oneway oneWayAnn = AnnotationUtil.getPrivMethodAnnotation(method, Oneway.class);
@@ -489,7 +508,12 @@
assertTrue(org.exists());
File apache = new File(org, "apache");
assertTrue(apache.exists());
- File helloworldsoaphttp = new File(apache, "hello_world_soap_http");
+ File cxf = new File(apache, "cxf");
+ assertTrue(cxf.exists());
+ File w2j = new File(cxf, "w2j");
+ assertTrue(w2j.exists());
+
+ File helloworldsoaphttp = new File(w2j, "hello_world_soap_http");
assertTrue(helloworldsoaphttp.exists());
File types = new File(helloworldsoaphttp, "types");
assertTrue(types.exists());
@@ -498,7 +522,7 @@
files = types.listFiles();
assertEquals(17, files.length);
- Class<?> clz = classLoader.loadClass("org.apache.hello_world_soap_http.types.SayHi");
+ Class<?> clz = classLoader.loadClass("org.apache.cxf.w2j.hello_world_soap_http.types.SayHi");
Method method = clz.getMethod("dummy", new Class[] {});
assertTrue("method declared on SayHi", method.getDeclaringClass().equals(clz));
}
@@ -580,9 +604,12 @@
assertTrue(org.exists());
File apache = new File(org, "apache");
assertTrue(apache.exists());
- File[] files = apache.listFiles();
- assertEquals(2, files.length);
- File helloworldsoaphttp = new File(apache, "hello_world_soap_http");
+ File cxf = new File(apache, "cxf");
+ assertTrue(cxf.exists());
+ File w2j = new File(cxf, "w2j");
+ assertTrue(w2j.exists());
+ File[] files = w2j.listFiles();
+ File helloworldsoaphttp = new File(w2j, "hello_world_soap_http");
assertTrue(helloworldsoaphttp.exists());
File types = new File(helloworldsoaphttp, "types");
assertTrue(types.exists());
@@ -741,7 +768,7 @@
processor.setContext(env);
processor.execute();
- Class<?> clz = classLoader.loadClass("org.apache.hello_world_holder.Greeter");
+ Class<?> clz = classLoader.loadClass("org.apache.cxf.w2j.hello_world_holder.Greeter");
assertEquals(1, clz.getMethods().length);
SOAPBinding soapBindingAnno = AnnotationUtil.getPrivClassAnnotation(clz, SOAPBinding.class);
@@ -749,7 +776,7 @@
assertEquals("LITERAL", soapBindingAnno.use().name());
assertEquals("DOCUMENT", soapBindingAnno.style().name());
- Class<?> para = classLoader.loadClass("org.apache.hello_world_holder.types.GreetMe");
+ Class<?> para = classLoader.loadClass("org.apache.cxf.w2j.hello_world_holder.types.GreetMe");
Method method = clz.getMethod("sayHi", new Class[] {Holder.class, para});
assertEquals("GreetMeResponse", method.getReturnType().getSimpleName());
@@ -763,7 +790,7 @@
@Test
public void testWSAddress() throws Exception {
- env.addNamespacePackageMap("http://apache.org/hello_world_soap_http", "ws.address");
+ env.addNamespacePackageMap("http://cxf.apache.org/w2j/hello_world_soap_http", "ws.address");
env.put(ToolConstants.CFG_BINDING, getLocation("/wsdl2java_wsdl/ws_address_binding.wsdl"));
env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world_addr.wsdl"));
@@ -835,17 +862,22 @@
File apache = new File(org, "apache");
assertTrue(apache.exists());
+ File cxf = new File(apache, "cxf");
+ assertTrue(cxf.exists());
+ File w2j = new File(cxf, "w2j");
+ assertTrue(w2j.exists());
- File helloWorld = new File(apache, "hello_world");
+ File helloWorld = new File(w2j, "hello_world");
assertTrue(helloWorld.exists());
- Class<?> clz = classLoader.loadClass("org.apache.hello_world.Greeter");
+ Class<?> clz = classLoader.loadClass("org.apache.cxf.w2j.hello_world.Greeter");
assertEquals(3, clz.getMethods().length);
Method method = clz.getMethod("pingMe", new Class[] {});
assertEquals("void", method.getReturnType().getSimpleName());
assertEquals("Exception class is not generated ", 1, method.getExceptionTypes().length);
- assertEquals("org.apache.hello_world.messages.PingMeFault", method.getExceptionTypes()[0]
+ assertEquals("org.apache.cxf.w2j.hello_world.messages.PingMeFault",
+ method.getExceptionTypes()[0]
.getCanonicalName());
}
@@ -939,7 +971,7 @@
processor.setContext(env);
processor.execute();
- Class<?> clz = classLoader.loadClass("org.apache.hello_world_doc_lit.Greeter");
+ Class<?> clz = classLoader.loadClass("org.apache.cxf.w2j.hello_world_doc_lit.Greeter");
Method method = clz.getMethod("greetMe", new Class[] {java.lang.String.class});
assertNotNull("greetMe is not be generated", method);
@@ -961,8 +993,8 @@
processor.setContext(env);
processor.execute();
- Class<?> clz = classLoader.loadClass("org.apache.hello_world_soap_http.Greeter");
- Class<?> sayHi = classLoader.loadClass("org.apache.hello_world_soap_http.types.SayHi");
+ Class<?> clz = classLoader.loadClass("org.apache.cxf.w2j.hello_world_soap_http.Greeter");
+ Class<?> sayHi = classLoader.loadClass("org.apache.cxf.w2j.hello_world_soap_http.types.SayHi");
Method method = clz.getMethod("_do", new Class[] {sayHi});
assertNotNull("method which name contains java keywords is not be generated", method);
@@ -987,7 +1019,7 @@
env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world_with_enum_type.wsdl"));
processor.setContext(env);
processor.execute();
- Class clz = classLoader.loadClass("org.apache.hello_world_soap_http.types.ActionType");
+ Class clz = classLoader.loadClass("org.apache.cxf.w2j.hello_world_soap_http.types.ActionType");
assertNotNull("Enum class could not be found", clz);
}
@@ -1091,7 +1123,7 @@
env.put(ToolConstants.CFG_SERVICENAME, "HelloWorldService");
processor.setContext(env);
processor.execute();
- Class cls = classLoader.loadClass("org.apache.cxf.hello_world_jms.BadRecordLitFault");
+ Class cls = classLoader.loadClass("org.apache.cxf.w2j.hello_world_jms.BadRecordLitFault");
WebFault webFault = AnnotationUtil.getPrivClassAnnotation(cls, WebFault.class);
assertEquals("http://www.w3.org/2001/XMLSchema", webFault.targetNamespace());
@@ -1120,7 +1152,7 @@
processor.setContext(env);
processor.execute();
- File greeter = new File(output, "org/apache/hello_world_soap_http/Greeter.java");
+ File greeter = new File(output, "org/apache/cxf/w2j/hello_world_soap_http/Greeter.java");
assertTrue(output.exists());
String contents = FileUtils.getStringFromFile(greeter);
assertTrue(contents.indexOf("SOAPBinding.ParameterStyle.BARE") != -1);
@@ -1173,7 +1205,7 @@
env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/w3c-epr.wsdl"));
processor.setContext(env);
processor.execute();
- Class sei = this.classLoader.loadClass("org.apache.w3c.epr.AddNumbersPortType");
+ Class<?> sei = this.classLoader.loadClass("org.apache.w3c.epr.AddNumbersPortType");
Method method = sei.getMethod("addNumbers",
new Class[]{javax.xml.ws.wsaddressing.W3CEndpointReference.class});
assertNotNull("wsdl2java does not map w3c:EndpointReferenceType to javax.xml.ws.EndpointReference"
Modified: incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java?rev=627095&r1=627094&r2=627095&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java Tue Feb 12 12:50:56 2008
@@ -25,6 +25,9 @@
import java.util.List;
import java.util.Map;
+import javax.xml.namespace.QName;
+
+import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.tools.common.FrontEndGenerator;
import org.apache.cxf.tools.common.ProcessorTestBase;
import org.apache.cxf.tools.common.ToolConstants;
@@ -39,6 +42,7 @@
import org.apache.cxf.tools.wsdlto.core.FrontEndProfile;
import org.apache.cxf.tools.wsdlto.core.PluginLoader;
import org.apache.cxf.tools.wsdlto.frontend.jaxws.JAXWSContainer;
+import org.apache.cxf.tools.wsdlto.frontend.jaxws.processor.WSDLToJavaProcessor;
import org.junit.Test;
public class JAXWSContainerTest extends ProcessorTestBase {
@@ -91,12 +95,15 @@
assertNotNull(output.list());
assertEquals(1, output.list().length);
- assertTrue(new File(output, "org/apache/hello_world_soap_http/Greeter.java").exists());
- assertTrue(new File(output, "org/apache/hello_world_soap_http/SOAPService.java").exists());
- assertTrue(new File(output, "org/apache/hello_world_soap_http/NoSuchCodeLitFault.java").exists());
- assertTrue(new File(output, "org/apache/hello_world_soap_http/types/SayHi.java").exists());
+ assertTrue(new File(output, "org/apache/cxf/w2j/hello_world_soap_http/Greeter.java").exists());
+ assertTrue(new File(output,
+ "org/apache/cxf/w2j/hello_world_soap_http/SOAPService.java").exists());
+ assertTrue(new File(output,
+ "org/apache/cxf/w2j/hello_world_soap_http/NoSuchCodeLitFault.java").exists());
assertTrue(new File(output,
- "org/apache/hello_world_soap_http/types/GreetMe.java").exists());
+ "org/apache/cxf/w2j/hello_world_soap_http/types/SayHi.java").exists());
+ assertTrue(new File(output,
+ "org/apache/cxf/w2j/hello_world_soap_http/types/GreetMe.java").exists());
// Now you can get the JavaModel from the context.
JavaModel javaModel = context.get(JavaModel.class);
@@ -105,9 +112,9 @@
assertEquals(1, interfaces.size());
JavaInterface intf = interfaces.values().iterator().next();
- assertEquals("http://apache.org/hello_world_soap_http", intf.getNamespace());
+ assertEquals("http://cxf.apache.org/w2j/hello_world_soap_http", intf.getNamespace());
assertEquals("Greeter", intf.getName());
- assertEquals("org.apache.hello_world_soap_http", intf.getPackageName());
+ assertEquals("org.apache.cxf.w2j.hello_world_soap_http", intf.getPackageName());
List<JavaMethod> methods = intf.getMethods();
assertEquals(6, methods.size());
@@ -152,7 +159,10 @@
assertEquals(0, output.list().length);
// Now you can get the JavaModel from the context.
- JavaModel javaModel = context.get(JavaModel.class);
+ Map<QName, JavaModel> map = CastUtils.cast((Map)context.get(WSDLToJavaProcessor.MODEL_MAP));
+ JavaModel javaModel = map.get(new QName("http://cxf.apache.org/w2j/hello_world_soap_http",
+ "SOAPService"));
+ assertNotNull(javaModel);
Map<String, JavaInterface> interfaces = javaModel.getInterfaces();
assertEquals(1, interfaces.size());
@@ -160,8 +170,8 @@
JavaInterface intf = interfaces.values().iterator().next();
String interfaceName = intf.getName();
assertEquals("Greeter", interfaceName);
- assertEquals("http://apache.org/hello_world_soap_http", intf.getNamespace());
- assertEquals("org.apache.hello_world_soap_http", intf.getPackageName());
+ assertEquals("http://cxf.apache.org/w2j/hello_world_soap_http", intf.getNamespace());
+ assertEquals("org.apache.cxf.w2j.hello_world_soap_http", intf.getPackageName());
List<JavaMethod> methods = intf.getMethods();
assertEquals(6, methods.size());
@@ -184,6 +194,9 @@
String address = null;
for (JavaServiceClass service : javaModel.getServiceClasses().values()) {
+ if ("SOAPService_Test1".equals(service.getName())) {
+ continue;
+ }
List<JavaPort> ports = (List<JavaPort>) service.getPorts();
for (JavaPort port : ports) {
if (interfaceName.equals(port.getPortType())) {
Modified: incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/expected/expected_hello_mime
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/expected/expected_hello_mime?rev=627095&r1=627094&r2=627095&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/expected/expected_hello_mime (original)
+++ incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/expected/expected_hello_mime Tue Feb 12 12:50:56 2008
@@ -18,7 +18,7 @@
*/
-package org.apache.hello_world_mime;
+package org.apache.cxf.w2j.hello_world_mime;
import javax.jws.WebMethod;
import javax.jws.WebParam;
@@ -31,24 +31,24 @@
import javax.xml.ws.RequestWrapper;
import javax.xml.ws.ResponseWrapper;
-@WebService(targetNamespace = "http://apache.org/hello_world_mime", name = "Hello")
+@WebService(targetNamespace = "http://cxf.apache.org/w2j/hello_world_mime", name = "Hello")
@XmlSeeAlso({org.apache.cxf.mime.ObjectFactory.class})
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
public interface Hello {
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
- @WebResult(name = "addressRes", targetNamespace = "http://apache.org/hello_world_mime/types", partName = "mime")
+ @WebResult(name = "addressRes", targetNamespace = "http://cxf.apache.org/w2j/hello_world_mime/types", partName = "mime")
@WebMethod
public javax.xml.transform.Source address(
- @WebParam(partName = "mime", name = "address", targetNamespace = "http://apache.org/hello_world_mime/types")
+ @WebParam(partName = "mime", name = "address", targetNamespace = "http://cxf.apache.org/w2j/hello_world_mime/types")
org.apache.cxf.mime.Address mime
);
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
@WebMethod
public void helloMime(
- @WebParam(partName = "body", name = "body", targetNamespace = "http://apache.org/hello_world_mime/types")
+ @WebParam(partName = "body", name = "body", targetNamespace = "http://cxf.apache.org/w2j/hello_world_mime/types")
java.lang.String body,
@WebParam(partName = "mime", mode = WebParam.Mode.INOUT, name = "mime", targetNamespace = "")
javax.xml.ws.Holder<java.awt.Image> mime
@@ -57,7 +57,7 @@
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
@WebMethod
public void hello(
- @WebParam(partName = "body", name = "body", targetNamespace = "http://apache.org/hello_world_mime/types")
+ @WebParam(partName = "body", name = "body", targetNamespace = "http://cxf.apache.org/w2j/hello_world_mime/types")
java.lang.String body,
@WebParam(partName = "mime", mode = WebParam.Mode.INOUT, name = "mime", targetNamespace = "")
javax.xml.ws.Holder<byte[]> mime
Modified: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305728/hello_world.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305728/hello_world.wsdl?rev=627095&r1=627094&r2=627095&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305728/hello_world.wsdl (original)
+++ incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305728/hello_world.wsdl Tue Feb 12 12:50:56 2008
@@ -18,16 +18,16 @@
under the License.
-->
<wsdl:definitions name="HelloWorld"
- targetNamespace="http://apache.org/hello_world"
+ targetNamespace="http://cxf.apache.org/w2j/hello_world"
xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:tns="http://apache.org/hello_world"
- xmlns:x1="http://apache.org/hello_world/types"
+ xmlns:tns="http://cxf.apache.org/w2j/hello_world"
+ xmlns:x1="http://cxf.apache.org/w2j/hello_world/types"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<wsdl:types>
<schema
- targetNamespace="http://apache.org/hello_world/types"
+ targetNamespace="http://cxf.apache.org/w2j/hello_world/types"
xmlns="http://www.w3.org/2001/XMLSchema"
xmlns:wsa="http://www.w3.org/2005/08/addressing"
elementFormDefault="qualified">
Modified: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305728/hello_world2.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305728/hello_world2.wsdl?rev=627095&r1=627094&r2=627095&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305728/hello_world2.wsdl (original)
+++ incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305728/hello_world2.wsdl Tue Feb 12 12:50:56 2008
@@ -18,20 +18,20 @@
under the License.
-->
<wsdl:definitions name="HelloWorld"
- targetNamespace="http://apache.org/hello_world"
+ targetNamespace="http://cxf.apache.org/w2j/hello_world"
xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:tns="http://apache.org/hello_world"
- xmlns:x1="http://apache.org/hello_world/types"
+ xmlns:tns="http://cxf.apache.org/w2j/hello_world"
+ xmlns:x1="http://cxf.apache.org/w2j/hello_world/types"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<wsdl:types>
<schema
- targetNamespace="http://apache.org/hello_world/types"
+ targetNamespace="http://cxf.apache.org/w2j/hello_world/types"
xmlns="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified">
- <import namespace="http://apache.org/hello_world/types"
+ <import namespace="http://cxf.apache.org/w2j/hello_world/types"
schemaLocation="hello_world_types2.xsd"/>
</schema>
</wsdl:types>
Modified: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305728/hello_world_types2.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305728/hello_world_types2.xsd?rev=627095&r1=627094&r2=627095&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305728/hello_world_types2.xsd (original)
+++ incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305728/hello_world_types2.xsd Tue Feb 12 12:50:56 2008
@@ -20,7 +20,7 @@
<xsd:schema
xmlns="http://www.w3.org/2001/XMLSchema"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://apache.org/hello_world/types"
+ targetNamespace="http://cxf.apache.org/w2j/hello_world/types"
elementFormDefault="qualified">
<element name="sayHi">
Modified: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305729/hello_world.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305729/hello_world.wsdl?rev=627095&r1=627094&r2=627095&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305729/hello_world.wsdl (original)
+++ incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305729/hello_world.wsdl Tue Feb 12 12:50:56 2008
@@ -19,13 +19,13 @@
-->
<wsdl:definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:tns="http://apache.org/hello_world_soap_http"
- xmlns:x1="http://apache.org/hello_world_soap_http/types"
+ xmlns:tns="http://cxf.apache.org/w2j/hello_world_soap_http"
+ xmlns:x1="http://cxf.apache.org/w2j/hello_world_soap_http/types"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://apache.org/hello_world_soap_http" name="HelloWorld">
+ targetNamespace="http://cxf.apache.org/w2j/hello_world_soap_http" name="HelloWorld">
<wsdl:types>
- <schema targetNamespace="http://apache.org/hello_world_soap_http/types" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:x1="http://apache.org/hello_world_soap_http/types" elementFormDefault="qualified">
+ <schema targetNamespace="http://cxf.apache.org/w2j/hello_world_soap_http/types" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:x1="http://cxf.apache.org/w2j/hello_world_soap_http/types" elementFormDefault="qualified">
<element name="sayHi">
<complexType/>
</element>
@@ -243,7 +243,7 @@
</wsdl:fault>
</wsdl:operation>
<wsdl:operation name="testDocLitBare">
- <soap:operation style="document" soapAction="http://apache.org/hello_world_soap_http/testDocLitBare"/>
+ <soap:operation style="document" soapAction="http://cxf.apache.org/w2j/hello_world_soap_http/testDocLitBare"/>
<wsdl:input name="testDocLitBareRequest">
<soap:body use="literal"/>
</wsdl:input>
Modified: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305772/hello_world.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305772/hello_world.wsdl?rev=627095&r1=627094&r2=627095&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305772/hello_world.wsdl (original)
+++ incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305772/hello_world.wsdl Tue Feb 12 12:50:56 2008
@@ -19,13 +19,13 @@
-->
<wsdl:definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:tns="http://apache.org/hello_world_soap_http"
- xmlns:x1="http://apache.org/hello_world_soap_http/types"
+ xmlns:tns="http://cxf.apache.org/w2j/hello_world_soap_http"
+ xmlns:x1="http://cxf.apache.org/w2j/hello_world_soap_http/types"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://apache.org/hello_world_soap_http" name="HelloWorld">
+ targetNamespace="http://cxf.apache.org/w2j/hello_world_soap_http" name="HelloWorld">
<wsdl:types>
- <schema targetNamespace="http://apache.org/hello_world_soap_http/types" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:x1="http://apache.org/hello_world_soap_http/types" elementFormDefault="qualified">
+ <schema targetNamespace="http://cxf.apache.org/w2j/hello_world_soap_http/types" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:x1="http://cxf.apache.org/w2j/hello_world_soap_http/types" elementFormDefault="qualified">
<element name="sayHi">
<complexType/>
</element>
@@ -244,7 +244,7 @@
</wsdl:fault>
</wsdl:operation>
<wsdl:operation name="testDocLitBare">
- <soap:operation style="document" soapAction="http://apache.org/hello_world_soap_http/testDocLitBare"/>
+ <soap:operation style="document" soapAction="http://cxf.apache.org/w2j/hello_world_soap_http/testDocLitBare"/>
<wsdl:input name="testDocLitBareRequest">
<soap:body use="literal"/>
</wsdl:input>
Modified: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305773/hello_world.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305773/hello_world.wsdl?rev=627095&r1=627094&r2=627095&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305773/hello_world.wsdl (original)
+++ incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305773/hello_world.wsdl Tue Feb 12 12:50:56 2008
@@ -19,13 +19,13 @@
-->
<wsdl:definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:tns="http://apache.org/hello_world_soap_http"
- xmlns:x1="http://apache.org/hello_world_soap_http/types"
+ xmlns:tns="http://cxf.apache.org/w2j/hello_world_soap_http"
+ xmlns:x1="http://cxf.apache.org/w2j/hello_world_soap_http/types"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://apache.org/hello_world_soap_http" name="HelloWorld">
+ targetNamespace="http://cxf.apache.org/w2j/hello_world_soap_http" name="HelloWorld">
<wsdl:types>
- <schema targetNamespace="http://apache.org/hello_world_soap_http/types" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:x1="http://apache.org/hello_world_soap_http/types" elementFormDefault="qualified">
+ <schema targetNamespace="http://cxf.apache.org/w2j/hello_world_soap_http/types" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:x1="http://cxf.apache.org/w2j/hello_world_soap_http/types" elementFormDefault="qualified">
<element name="sayHi">
<complexType/>
</element>
@@ -244,7 +244,7 @@
</wsdl:fault>
</wsdl:operation>
<wsdl:operation name="testDocLitBare">
- <soap:operation style="document" soapAction="http://apache.org/hello_world_soap_http/testDocLitBare"/>
+ <soap:operation style="document" soapAction="http://cxf.apache.org/w2j/hello_world_soap_http/testDocLitBare"/>
<wsdl:input name="testDocLitBareRequest">
<soap:body use="literal"/>
</wsdl:input>
Modified: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305924/hello_world.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305924/hello_world.wsdl?rev=627095&r1=627094&r2=627095&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305924/hello_world.wsdl (original)
+++ incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug305924/hello_world.wsdl Tue Feb 12 12:50:56 2008
@@ -19,15 +19,15 @@
-->
<wsdl:definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:tns="http://apache.org/hello_world_soap_http"
- xmlns:x1="http://apache.org/hello_world_soap_http/types"
+ xmlns:tns="http://cxf.apache.org/w2j/hello_world_soap_http"
+ xmlns:x1="http://cxf.apache.org/w2j/hello_world_soap_http/types"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://apache.org/hello_world_soap_http"
+ targetNamespace="http://cxf.apache.org/w2j/hello_world_soap_http"
name="HelloWorld">
<wsdl:types>
<schema elementFormDefault="qualified"
- targetNamespace="http://apache.org/hello_world_soap_http/types"
+ targetNamespace="http://cxf.apache.org/w2j/hello_world_soap_http/types"
xmlns="http://www.w3.org/2001/XMLSchema">
<element name="CreateProcess">
<complexType>
Modified: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug321/hello_world_different_ns_service.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug321/hello_world_different_ns_service.wsdl?rev=627095&r1=627094&r2=627095&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug321/hello_world_different_ns_service.wsdl (original)
+++ incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug321/hello_world_different_ns_service.wsdl Tue Feb 12 12:50:56 2008
@@ -19,10 +19,10 @@
-->
<wsdl:definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:ns1="http://apache.org/hello_world_soap_http"
+ xmlns:ns1="http://cxf.apache.org/w2j/hello_world_soap_http"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- targetNamespace="http://apache.org/hello_world_soap_http/service" name="HelloWorldService">
- <wsdl:import namespace="http://apache.org/hello_world_soap_http"
+ targetNamespace="http://cxf.apache.org/w2j/hello_world_soap_http/service" name="HelloWorldService">
+ <wsdl:import namespace="http://cxf.apache.org/w2j/hello_world_soap_http"
location="./hello_world_porttype.wsdl"/>
<wsdl:service name="SOAPService_Test1">
<wsdl:port name="SoapPort_Test1" binding="ns1:Greeter_SOAPBinding">
Modified: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug321/hello_world_porttype.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug321/hello_world_porttype.wsdl?rev=627095&r1=627094&r2=627095&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug321/hello_world_porttype.wsdl (original)
+++ incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug321/hello_world_porttype.wsdl Tue Feb 12 12:50:56 2008
@@ -19,13 +19,13 @@
-->
<wsdl:definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:tns="http://apache.org/hello_world_soap_http"
- xmlns:x1="http://apache.org/hello_world_soap_http/types"
+ xmlns:tns="http://cxf.apache.org/w2j/hello_world_soap_http"
+ xmlns:x1="http://cxf.apache.org/w2j/hello_world_soap_http/types"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://apache.org/hello_world_soap_http" name="HelloWorld">
+ targetNamespace="http://cxf.apache.org/w2j/hello_world_soap_http" name="HelloWorld">
<wsdl:types>
- <schema targetNamespace="http://apache.org/hello_world_soap_http/types" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:x1="http://apache.org/hello_world_soap_http/types" elementFormDefault="qualified">
+ <schema targetNamespace="http://cxf.apache.org/w2j/hello_world_soap_http/types" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:x1="http://cxf.apache.org/w2j/hello_world_soap_http/types" elementFormDefault="qualified">
<element name="sayHi">
<complexType/>
</element>
@@ -244,7 +244,7 @@
</wsdl:fault>
</wsdl:operation>
<wsdl:operation name="testDocLitBare">
- <soap:operation style="document" soapAction="http://apache.org/hello_world_soap_http/testDocLitBare"/>
+ <soap:operation style="document" soapAction="http://cxf.apache.org/w2j/hello_world_soap_http/testDocLitBare"/>
<wsdl:input name="testDocLitBareRequest">
<soap:body use="literal"/>
</wsdl:input>
Modified: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug627/hello_world.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug627/hello_world.wsdl?rev=627095&r1=627094&r2=627095&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug627/hello_world.wsdl (original)
+++ incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug627/hello_world.wsdl Tue Feb 12 12:50:56 2008
@@ -19,13 +19,13 @@
-->
<wsdl:definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:tns="http://apache.org/hello_world_soap_http"
- xmlns:x1="http://apache.org/hello_world_soap_http/types"
+ xmlns:tns="http://cxf.apache.org/w2j/hello_world_soap_http"
+ xmlns:x1="http://cxf.apache.org/w2j/hello_world_soap_http/types"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://apache.org/hello_world_soap_http" name="HelloWorld">
+ targetNamespace="http://cxf.apache.org/w2j/hello_world_soap_http" name="HelloWorld">
<wsdl:types>
- <schema targetNamespace="http://apache.org/hello_world_soap_http/types" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:x1="http://apache.org/hello_world_soap_http/types" elementFormDefault="qualified">
+ <schema targetNamespace="http://cxf.apache.org/w2j/hello_world_soap_http/types" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:x1="http://cxf.apache.org/w2j/hello_world_soap_http/types" elementFormDefault="qualified">
<element name="sayHi">
<complexType/>
</element>
Modified: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug765/hello_world.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug765/hello_world.wsdl?rev=627095&r1=627094&r2=627095&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug765/hello_world.wsdl (original)
+++ incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug765/hello_world.wsdl Tue Feb 12 12:50:56 2008
@@ -19,13 +19,13 @@
-->
<wsdl:definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:tns="http://apache.org/hello_world_soap_http"
- xmlns:x1="http://apache.org/hello_world_soap_http/types"
+ xmlns:tns="http://cxf.apache.org/w2j/hello_world_soap_http"
+ xmlns:x1="http://cxf.apache.org/w2j/hello_world_soap_http/types"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://apache.org/hello_world_soap_http" name="HelloWorld">
+ targetNamespace="http://cxf.apache.org/w2j/hello_world_soap_http" name="HelloWorld">
<wsdl:types>
- <schema targetNamespace="http://apache.org/hello_world_soap_http/types" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:x1="http://apache.org/hello_world_soap_http/types" elementFormDefault="qualified">
+ <schema targetNamespace="http://cxf.apache.org/w2j/hello_world_soap_http/types" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:x1="http://cxf.apache.org/w2j/hello_world_soap_http/types" elementFormDefault="qualified">
<element name="sayHi">
<complexType/>
</element>
@@ -327,7 +327,7 @@
<wsdl:binding name="Doc_Lit_Bare_SOAPBinding" type="tns:DocLitBare">
<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
<wsdl:operation name="testDocLitBare">
- <soap:operation style="document" soapAction="http://apache.org/hello_world_soap_http/testDocLitBare"/>
+ <soap:operation style="document" soapAction="http://cxf.apache.org/w2j/hello_world_soap_http/testDocLitBare"/>
<wsdl:input name="testDocLitBareRequest">
<soap:body use="literal"/>
</wsdl:input>
Modified: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug765/hello_world_ports.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug765/hello_world_ports.wsdl?rev=627095&r1=627094&r2=627095&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug765/hello_world_ports.wsdl (original)
+++ incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug765/hello_world_ports.wsdl Tue Feb 12 12:50:56 2008
@@ -19,13 +19,13 @@
-->
<wsdl:definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:tns="http://apache.org/hello_world_soap_http"
- xmlns:x1="http://apache.org/hello_world_soap_http/types"
+ xmlns:tns="http://cxf.apache.org/w2j/hello_world_soap_http"
+ xmlns:x1="http://cxf.apache.org/w2j/hello_world_soap_http/types"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://apache.org/hello_world_soap_http" name="HelloWorld">
+ targetNamespace="http://cxf.apache.org/w2j/hello_world_soap_http" name="HelloWorld">
<wsdl:types>
- <schema targetNamespace="http://apache.org/hello_world_soap_http/types" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:x1="http://apache.org/hello_world_soap_http/types" elementFormDefault="qualified">
+ <schema targetNamespace="http://cxf.apache.org/w2j/hello_world_soap_http/types" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:x1="http://cxf.apache.org/w2j/hello_world_soap_http/types" elementFormDefault="qualified">
<element name="sayHi">
<complexType/>
</element>
@@ -327,7 +327,7 @@
<wsdl:binding name="Doc_Lit_Bare_SOAPBinding" type="tns:DocLitBare">
<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
<wsdl:operation name="testDocLitBare">
- <soap:operation style="document" soapAction="http://apache.org/hello_world_soap_http/testDocLitBare"/>
+ <soap:operation style="document" soapAction="http://cxf.apache.org/w2j/hello_world_soap_http/testDocLitBare"/>
<wsdl:input name="testDocLitBareRequest">
<soap:body use="literal"/>
</wsdl:input>
Modified: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug967.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug967.wsdl?rev=627095&r1=627094&r2=627095&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug967.wsdl (original)
+++ incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug967.wsdl Tue Feb 12 12:50:56 2008
@@ -18,12 +18,12 @@
under the License.
-->
-<wsdl:definitions name="Voidint" targetNamespace="http://apache.org/hello_world_rpclit/voidint"
+<wsdl:definitions name="Voidint" targetNamespace="http://cxf.apache.org/w2j/hello_world_rpclit/voidint"
xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:http-conf="http://schemas.iona.com/transports/http/configuration"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:tns="http://apache.org/hello_world_rpclit/voidint"
- xmlns:x1="http://apache.org/hello_world_rpclit/voidint/types"
+ xmlns:tns="http://cxf.apache.org/w2j/hello_world_rpclit/voidint"
+ xmlns:x1="http://cxf.apache.org/w2j/hello_world_rpclit/voidint/types"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
@@ -46,10 +46,10 @@
<wsdl:operation name="sayHi">
<soap:operation soapAction="" style="rpc"/>
<wsdl:input>
- <soap:body namespace="http://apache.org/hello_world_rpclit/voidint" use="literal"/>
+ <soap:body namespace="http://cxf.apache.org/w2j/hello_world_rpclit/voidint" use="literal"/>
</wsdl:input>
<wsdl:output>
- <soap:body namespace="http://apache.org/hello_world_rpclit/voidint" use="literal"/>
+ <soap:body namespace="http://cxf.apache.org/w2j/hello_world_rpclit/voidint" use="literal"/>
</wsdl:output>
</wsdl:operation>
Modified: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug978/bug.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug978/bug.wsdl?rev=627095&r1=627094&r2=627095&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug978/bug.wsdl (original)
+++ incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug978/bug.wsdl Tue Feb 12 12:50:56 2008
@@ -18,12 +18,12 @@
under the License.
-->
-<wsdl:definitions name="Voidint" targetNamespace="http://apache.org/hello_world_rpclit/voidint"
+<wsdl:definitions name="Voidint" targetNamespace="http://cxf.apache.org/w2j/hello_world_rpclit/voidint"
xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:http-conf="http://schemas.iona.com/transports/http/configuration"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:tns="http://apache.org/hello_world_rpclit/voidint"
- xmlns:x1="http://apache.org/hello_world_rpclit/voidint/types"
+ xmlns:tns="http://cxf.apache.org/w2j/hello_world_rpclit/voidint"
+ xmlns:x1="http://cxf.apache.org/w2j/hello_world_rpclit/voidint/types"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:i0="http://tempuri.org"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
Modified: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-1344/handlerbinding.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-1344/handlerbinding.wsdl?rev=627095&r1=627094&r2=627095&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-1344/handlerbinding.wsdl (original)
+++ incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-1344/handlerbinding.wsdl Tue Feb 12 12:50:56 2008
@@ -19,13 +19,13 @@
-->
<wsdl:definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:tns="http://apache.org/hello_world_soap_http"
- xmlns:x1="http://apache.org/hello_world_soap_http/types"
+ xmlns:tns="http://cxf.apache.org/w2j/hello_world_soap_http"
+ xmlns:x1="http://cxf.apache.org/w2j/hello_world_soap_http/types"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://apache.org/hello_world_soap_http" name="HelloWorld">
+ targetNamespace="http://cxf.apache.org/w2j/hello_world_soap_http" name="HelloWorld">
<wsdl:types>
- <schema targetNamespace="http://apache.org/hello_world_soap_http/types" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:x1="http://apache.org/hello_world_soap_http/types" elementFormDefault="qualified">
+ <schema targetNamespace="http://cxf.apache.org/w2j/hello_world_soap_http/types" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:x1="http://cxf.apache.org/w2j/hello_world_soap_http/types" elementFormDefault="qualified">
<element name="sayHi">
<complexType/>
</element>
@@ -253,7 +253,7 @@
</wsdl:fault>
</wsdl:operation>
<wsdl:operation name="testDocLitBare">
- <soap:operation style="document" soapAction="http://apache.org/hello_world_soap_http/testDocLitBare"/>
+ <soap:operation style="document" soapAction="http://cxf.apache.org/w2j/hello_world_soap_http/testDocLitBare"/>
<wsdl:input name="testDocLitBareRequest">
<soap:body use="literal"/>
</wsdl:input>
Modified: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1094/hello_world.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1094/hello_world.wsdl?rev=627095&r1=627094&r2=627095&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1094/hello_world.wsdl (original)
+++ incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1094/hello_world.wsdl Tue Feb 12 12:50:56 2008
@@ -19,13 +19,13 @@
-->
<wsdl:definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:tns="http://apache.org/hello_world_soap_http"
- xmlns:x1="http://apache.org/hello_world_soap_http/types"
+ xmlns:tns="http://cxf.apache.org/w2j/hello_world_soap_http"
+ xmlns:x1="http://cxf.apache.org/w2j/hello_world_soap_http/types"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://apache.org/hello_world_soap_http" name="HelloWorld">
+ targetNamespace="http://cxf.apache.org/w2j/hello_world_soap_http" name="HelloWorld">
<wsdl:types>
- <schema targetNamespace="http://apache.org/hello_world_soap_http/types" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:x1="http://apache.org/hello_world_soap_http/types" elementFormDefault="qualified">
+ <schema targetNamespace="http://cxf.apache.org/w2j/hello_world_soap_http/types" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:x1="http://cxf.apache.org/w2j/hello_world_soap_http/types" elementFormDefault="qualified">
<element name="CreateProcess">
<complexType>
<sequence>
@@ -256,7 +256,7 @@
</wsdl:fault>
</wsdl:operation>
<wsdl:operation name="testDocLitBare">
- <soap:operation style="document" soapAction="http://apache.org/hello_world_soap_http/testDocLitBare"/>
+ <soap:operation style="document" soapAction="http://cxf.apache.org/w2j/hello_world_soap_http/testDocLitBare"/>
<wsdl:input name="testDocLitBareRequest">
<soap:body use="literal"/>
</wsdl:input>
Modified: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1095/hello_world_bindings.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1095/hello_world_bindings.wsdl?rev=627095&r1=627094&r2=627095&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1095/hello_world_bindings.wsdl (original)
+++ incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1095/hello_world_bindings.wsdl Tue Feb 12 12:50:56 2008
@@ -20,14 +20,14 @@
<wsdl:definitions name="HelloWorld"
xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:x2="http://apache.org/hello_world"
+ xmlns:x2="http://cxf.apache.org/w2j/hello_world"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://apache.org/hello_world/bindings">
+ targetNamespace="http://cxf.apache.org/w2j/hello_world/bindings">
<wsdl:import
- namespace="http://apache.org/hello_world"
+ namespace="http://cxf.apache.org/w2j/hello_world"
location="hello_world_wsdl_import.wsdl"/>
<wsdl:binding name="SOAPBinding" type="x2:Greeter">
Modified: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1095/hello_world_messages.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1095/hello_world_messages.wsdl?rev=627095&r1=627094&r2=627095&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1095/hello_world_messages.wsdl (original)
+++ incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1095/hello_world_messages.wsdl Tue Feb 12 12:50:56 2008
@@ -20,16 +20,16 @@
<wsdl:definitions name="HelloWorld"
xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:tns="http://apache.org/hello_world/messages"
- xmlns:x1="http://apache.org/hello_world/types"
+ xmlns:tns="http://cxf.apache.org/w2j/hello_world/messages"
+ xmlns:x1="http://cxf.apache.org/w2j/hello_world/types"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://apache.org/hello_world/messages">
+ targetNamespace="http://cxf.apache.org/w2j/hello_world/messages">
<wsdl:types>
<schema
xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:x1="http://apache.org/hello_world/types"
- targetNamespace="http://apache.org/hello_world/types"
+ xmlns:x1="http://cxf.apache.org/w2j/hello_world/types"
+ targetNamespace="http://cxf.apache.org/w2j/hello_world/types"
elementFormDefault="qualified">
<element name="sayHi">
<complexType/>
Modified: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1095/hello_world_services.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1095/hello_world_services.wsdl?rev=627095&r1=627094&r2=627095&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1095/hello_world_services.wsdl (original)
+++ incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1095/hello_world_services.wsdl Tue Feb 12 12:50:56 2008
@@ -21,13 +21,13 @@
xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:tns="http://apache.org/hello_world/services"
+ xmlns:tns="http://cxf.apache.org/w2j/hello_world/services"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:x1="http://apache.org/hello_world/bindings"
- xmlns:x2="http://apache.org/hello_world"
- targetNamespace="http://apache.org/hello_world/services">
+ xmlns:x1="http://cxf.apache.org/w2j/hello_world/bindings"
+ xmlns:x2="http://cxf.apache.org/w2j/hello_world"
+ targetNamespace="http://cxf.apache.org/w2j/hello_world/services">
<wsdl:import
- namespace="http://apache.org/hello_world/bindings"
+ namespace="http://cxf.apache.org/w2j/hello_world/bindings"
location="hello_world_bindings.wsdl"/>
<wsdl:service name="SOAPService">
Modified: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1095/hello_world_wsdl_import.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1095/hello_world_wsdl_import.wsdl?rev=627095&r1=627094&r2=627095&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1095/hello_world_wsdl_import.wsdl (original)
+++ incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1095/hello_world_wsdl_import.wsdl Tue Feb 12 12:50:56 2008
@@ -20,14 +20,14 @@
<wsdl:definitions name="HelloWorldImport"
xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:tns="http://apache.org/hello_world"
- xmlns:x1="http://apache.org/hello_world/messages"
+ xmlns:tns="http://cxf.apache.org/w2j/hello_world"
+ xmlns:x1="http://cxf.apache.org/w2j/hello_world/messages"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://apache.org/hello_world">
+ targetNamespace="http://cxf.apache.org/w2j/hello_world">
<wsdl:import
- namespace="http://apache.org/hello_world/messages"
+ namespace="http://cxf.apache.org/w2j/hello_world/messages"
location="hello_world_messages.wsdl"/>
<wsdl:portType name="Greeter">