cxf git commit: [CXF-6580] wsdl2java - Issue with import to default namespace

2015-09-09 Thread ay 
Repository: cxf
Updated Branches:
  refs/heads/master e28d25804 -> ce2c3121e


[CXF-6580] wsdl2java - Issue with import to default namespace


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ce2c3121
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ce2c3121
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ce2c3121

Branch: refs/heads/master
Commit: ce2c3121e15f3b25d69a75637a6df21ad4d748a7
Parents: e28d258
Author: Akitoshi Yoshida 
Authored: Wed Sep 9 10:57:57 2015 +0200
Committer: Akitoshi Yoshida 
Committed: Wed Sep 9 10:58:24 2015 +0200

--
 .../databinding/jaxb/JAXBDataBinding.java   |  4 +-
 .../cxf/tools/wsdlto/jaxws/CodeGenTest.java | 13 +++
 .../wsdl2java_wsdl/cxf6580/catalog.xml  | 24 ++
 .../wsdl2java_wsdl/cxf6580/hello_default.xsd| 28 +++
 .../wsdl2java_wsdl/cxf6580/hello_import.wsdl| 83 
 .../wsdl2java_wsdl/cxf6580/hello_types2.xsd | 27 +++
 6 files changed, 177 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2c3121/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
--
diff --git 
a/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
 
b/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
index d06e92a..8daf996 100644
--- 
a/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
+++ 
b/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
@@ -672,8 +672,8 @@ public class JAXBDataBinding implements DataBindingProfile {
 continue;
 }
 String key = schema.getSourceURI();
-String tns = schema.getTargetNamespace();
-if (ids.contains(key) || tns == null) {
+// accepting also a null tns (e.g., reported by 
apache.ws.xmlschema for no-namespace)
+if (ids.contains(key)) {
 continue;
 }
 if (key.startsWith("file:") || key.startsWith("jar:")) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2c3121/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
--
diff --git 
a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
 
b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
index 0575079..c4500cd 100644
--- 
a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
+++ 
b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
@@ -1588,6 +1588,19 @@ public class CodeGenTest extends AbstractCodeGenTest {
 assertEquals(Exception.class, fault.getSuperclass());
 }
 @Test
+public void testNoTargetNamespaceSchema() throws Exception {
+env.put(ToolConstants.CFG_WSDLURL, 
getLocation("/wsdl2java_wsdl/cxf6580/hello_import.wsdl"));
+env.put(ToolConstants.CFG_CATALOG, 
getLocation("/wsdl2java_wsdl/cxf6580/catalog.xml"));
+
+processor.setContext(env);
+processor.execute();
+
+File helloFile = new File(output, 
"org/apache/hello_soap_http/types/Hello.java");
+assertTrue(helloFile.exists());
+helloFile = new File(output, 
"org/apache/hello_soap_http/types/HelloResponse.java");
+assertTrue(helloFile.exists());
+}
+@Test
 public void testExceptionSuper() throws Exception {
 env.put(ToolConstants.CFG_WSDLURL, 
getLocation("/wsdl2java_wsdl/hello_world.wsdl"));
 env.put(ToolConstants.CFG_EXCEPTION_SUPER, 
"java.lang.RuntimeException");

http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2c3121/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf6580/catalog.xml
--
diff --git 
a/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf6580/catalog.xml 
b/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf6580/catalog.xml
new file mode 100644
index 000..609a158
--- /dev/null
+++ b/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf6580/catalog.xml
@@ -0,0 +1,24 @@
+
+
+http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd";>
+
+http://apache.org/hello_soap_http/hello_types2.xsd"/>
+http://apache.org/hello_soap_http/hello_default.xsd"/>
+

http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2c3121/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf6580/hello_default.xsd
---

cxf git commit: [CXF-6580] wsdl2java - Issue with import to default namespace

2015-09-09 Thread ay 
Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes 3124e094c -> 400a46825


[CXF-6580] wsdl2java - Issue with import to default namespace


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/400a4682
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/400a4682
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/400a4682

Branch: refs/heads/2.7.x-fixes
Commit: 400a46825f2f76b7893e18d127d267a2bdb716b6
Parents: 3124e09
Author: Akitoshi Yoshida 
Authored: Wed Sep 9 10:57:57 2015 +0200
Committer: Akitoshi Yoshida 
Committed: Wed Sep 9 11:32:12 2015 +0200

--
 .../databinding/jaxb/JAXBDataBinding.java   |  4 +-
 .../cxf/tools/wsdlto/jaxws/CodeGenTest.java | 13 +++
 .../wsdl2java_wsdl/cxf6580/catalog.xml  | 24 ++
 .../wsdl2java_wsdl/cxf6580/hello_default.xsd| 28 +++
 .../wsdl2java_wsdl/cxf6580/hello_import.wsdl| 83 
 .../wsdl2java_wsdl/cxf6580/hello_types2.xsd | 27 +++
 6 files changed, 177 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/400a4682/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
--
diff --git 
a/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
 
b/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
index feba1fc..3aa7c61 100644
--- 
a/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
+++ 
b/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
@@ -674,8 +674,8 @@ public class JAXBDataBinding implements DataBindingProfile {
 continue;
 }
 String key = schema.getSourceURI();
-String tns = schema.getTargetNamespace();
-if (ids.contains(key) || tns == null) {
+// accepting also a null tns (e.g., reported by 
apache.ws.xmlschema for no-namespace)
+if (ids.contains(key)) {
 continue;
 }
 if (key.startsWith("file:") || key.startsWith("jar:")) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/400a4682/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
--
diff --git 
a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
 
b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
index 2de299b..dd4ef28 100644
--- 
a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
+++ 
b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
@@ -1586,6 +1586,19 @@ public class CodeGenTest extends AbstractCodeGenTest {
 assertEquals(Exception.class, fault.getSuperclass());
 }
 @Test
+public void testNoTargetNamespaceSchema() throws Exception {
+env.put(ToolConstants.CFG_WSDLURL, 
getLocation("/wsdl2java_wsdl/cxf6580/hello_import.wsdl"));
+env.put(ToolConstants.CFG_CATALOG, 
getLocation("/wsdl2java_wsdl/cxf6580/catalog.xml"));
+
+processor.setContext(env);
+processor.execute();
+
+File helloFile = new File(output, 
"org/apache/hello_soap_http/types/Hello.java");
+assertTrue(helloFile.exists());
+helloFile = new File(output, 
"org/apache/hello_soap_http/types/HelloResponse.java");
+assertTrue(helloFile.exists());
+}
+@Test
 public void testExceptionSuper() throws Exception {
 env.put(ToolConstants.CFG_WSDLURL, 
getLocation("/wsdl2java_wsdl/hello_world.wsdl"));
 env.put(ToolConstants.CFG_EXCEPTION_SUPER, 
"java.lang.RuntimeException");

http://git-wip-us.apache.org/repos/asf/cxf/blob/400a4682/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf6580/catalog.xml
--
diff --git 
a/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf6580/catalog.xml 
b/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf6580/catalog.xml
new file mode 100644
index 000..609a158
--- /dev/null
+++ b/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf6580/catalog.xml
@@ -0,0 +1,24 @@
+
+
+http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd";>
+
+http://apache.org/hello_soap_http/hello_types2.xsd"/>
+http://apache.org/hello_soap_http/hello_default.xsd"/>
+

http://git-wip-us.apache.org/repos/asf/cxf/blob/400a4682/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf6580/hello_default.xsd
-

cxf git commit: [CXF-6580] wsdl2java - Issue with import to default namespace

2015-09-09 Thread ay 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 97b94261b -> 799035874


[CXF-6580] wsdl2java - Issue with import to default namespace


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/79903587
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/79903587
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/79903587

Branch: refs/heads/3.0.x-fixes
Commit: 79903587492d6f8d0290ce8ea45a922e143fe19d
Parents: 97b9426
Author: Akitoshi Yoshida 
Authored: Wed Sep 9 10:57:57 2015 +0200
Committer: Akitoshi Yoshida 
Committed: Wed Sep 9 11:30:43 2015 +0200

--
 .../databinding/jaxb/JAXBDataBinding.java   |  4 +-
 .../cxf/tools/wsdlto/jaxws/CodeGenTest.java | 13 +++
 .../wsdl2java_wsdl/cxf6580/catalog.xml  | 24 ++
 .../wsdl2java_wsdl/cxf6580/hello_default.xsd| 28 +++
 .../wsdl2java_wsdl/cxf6580/hello_import.wsdl| 83 
 .../wsdl2java_wsdl/cxf6580/hello_types2.xsd | 27 +++
 6 files changed, 177 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/79903587/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
--
diff --git 
a/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
 
b/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
index d06e92a..8daf996 100644
--- 
a/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
+++ 
b/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
@@ -672,8 +672,8 @@ public class JAXBDataBinding implements DataBindingProfile {
 continue;
 }
 String key = schema.getSourceURI();
-String tns = schema.getTargetNamespace();
-if (ids.contains(key) || tns == null) {
+// accepting also a null tns (e.g., reported by 
apache.ws.xmlschema for no-namespace)
+if (ids.contains(key)) {
 continue;
 }
 if (key.startsWith("file:") || key.startsWith("jar:")) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/79903587/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
--
diff --git 
a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
 
b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
index 15f64ea..962a00b 100644
--- 
a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
+++ 
b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
@@ -1589,6 +1589,19 @@ public class CodeGenTest extends AbstractCodeGenTest {
 assertEquals(Exception.class, fault.getSuperclass());
 }
 @Test
+public void testNoTargetNamespaceSchema() throws Exception {
+env.put(ToolConstants.CFG_WSDLURL, 
getLocation("/wsdl2java_wsdl/cxf6580/hello_import.wsdl"));
+env.put(ToolConstants.CFG_CATALOG, 
getLocation("/wsdl2java_wsdl/cxf6580/catalog.xml"));
+
+processor.setContext(env);
+processor.execute();
+
+File helloFile = new File(output, 
"org/apache/hello_soap_http/types/Hello.java");
+assertTrue(helloFile.exists());
+helloFile = new File(output, 
"org/apache/hello_soap_http/types/HelloResponse.java");
+assertTrue(helloFile.exists());
+}
+@Test
 public void testExceptionSuper() throws Exception {
 env.put(ToolConstants.CFG_WSDLURL, 
getLocation("/wsdl2java_wsdl/hello_world.wsdl"));
 env.put(ToolConstants.CFG_EXCEPTION_SUPER, 
"java.lang.RuntimeException");

http://git-wip-us.apache.org/repos/asf/cxf/blob/79903587/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf6580/catalog.xml
--
diff --git 
a/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf6580/catalog.xml 
b/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf6580/catalog.xml
new file mode 100644
index 000..609a158
--- /dev/null
+++ b/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf6580/catalog.xml
@@ -0,0 +1,24 @@
+
+
+http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd";>
+
+http://apache.org/hello_soap_http/hello_types2.xsd"/>
+http://apache.org/hello_soap_http/hello_default.xsd"/>
+

http://git-wip-us.apache.org/repos/asf/cxf/blob/79903587/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf6580/hello_default.xsd
-