Author: ema
Date: Wed Mar 7 02:49:13 2007
New Revision: 515526
URL: http://svn.apache.org/viewvc?view=rev&rev=515526
Log:
Fixed issue with spaces in project and repo path
Fixed issue in FaultProcessor which generate wrong webFault annotation
Added:
incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/jms_test_rpc_fault.wsdl
(with props)
Modified:
incubator/cxf/trunk/tools2/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/ProcessorTestBase.java
incubator/cxf/trunk/tools2/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java
incubator/cxf/trunk/tools2/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainerTest.java
incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/FaultProcessor.java
incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/XMLFormatValidator.java
incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/common/ProcessorTestBase.java
incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaTest.java
incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenOptionTest.java
incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
Modified:
incubator/cxf/trunk/tools2/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/ProcessorTestBase.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/ProcessorTestBase.java?view=diff&rev=515526&r1=515525&r2=515526
==============================================================================
---
incubator/cxf/trunk/tools2/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/ProcessorTestBase.java
(original)
+++
incubator/cxf/trunk/tools2/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/ProcessorTestBase.java
Wed Mar 7 02:49:13 2007
@@ -20,6 +20,7 @@
package org.apache.cxf.tools.java2wsdl.processor;
import java.io.File;
+import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.Locale;
@@ -128,13 +129,13 @@
return osName.indexOf("windows") > -1;
}
- protected String getClassPath() {
+ protected String getClassPath() throws URISyntaxException {
ClassLoader loader = getClass().getClassLoader();
StringBuffer classPath = new StringBuffer();
if (loader instanceof URLClassLoader) {
URLClassLoader urlLoader = (URLClassLoader)loader;
for (URL url : urlLoader.getURLs()) {
- File file = new File(url.getFile());
+ File file = new File(url.toURI());
String filename = file.getAbsolutePath();
if (filename.indexOf("junit") == -1) {
classPath.append(filename);
Modified:
incubator/cxf/trunk/tools2/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java?view=diff&rev=515526&r1=515525&r2=515526
==============================================================================
---
incubator/cxf/trunk/tools2/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java
(original)
+++
incubator/cxf/trunk/tools2/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java
Wed Mar 7 02:49:13 2007
@@ -20,6 +20,7 @@
import java.io.File;
import java.io.IOException;
+import java.net.URISyntaxException;
import java.net.URL;
import java.util.Enumeration;
@@ -143,16 +144,16 @@
}
- private String getLocation(String wsdlFile) throws IOException {
+ private String getLocation(String wsdlFile) throws IOException,
URISyntaxException {
Enumeration<URL> e =
WSDLValidationTest.class.getClassLoader().getResources(wsdlFile);
while (e.hasMoreElements()) {
URL u = e.nextElement();
- File f = new File(u.getFile());
+ File f = new File(u.toURI());
if (f.exists() && f.isDirectory()) {
return f.toString();
}
}
- return WSDLValidationTest.class.getResource(wsdlFile).getFile();
+ return
WSDLValidationTest.class.getResource(wsdlFile).toURI().getPath();
}
}
Modified:
incubator/cxf/trunk/tools2/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainerTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainerTest.java?view=diff&rev=515526&r1=515525&r2=515526
==============================================================================
---
incubator/cxf/trunk/tools2/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainerTest.java
(original)
+++
incubator/cxf/trunk/tools2/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainerTest.java
Wed Mar 7 02:49:13 2007
@@ -19,6 +19,8 @@
package org.apache.cxf.tools.wsdlto;
+import java.net.URISyntaxException;
+
import junit.framework.TestCase;
import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.tools.common.ToolConstants;
@@ -42,8 +44,8 @@
}
}
- private String getLocation(String wsdlFile) {
- return this.getClass().getResource(wsdlFile).getFile();
+ private String getLocation(String wsdlFile) throws URISyntaxException {
+ return this.getClass().getResource(wsdlFile).toURI().getPath();
}
protected String getLogMessage(String key, Object...params) {
Modified:
incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/FaultProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/FaultProcessor.java?view=diff&rev=515526&r1=515525&r2=515526
==============================================================================
---
incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/FaultProcessor.java
(original)
+++
incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/FaultProcessor.java
Wed Mar 7 02:49:13 2007
@@ -22,6 +22,7 @@
import java.util.Collection;
import java.util.List;
+import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.service.model.FaultInfo;
import org.apache.cxf.service.model.MessagePartInfo;
import org.apache.cxf.tools.common.ToolConstants;
@@ -37,7 +38,7 @@
public class FaultProcessor extends AbstractProcessor {
private ClassCollector collector;
-
+
public FaultProcessor(ToolContext penv) {
super(penv);
collector = penv.get(ClassCollector.class);
@@ -53,7 +54,7 @@
}
}
- private boolean isNameCollision(String packageName, String className) {
+ private boolean isNameCollision(String packageName, String className) {
if (context.optionSet(ToolConstants.CFG_GEN_OVERWRITE)) {
return false;
}
@@ -67,45 +68,53 @@
JavaModel model = method.getInterface().getJavaModel();
String name =
NameUtil.mangleNameToClassName(faultMessage.getName().getLocalPart());
//Fix issue 305770
-
+
String namespace = faultMessage.getName().getNamespaceURI();
String packageName = ProcessorUtil.parsePackageName(namespace,
context.mapPackageName(namespace));
while (isNameCollision(packageName, name)) {
name = name + "_Exception";
}
-
+
String fullClassName = packageName + "." + name;
- collector.addExceptionClassName(packageName, name, fullClassName);
+ collector.addExceptionClassName(packageName, name, fullClassName);
boolean samePackage =
method.getInterface().getPackageName().equals(packageName);
method.addException(new JavaException(name, samePackage ? name :
fullClassName, namespace));
-
+
List<MessagePartInfo> faultParts = faultMessage.getMessageParts();
-
+
JavaExceptionClass expClass = new JavaExceptionClass(model);
expClass.setName(name);
expClass.setNamespace(namespace);
expClass.setPackageName(packageName);
-
+
for (MessagePartInfo part : faultParts) {
String fName = null;
String fNamespace = null;
- if (part.getConcreteName() != null) {
- fNamespace = part.getConcreteName().getNamespaceURI();
+ if (part.getElementQName() != null) {
+ fNamespace = part.getElementQName().getNamespaceURI();
+ //fNamespace = part.getConcreteName().getNamespaceURI();
+ fName = part.getConcreteName().getLocalPart();
+ } else {
+ fNamespace = part.getTypeQName().getNamespaceURI();
fName = part.getConcreteName().getLocalPart();
}
-
+
+ if (StringUtils.isEmpty(fNamespace)) {
+ fNamespace = namespace;
+ }
+
String fType = ProcessorUtil.getType(part, context, false);
String fPackageName = ProcessorUtil.parsePackageName(fNamespace,
context.mapPackageName(fNamespace));
-
-
+
+
JavaField fField = new JavaField(fName, fType, fNamespace);
fField.setQName(ProcessorUtil.getElementName(part));
-
+
if (!method.getInterface().getPackageName().equals(fPackageName)) {
fField.setClassName(ProcessorUtil.getFullClzName(part,
context, false));
}
Modified:
incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/XMLFormatValidator.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/XMLFormatValidator.java?view=diff&rev=515526&r1=515525&r2=515526
==============================================================================
---
incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/XMLFormatValidator.java
(original)
+++
incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/XMLFormatValidator.java
Wed Mar 7 02:49:13 2007
@@ -68,18 +68,15 @@
@SuppressWarnings("unchecked")
private boolean checkXMLFormat(BindingInfo binding) {
Collection<BindingOperationInfo> bos = binding.getOperations();
- System.err.println("operation size: " + bos.size());
boolean result = true;
boolean needRootNode = false;
for (BindingOperationInfo bo : bos) {
OperationInfo op =
binding.getInterface().getOperation(bo.getName());
- System.err.println("operation: " + op.getName());
needRootNode = false;
if (op.getInput().getMessageParts().size() == 0
|| op.getInput().getMessageParts().size() > 1) {
needRootNode = true;
}
- System.err.println("needRootNode " + needRootNode);
if (needRootNode) {
String path = "Binding(" + binding.getName().getLocalPart()
+ "):BindingOperation(" + bo.getName() + ")";
Modified:
incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/common/ProcessorTestBase.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/common/ProcessorTestBase.java?view=diff&rev=515526&r1=515525&r2=515526
==============================================================================
---
incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/common/ProcessorTestBase.java
(original)
+++
incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/common/ProcessorTestBase.java
Wed Mar 7 02:49:13 2007
@@ -20,6 +20,7 @@
package org.apache.cxf.tools.common;
import java.io.File;
+import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.Locale;
@@ -131,13 +132,13 @@
return osName.indexOf("windows") > -1;
}
- protected String getClassPath() {
+ protected String getClassPath() throws URISyntaxException {
ClassLoader loader = getClass().getClassLoader();
StringBuffer classPath = new StringBuffer();
if (loader instanceof URLClassLoader) {
URLClassLoader urlLoader = (URLClassLoader)loader;
for (URL url : urlLoader.getURLs()) {
- File file = new File(url.getFile());
+ File file = new File(url.toURI());
String filename = file.getAbsolutePath();
if (filename.indexOf("junit") == -1) {
classPath.append(filename);
Modified:
incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaTest.java?view=diff&rev=515526&r1=515525&r2=515526
==============================================================================
---
incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaTest.java
(original)
+++
incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaTest.java
Wed Mar 7 02:49:13 2007
@@ -19,9 +19,6 @@
package org.apache.cxf.tools.wsdlto;
-import java.io.*;
-import java.util.*;
-
import junit.framework.TestCase;
public class WSDLToJavaTest extends TestCase {
Modified:
incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java?view=diff&rev=515526&r1=515525&r2=515526
==============================================================================
---
incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
(original)
+++
incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
Wed Mar 7 02:49:13 2007
@@ -23,6 +23,8 @@
import java.io.FileInputStream;
import java.io.IOException;
import java.lang.reflect.Modifier;
+import java.net.URISyntaxException;
+
import javax.jws.WebService;
import org.apache.cxf.tools.common.ProcessorTestBase;
@@ -46,7 +48,7 @@
env.put(ToolConstants.CFG_COMPILE, ToolConstants.CFG_COMPILE);
env.put(ToolConstants.CFG_CLASSDIR, output.getCanonicalPath() +
"/classes");
- processor = new JAXWSContainer(null);
+ processor = new JAXWSContainer(null);
}
@@ -55,9 +57,8 @@
processor = null;
env = null;
}
-
- public void testBug305729() {
+ public void testBug305729() throws Exception {
env.put(ToolConstants.CFG_WSDLURL,
getLocation("/wsdl2java_wsdl/bug305729/hello_world.wsdl"));
processor.setContext(env);
processor.execute();
@@ -65,36 +66,32 @@
assertNotNull("Process message with no part wsdl error", output);
}
+ public void testBug305773() throws Exception {
- public void testBug305773() {
- try {
- env.put(ToolConstants.CFG_COMPILE, "compile");
- env.put(ToolConstants.CFG_IMPL, ToolConstants.CFG_IMPL);
- env.put(ToolConstants.CFG_OUTPUTDIR, output.getCanonicalPath());
- env.put(ToolConstants.CFG_CLASSDIR, output.getCanonicalPath() +
"/classes");
- 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");
-
- WebService webServiceAnn =
AnnotationUtil.getPrivClassAnnotation(clz, WebService.class);
- assertEquals("Greeter", webServiceAnn.name());
- assertFalse("Impl class should generate portName property value in
webService annotation",
- webServiceAnn.portName().equals(""));
- assertFalse("Impl class should generate serviceName property value
in webService annotation",
- webServiceAnn.serviceName().equals(""));
-
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- /*
- public void testHangingBug() throws Exception {
- env.put(ToolConstants.CFG_WSDLURL,
getLocation("/wsdl2java_wsdl/bughanging/wsdl/wsrf.wsdl"));
+ env.put(ToolConstants.CFG_COMPILE, "compile");
+ env.put(ToolConstants.CFG_IMPL, ToolConstants.CFG_IMPL);
+ env.put(ToolConstants.CFG_OUTPUTDIR, output.getCanonicalPath());
+ env.put(ToolConstants.CFG_CLASSDIR, output.getCanonicalPath() +
"/classes");
+ 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");
+
+ WebService webServiceAnn = AnnotationUtil.getPrivClassAnnotation(clz,
WebService.class);
+ assertEquals("Greeter", webServiceAnn.name());
+ assertFalse("Impl class should generate portName property value in
webService annotation",
+ webServiceAnn.portName().equals(""));
+ assertFalse("Impl class should generate serviceName property value in
webService annotation",
+ webServiceAnn.serviceName().equals(""));
+
}
- */
+
+ /*
+ * public void testHangingBug() throws Exception {
+ * env.put(ToolConstants.CFG_WSDLURL,
+ * getLocation("/wsdl2java_wsdl/bughanging/wsdl/wsrf.wsdl"));
+ * processor.setContext(env); processor.execute(); }
+ */
public void testBug305700() throws Exception {
env.put(ToolConstants.CFG_COMPILE, "compile");
env.put(ToolConstants.CFG_OUTPUTDIR, output.getCanonicalPath());
@@ -104,7 +101,7 @@
processor.setContext(env);
processor.execute();
}
-
+
public void testNamespacePackageMapping1() throws Exception {
env.put(ToolConstants.CFG_PACKAGENAME, "org.cxf");
env.addNamespacePackageMap("http://apache.org/hello_world_soap_http/types";,
"org.apache.types");
@@ -129,8 +126,6 @@
clz = classLoader.loadClass("org.apache.types.GreetMe");
}
-
-
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");
@@ -149,13 +144,13 @@
assertTrue("Generate " + clz.getName() + "error",
Modifier.isPublic(clz.getModifiers()));
clz = classLoader.loadClass("org.apache.Greeter");
}
-
+
public void testNamespacePackageMapping3() throws Exception {
env.put(ToolConstants.CFG_PACKAGENAME, "org.cxf");
env.put(ToolConstants.CFG_WSDLURL,
getLocation("/wsdl2java_wsdl/hello_world.wsdl"));
processor.setContext(env);
processor.execute();
-
+
File org = new File(output, "org");
assertTrue(org.exists());
@@ -166,7 +161,7 @@
Class clz = classLoader.loadClass("org.cxf.Greeter");
assertTrue("Generate " + clz.getName() + "error", clz.isInterface());
}
-
+
public void testBug305772() throws Exception {
env.put(ToolConstants.CFG_COMPILE, "compile");
env.put(ToolConstants.CFG_ANT, ToolConstants.CFG_ANT);
@@ -186,12 +181,12 @@
}
-
public void testBug305728HelloWorld() {
try {
String[] args = new String[] {"-compile", "-classdir",
output.getCanonicalPath() +
"/classes",
- "-d", output.getCanonicalPath(),
+ "-d",
+ output.getCanonicalPath(),
"-nexclude",
"http://www.w3.org/2005/08/addressing";
+
"=org.apache.cxf.ws.addressing",
@@ -224,8 +219,7 @@
e.printStackTrace();
}
}
-
-
+
public void testBug305728HelloWorld2() {
try {
String[] args = new String[] {"-compile", "-classdir",
output.getCanonicalPath() + "/classes",
@@ -255,8 +249,8 @@
public void testExcludeNSWithPackageName() throws Exception {
String[] args = new String[] {"-d", output.getCanonicalPath(),
"-nexclude",
- "http://apache.org/test/types=com.iona";,
- "-nexclude", "http://apache.org/Invoice";,
+ "http://apache.org/test/types=com.iona";,
"-nexclude",
+ "http://apache.org/Invoice";,
getLocation("/wsdl2java_wsdl/hello_world_exclude.wsdl")};
WSDLToJava.main(args);
@@ -272,8 +266,7 @@
assertFalse("Generated file has been excluded", invoice.exists());
}
-
-
+
public void testExcludeNSWithoutPackageName() throws Exception {
String[] args = new String[] {"-d", output.getCanonicalPath(),
"-nexclude",
@@ -286,14 +279,12 @@
assertFalse("Generated file has been excluded", com.exists());
}
-
-
+
public void testCommandLine() throws Exception {
String[] args = new String[] {"-compile", "-d",
output.getCanonicalPath(), "-classdir",
output.getCanonicalPath() + "/classes",
"-p", "org.cxf", "-p",
"http://apache.org/hello_world_soap_http/types=org.apache.types";,
- "-server", "-impl",
-
getLocation("/wsdl2java_wsdl/hello_world.wsdl")};
+ "-server", "-impl",
getLocation("/wsdl2java_wsdl/hello_world.wsdl")};
WSDLToJava.main(args);
Class clz = classLoader.loadClass("org.cxf.Greeter");
@@ -301,7 +292,6 @@
clz = classLoader.loadClass("org.apache.types.GreetMe");
}
-
public void testDefaultLoadNSMappingOFF() throws Exception {
String[] args = new String[] {"-dns", "false", "-d",
output.getCanonicalPath(),
getLocation("/wsdl2java_wsdl/basic_callback.wsdl")};
@@ -345,10 +335,7 @@
File[] files = address.listFiles();
assertEquals(11, files.length);
}
-
-
-
public void testBug305924ForNestedBinding() {
try {
String[] args = new String[] {"-all", "-compile", "-classdir",
@@ -368,7 +355,7 @@
e.printStackTrace();
}
}
-
+
public void testBug305924ForExternalBinding() {
try {
String[] args = new String[] {"-all", "-compile", "-classdir",
@@ -389,8 +376,7 @@
}
}
-
- private String getLocation(String wsdlFile) {
- return this.getClass().getResource(wsdlFile).getFile();
+ private String getLocation(String wsdlFile) throws URISyntaxException {
+ return this.getClass().getResource(wsdlFile).toURI().getPath();
}
}
Modified:
incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenOptionTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenOptionTest.java?view=diff&rev=515526&r1=515525&r2=515526
==============================================================================
---
incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenOptionTest.java
(original)
+++
incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenOptionTest.java
Wed Mar 7 02:49:13 2007
@@ -19,6 +19,7 @@
package org.apache.cxf.tools.wsdlto.jaxws;
import java.io.File;
+import java.net.URISyntaxException;
import org.apache.cxf.tools.common.ProcessorTestBase;
import org.apache.cxf.tools.common.ToolConstants;
@@ -98,8 +99,8 @@
}
- private String getLocation(String wsdlFile) {
- return this.getClass().getResource(wsdlFile).getFile();
+ private String getLocation(String wsdlFile) throws URISyntaxException {
+ return this.getClass().getResource(wsdlFile).toURI().getPath();
}
Modified:
incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java?view=diff&rev=515526&r1=515525&r2=515526
==============================================================================
---
incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
(original)
+++
incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
Wed Mar 7 02:49:13 2007
@@ -24,6 +24,7 @@
import java.lang.reflect.Modifier;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
+import java.net.URISyntaxException;
import javax.jws.HandlerChain;
import javax.jws.Oneway;
@@ -786,8 +787,20 @@
WebParam webParamAnn = AnnotationUtil.getWebParam(method, "select");
assertEquals("http://apache.org/locator/query";,
webParamAnn.targetNamespace());
}
+
+ public void testWebFaultAnnotaion() throws Exception {
+ env.put(ToolConstants.CFG_WSDLURL,
getLocation("/wsdl2java_wsdl/jms_test_rpc_fault.wsdl"));
+ env.put(ToolConstants.CFG_SERVICENAME, "HelloWorldService");
+ processor.setContext(env);
+ processor.execute();
+ Class cls =
classLoader.loadClass("org.apache.cxf.hello_world_jms.BadRecordLitFault");
+ WebFault webFault = AnnotationUtil.getPrivClassAnnotation(cls,
WebFault.class);
+ assertEquals("http://www.w3.org/2001/XMLSchema";,
webFault.targetNamespace());
+
+ }
+
- private String getLocation(String wsdlFile) {
- return this.getClass().getResource(wsdlFile).getFile();
+ private String getLocation(String wsdlFile) throws URISyntaxException {
+ return this.getClass().getResource(wsdlFile).toURI().getPath();
}
}
Added:
incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/jms_test_rpc_fault.wsdl
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/jms_test_rpc_fault.wsdl?view=auto&rev=515526
==============================================================================
---
incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/jms_test_rpc_fault.wsdl
(added)
+++
incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/jms_test_rpc_fault.wsdl
Wed Mar 7 02:49:13 2007
@@ -0,0 +1,434 @@
+<?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
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<definitions name="HelloWorldService"
+ targetNamespace="http://cxf.apache.org/hello_world_jms";
+ xmlns="http://schemas.xmlsoap.org/wsdl/";
+ xmlns:jms="http://cxf.apache.org/transports/jms";
+ xmlns:x1="http://cxf.apache.org/hello_world_jms/types";
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";
+ xmlns:tns="http://cxf.apache.org/hello_world_jms";
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema";>
+ <types>
+ <schema targetNamespace="http://cxf.apache.org/hello_world_jms/types";
xmlns="http://www.w3.org/2001/XMLSchema";
xmlns:x1="http://cxf.apache.org/hello_world_jms/types";
elementFormDefault="qualified">
+ <complexType name="ErrorCode">
+ <sequence>
+ <element name="minor" type="short"/>
+ <element name="major" type="short"/>
+ </sequence>
+ </complexType>
+ <complexType name="testRpcLitFault">
+ <sequence>
+ <element name="faultType" type="string"/>
+ </sequence>
+ </complexType>
+ <complexType name="testRpcLitFaultResponse">
+ <sequence/>
+ </complexType>
+
+ <complexType name="NoSuchCodeLit">
+ <sequence>
+ <element name="code" type="x1:ErrorCode"/>
+ </sequence>
+ </complexType>
+ <complexType name="BadRecord">
+ <sequence>
+ <element name="reason" type="string"/>
+ <element name="code" type="short"/>
+ </sequence>
+ </complexType>
+ </schema>
+ </types>
+
+ <message name="greetMe">
+ <part name="stringParam0" type="xsd:string"/>
+ </message>
+ <message name="greetMeResponse">
+ <part name="return" type="xsd:string"/>
+ </message>
+ <message name="sayHi"/>
+ <message name="sayHiResponse">
+ <part name="return" type="xsd:string"/>
+ </message>
+ <message name="greetMeOneWay">
+ <part name="stringParam0" type="xsd:string"/>
+ </message>
+
+ <message name="testRpcLitFaultRequest">
+ <part name="in" type="xsd:string"/>
+ </message>
+ <message name="testRpcLitFaultResponse">
+ <part name="out" type="x1:testRpcLitFaultResponse"/>
+ </message>
+ <message name="NoSuchCodeLitFault">
+ <part name="NoSuchCodeLit" type="x1:NoSuchCodeLit"/>
+ </message>
+ <message name="BadRecordLitFault">
+ <part name="BadRecordLit" type="xsd:string"/>
+ </message>
+
+ <portType name="HelloWorldPortType">
+ <operation name="greetMe">
+ <input message="tns:greetMe" name="greetMe"/>
+ <output message="tns:greetMeResponse" name="greetMeResponse"/>
+ </operation>
+ <operation name="sayHi">
+ <input message="tns:sayHi" name="sayHi"/>
+ <output message="tns:sayHiResponse" name="sayHiResponse"/>
+ </operation>
+ <operation name="greetMeOneWay">
+ <input message="tns:greetMeOneWay" name="greetMeOneWay"/>
+ </operation>
+ <operation name="testRpcLitFault">
+ <input name="testRpcLitFaultRequest"
message="tns:testRpcLitFaultRequest"/>
+ <output name="testRpcLitFaultResponse"
message="tns:testRpcLitFaultResponse"/>
+ <fault name="NoSuchCodeLitFault" message="tns:NoSuchCodeLitFault"/>
+ <fault name="BadRecordLitFault" message="tns:BadRecordLitFault"/>
+ </operation>
+ </portType>
+
+ <portType name="HelloWorldOneWayPort">
+ <operation name="greetMeOneWay">
+ <input message="tns:greetMeOneWay" name="greetMeOneWay"/>
+ </operation>
+ </portType>
+
+ <portType name="HelloWorldPubSubPort">
+ <operation name="greetMeOneWay">
+ <input message="tns:greetMeOneWay" name="greetMeOneWay"/>
+ </operation>
+ </portType>
+
+ <binding name="HelloWorldPortBinding" type="tns:HelloWorldPortType">
+ <soap:binding style="rpc"
transport="http://cxf.apache.org/transports/jms"/>
+ <operation name="greetMe">
+ <soap:operation soapAction="" style="rpc"/>
+ <input name="greetMe">
+ <soap:body
+ namespace="http://cxf.apache.org/hello_world_jms";
use="literal"/>
+ </input>
+ <output name="greetMeResponse">
+ <soap:body
+ namespace="http://cxf.apache.org/hello_world_jms";
use="literal"/>
+ </output>
+ </operation>
+ <operation name="sayHi">
+ <soap:operation soapAction="" style="rpc"/>
+ <input name="sayHi">
+ <soap:body
+ namespace="http://cxf.apache.org/hello_world_jms";
use="literal"/>
+ </input>
+ <output name="sayHiResponse">
+ <soap:body
+ namespace="http://cxf.apache.org/hello_world_jms";
use="literal"/>
+ </output>
+ </operation>
+ <operation name="greetMeOneWay">
+ <soap:operation style="rpc"/>
+ <input name="greetMeOneWay">
+ <soap:body
+ namespace="http://cxf.apache.org/hello_world_jms";
use="literal"/>
+ </input>
+ </operation>
+
+ <operation name="testRpcLitFault">
+ <soap:operation style="rpc"/>
+ <input>
+ <soap:body namespace="http://cxf.apache.org/hello_world_jms";
use="literal"/>
+ </input>
+ <output>
+ <soap:body namespace="http://cxf.apache.org/hello_world_jms";
use="literal"/>
+ </output>
+ <fault name="NoSuchCodeLitFault">
+ <soap:fault name="NoSuchCodeLitFault"
namespace="http://cxf.apache.org/hello_world_jms"; use="literal"/>
+ </fault>
+ <fault name="BadRecordLitFault">
+ <soap:fault name="BadRecordLitFault"
namespace="http://cxf.apache.org/hello_world_jms"; use="literal"/>
+ </fault>
+ </operation>
+ </binding>
+
+ <binding name="HelloWorldQueueBinMsgBinding" type="tns:HelloWorldPortType">
+ <soap:binding style="rpc"
transport="http://cxf.apache.org/transports/jms"/>
+ <operation name="greetMe">
+ <soap:operation soapAction="" style="rpc"/>
+ <input name="greetMe">
+ <soap:body
+ namespace="http://cxf.apache.org/hello_world_jms";
use="literal"/>
+ </input>
+ <output name="greetMeResponse">
+ <soap:body
+ namespace="http://cxf.apache.org/hello_world_jms";
use="literal"/>
+ </output>
+ </operation>
+ <operation name="sayHi">
+ <soap:operation soapAction="" style="rpc"/>
+ <input name="sayHi">
+ <soap:body
+ namespace="http://cxf.apache.org/hello_world_jms";
use="literal"/>
+ </input>
+ <output name="sayHiResponse">
+ <soap:body
+ namespace="http://cxf.apache.org/hello_world_jms";
use="literal"/>
+ </output>
+ </operation>
+ <operation name="greetMeOneWay">
+ <soap:operation style="rpc"/>
+ <input name="greetMeOneWay">
+ <soap:body
+ namespace="http://cxf.apache.org/hello_world_jms";
use="literal"/>
+ </input>
+ </operation>
+ </binding>
+
+ <binding name="HWStaticReplyQTextPortBinding"
type="tns:HelloWorldPortType">
+ <soap:binding style="rpc"
transport="http://cxf.apache.org/transports/jms"/>
+ <operation name="greetMe">
+ <soap:operation soapAction="" style="rpc"/>
+ <input name="greetMe">
+ <soap:body
+ namespace="http://cxf.apache.org/hello_world_jms";
use="literal"/>
+ </input>
+ <output name="greetMeResponse">
+ <soap:body
+ namespace="http://cxf.apache.org/hello_world_jms";
use="literal"/>
+ </output>
+ </operation>
+ <operation name="sayHi">
+ <soap:operation soapAction="" style="rpc"/>
+ <input name="sayHi">
+ <soap:body
+ namespace="http://cxf.apache.org/hello_world_jms";
use="literal"/>
+ </input>
+ <output name="sayHiResponse">
+ <soap:body
+ namespace="http://cxf.apache.org/hello_world_jms";
use="literal"/>
+ </output>
+ </operation>
+ <operation name="greetMeOneWay">
+ <soap:operation style="rpc"/>
+ <input name="greetMeOneWay">
+ <soap:body
+ namespace="http://cxf.apache.org/hello_world_jms";
use="literal"/>
+ </input>
+ </operation>
+ </binding>
+
+ <binding name="HWStaticReplyQBinMsgBinding" type="tns:HelloWorldPortType">
+ <soap:binding style="rpc"
transport="http://cxf.apache.org/transports/jms"/>
+ <operation name="greetMe">
+ <soap:operation soapAction="" style="rpc"/>
+ <input name="greetMe">
+ <soap:body
+ namespace="http://cxf.apache.org/hello_world_jms";
use="literal"/>
+ </input>
+ <output name="greetMeResponse">
+ <soap:body
+ namespace="http://cxf.apache.org/hello_world_jms";
use="literal"/>
+ </output>
+ </operation>
+ <operation name="sayHi">
+ <soap:operation soapAction="" style="rpc"/>
+ <input name="sayHi">
+ <soap:body
+ namespace="http://cxf.apache.org/hello_world_jms";
use="literal"/>
+ </input>
+ <output name="sayHiResponse">
+ <soap:body
+ namespace="http://cxf.apache.org/hello_world_jms";
use="literal"/>
+ </output>
+ </operation>
+ <operation name="greetMeOneWay">
+ <soap:operation style="rpc"/>
+ <input name="greetMeOneWay">
+ <soap:body
+ namespace="http://cxf.apache.org/hello_world_jms";
use="literal"/>
+ </input>
+ </operation>
+ </binding>
+
+ <binding name="HWJMSAddressingBinding" type="tns:HelloWorldPortType">
+ <soap:binding style="rpc"
transport="http://cxf.apache.org/transports/jms"/>
+ <operation name="greetMe">
+ <soap:operation soapAction="" style="rpc"/>
+ <input name="greetMe">
+ <soap:body
+ namespace="http://cxf.apache.org/hello_world_jms";
use="literal"/>
+ </input>
+ <output name="greetMeResponse">
+ <soap:body
+ namespace="http://cxf.apache.org/hello_world_jms";
use="literal"/>
+ </output>
+ </operation>
+ <operation name="sayHi">
+ <soap:operation soapAction="" style="rpc"/>
+ <input name="sayHi">
+ <soap:body
+ namespace="http://cxf.apache.org/hello_world_jms";
use="literal"/>
+ </input>
+ <output name="sayHiResponse">
+ <soap:body
+ namespace="http://cxf.apache.org/hello_world_jms";
use="literal"/>
+ </output>
+ </operation>
+ <operation name="greetMeOneWay">
+ <soap:operation style="rpc"/>
+ <input name="greetMeOneWay">
+ <soap:body
+ namespace="http://cxf.apache.org/hello_world_jms";
use="literal"/>
+ </input>
+ </operation>
+ </binding>
+
+
+ <binding name="HelloWorldOneWayBinding" type="tns:HelloWorldOneWayPort">
+ <soap:binding style="rpc"
transport="http://cxf.apache.org/transports/jms"/>
+ <operation name="greetMeOneWay">
+ <soap:operation style="rpc"/>
+ <input name="greetMeOneWay">
+ <soap:body
+ namespace="http://cxf.apache.org/hello_world_jms";
use="literal"/>
+ </input>
+ </operation>
+ </binding>
+
+ <binding name="HelloWorldPubSubBinding" type="tns:HelloWorldPubSubPort">
+ <soap:binding style="rpc"
transport="http://cxf.apache.org/transports/jms"/>
+ <operation name="greetMeOneWay">
+ <soap:operation style="rpc"/>
+ <input name="greetMeOneWay">
+ <soap:body
+ namespace="http://cxf.apache.org/hello_world_jms";
use="literal"/>
+ </input>
+ </operation>
+ </binding>
+
+ <service name="HelloWorldQueueBinMsgService">
+ <port binding="tns:HelloWorldQueueBinMsgBinding"
name="HelloWorldQueueBinMsgPort">
+ <jms:address
+ jndiConnectionFactoryName="ConnectionFactory"
+ jndiDestinationName="dynamicQueues/test.jmstransport.binary">
+ <jms:JMSNamingProperty name="java.naming.factory.initial"
value="org.activemq.jndi.ActiveMQInitialContextFactory"/>
+ <jms:JMSNamingProperty name="java.naming.provider.url"
value="tcp://localhost:61500"/>
+ </jms:address>
+
+ <jms:client messageType="binary"/>
+ <jms:server durableSubscriberName="CXF_subscriber"/>
+ </port>
+ </service>
+
+ <service name="HelloWorldService">
+ <port binding="tns:HelloWorldPortBinding" name="HelloWorldPort">
+ <jms:address
+ jndiConnectionFactoryName="ConnectionFactory"
+ jndiDestinationName="dynamicQueues/test.jmstransport.text">
+ <jms:JMSNamingProperty name="java.naming.factory.initial"
value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
+ <jms:JMSNamingProperty name="java.naming.provider.url"
value="tcp://localhost:61500"/>
+ </jms:address>
+
+ <jms:server durableSubscriberName="CXF_subscriber"/>
+ </port>
+ </service>
+
+ <service name="HelloWorldServiceLoop">
+ <port binding="tns:HWStaticReplyQBinMsgBinding"
name="HelloWorldPortLoop">
+ <jms:address
+ jndiConnectionFactoryName="ConnectionFactory"
+ jndiDestinationName="dynamicQueues/test.jmstransport.binary"
+
jndiReplyDestinationName="dynamicQueues/test.jmstransport.binary">
+ <jms:JMSNamingProperty name="java.naming.factory.initial"
value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
+ <jms:JMSNamingProperty name="java.naming.provider.url"
value="tcp://localhost:61500"/>
+ </jms:address>
+
+ <jms:client messageType="binary"/>
+ <jms:server durableSubscriberName="CXF_subscriber"/>
+ </port>
+ </service>
+
+ <service name="HWStaticReplyQBinMsgService">
+ <port binding="tns:HWStaticReplyQBinMsgBinding"
name="HWStaticReplyQBinMsgPort">
+ <jms:address
+ jndiConnectionFactoryName="ConnectionFactory"
+ jndiDestinationName="dynamicQueues/test.jmstransport.binary"
+
jndiReplyDestinationName="dynamicQueues/test.jmstransport.binary.reply">
+ <jms:JMSNamingProperty name="java.naming.factory.initial"
value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
+ <jms:JMSNamingProperty name="java.naming.provider.url"
value="tcp://localhost:61500"/>
+ </jms:address>
+
+ <jms:client messageType="binary"/>
+ <jms:server durableSubscriberName="CXF_subscriber"/>
+ </port>
+ </service>
+
+ <service name="HWStaticReplyQTextMsgService">
+ <port binding="tns:HWStaticReplyQTextPortBinding"
name="HWStaticReplyQTextPort">
+
+ <jms:address
+ jndiConnectionFactoryName="ConnectionFactory"
+ jndiDestinationName="dynamicQueues/test.jmstransport.text"
+
jndiReplyDestinationName="dynamicQueues/test.jmstransport.text.reply">
+ <jms:JMSNamingProperty name="java.naming.factory.initial"
value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
+ <jms:JMSNamingProperty name="java.naming.provider.url"
value="tcp://localhost:61500"/>
+ </jms:address>
+
+ <jms:server durableSubscriberName="CXF_subscriber"/>
+ </port>
+ </service>
+
+ <service name="HelloWorldOneWayQueueService">
+ <port binding="tns:HelloWorldOneWayBinding"
name="HelloWorldOneWayQueuePort">
+ <jms:address
+ jndiConnectionFactoryName="ConnectionFactory"
+ jndiDestinationName="dynamicQueues/test.jmstransport.oneway">
+ <jms:JMSNamingProperty name="java.naming.factory.initial"
value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
+ <jms:JMSNamingProperty name="java.naming.provider.url"
value="tcp://localhost:61500"/>
+ </jms:address>
+
+ <jms:server durableSubscriberName="CXF_subscriber"/>
+ </port>
+ </service>
+
+ <service name="HelloWorldPubSubService">
+ <port binding="tns:HelloWorldPubSubBinding"
name="HelloWorldPubSubPort">
+ <jms:address
+ destinationStyle="topic"
+ jndiConnectionFactoryName="ConnectionFactory"
+
jndiDestinationName="dynamicTopics/test.jmstransport.oneway.topic">
+ <jms:JMSNamingProperty name="java.naming.factory.initial"
value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
+ <jms:JMSNamingProperty name="java.naming.provider.url"
value="tcp://localhost:61500"/>
+ </jms:address>
+ </port>
+ </service>
+
+ <service name="JMSSOAPServiceAddressing">
+ <port binding="tns:HWJMSAddressingBinding" name="HWJMSAddressingPort">
+ <jms:address
+ jndiConnectionFactoryName="ConnectionFactory"
+ jndiDestinationName="dynamicQueues/test.jms.addr.queue"
+
jndiReplyDestinationName="dynamicQueues/test.jms.addr.reply.queue">
+ <jms:JMSNamingProperty name="java.naming.factory.initial"
value="org.apache.activemq.jndi.ActiveMQInitialContextFactory"/>
+ <jms:JMSNamingProperty name="java.naming.provider.url"
value="tcp://localhost:61500"/>
+ </jms:address>
+ <wswa:UsingAddressing
xmlns:wswa="http://www.w3.org/2005/08/addressing/wsdl"/>
+ </port>
+ </service>
+
+</definitions>
+
+
Propchange:
incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/jms_test_rpc_fault.wsdl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/jms_test_rpc_fault.wsdl
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/jms_test_rpc_fault.wsdl
------------------------------------------------------------------------------
svn:mime-type = text/xml
