From f6acea6dfa2059450db3961d42ccf09502d4d273 Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 24 Jul 2008 23:52:15 +0000
Subject: Fix TUSCANY-2479

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@679617 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/tuscany/sca/binding/ws/other/Other.java  | 12 ++++++++++++
 .../apache/tuscany/sca/binding/ws/other/package-info.java    |  3 +++
 .../apache/tuscany/sca/binding/ws/wsdlgen/TestJavaClass.java |  2 ++
 .../apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java  |  9 +++++++++
 4 files changed, 26 insertions(+)
 create mode 100644 java/sca/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/Other.java
 create mode 100644 java/sca/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/package-info.java

(limited to 'java/sca/modules')

diff --git a/java/sca/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/Other.java b/java/sca/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/Other.java
new file mode 100644
index 0000000000..b316b77793
--- /dev/null
+++ b/java/sca/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/Other.java
@@ -0,0 +1,12 @@
+package org.apache.tuscany.sca.binding.ws.other;
+
+public class Other {
+    private String name;
+
+    public String getName() {
+        return name;
+    }
+    public void setName(String name ) {
+        this.name = name;
+    }
+}
diff --git a/java/sca/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/package-info.java b/java/sca/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/package-info.java
new file mode 100644
index 0000000000..5056760366
--- /dev/null
+++ b/java/sca/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/package-info.java
@@ -0,0 +1,3 @@
+@javax.xml.bind.annotation.XmlSchema(namespace = "http://other.ws.binding.sca.tuscany.apache.org/")
+package org.apache.tuscany.sca.binding.ws.other;
+
diff --git a/java/sca/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaClass.java b/java/sca/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaClass.java
index 909d1f4c49..3fd7361ae1 100644
--- a/java/sca/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaClass.java
+++ b/java/sca/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaClass.java
@@ -18,12 +18,14 @@
  */
 
 package org.apache.tuscany.sca.binding.ws.wsdlgen;
+import org.apache.tuscany.sca.binding.ws.other.Other;
 
 /**
  *
  * @version $Rev$ $Date$
  */
 public class TestJavaClass {
+    public Other other;
     public String name;
     public int number;
     public float balance;
diff --git a/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java b/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java
index f5189345f7..8f8e907a31 100644
--- a/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java
+++ b/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java
@@ -23,6 +23,8 @@ import java.beans.Introspector;
 import java.io.IOException;
 import java.io.StringReader;
 import java.io.StringWriter;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -188,6 +190,13 @@ public class JAXBTypeHelper implements XMLTypeHelper {
             definition.setUnresolved(true);
             definition.setDocument((Document)entry.getValue().getNode());
             definition.setNamespace(entry.getKey());
+            URI location = null;
+            try {
+                location = new URI(entry.getValue().getSystemId());
+            } catch (URISyntaxException e) {
+                // ignore: use null value
+            }    
+            definition.setLocation(location);
             definitions.add(definition);
         }
     }
-- 
cgit v1.2.3