Merging the 1.x delta on top of the equinox based modules

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@718858 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 87 insertions, 5 deletions

diff --git a/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java b/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java
index 74f124f892..08522864b5 100644
--- a/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java
+++ b/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java
@@ -24,7 +24,6 @@ import javax.xml.bind.JAXBContext;
 import junit.framework.TestCase;
 
 import org.apache.tuscany.sca.databinding.xml.Node2String;
-import org.w3c.dom.Node;
 
 /**
  * @version $Rev$ $Date$
@@ -33,7 +32,7 @@ public class JAXBReflectionTestCase extends TestCase {
 
     public void testGenerateSchema() throws Exception {
         JAXBContext context = JAXBContext.newInstance("com.example.ipo.jaxb");
-        Node schema = JAXBContextHelper.generateSchema(context);
-        System.out.println(new Node2String().transform(schema, null));
+        Map<String, String> schemas = JAXBTypeHelper.generateSchema(context);
+        System.out.println(schemas);
     }
 }
diff --git a/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyJaxbBean.java b/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyJaxbBean.java
new file mode 100644
index 0000000000..3c3992524a
--- /dev/null
+++ b/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyJaxbBean.java
@@ -0,0 +1,64 @@
+/*
+ * 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.    
+ */
+
+package org.apache.tuscany.sca.databinding.jaxb;
+
+import javax.xml.bind.annotation.XmlAnyElement;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.adapters.XmlAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+import org.w3c.dom.Element;
+
+/**
+ * 
+ */
+@XmlRootElement(name = "myBean", namespace = "http://ns1")
+public class MyJaxbBean {
+    public MyBean myBean;
+
+    @XmlJavaTypeAdapter(AnyTypeXmlAdapter.class)
+    public MyInterface myInterface;
+
+    @XmlElement(type = MyInterfaceImpl.class)
+    public MyInterface myInterface1;
+    
+    @XmlJavaTypeAdapter(MyInterfaceAdapter.class)
+    public MyInterface myInterface2;
+
+    public Object myObject;
+    
+    @XmlAnyElement
+    public Element anyElement;
+    
+    public static class MyInterfaceAdapter extends XmlAdapter<MyInterfaceImpl, MyInterface> {
+
+        @Override
+        public MyInterfaceImpl marshal(MyInterface v) throws Exception {
+            return (MyInterfaceImpl) v;
+        }
+
+        @Override
+        public MyInterface unmarshal(MyInterfaceImpl v) throws Exception {
+            return (MyInterface) v;
+        }
+
+    }
+}
diff --git a/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java b/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java
index 2603412a9d..e70987de51 100644
--- a/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java
+++ b/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java
@@ -20,6 +20,7 @@ package org.apache.tuscany.sca.databinding.jaxb;
 
 import java.io.StringReader;
 import java.io.StringWriter;
+import java.util.Map;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBElement;
@@ -34,6 +35,24 @@ import junit.framework.TestCase;
  * @version $Rev$ $Date$
  */
 public class POJOTestCase extends TestCase {
+    public void testAdapter() throws Exception {
+        JAXBContext context = JAXBContext.newInstance(MyJaxbBean.class, MyInterfaceImpl.class);
+        StringWriter writer = new StringWriter();
+        MyJaxbBean bean = new MyJaxbBean();
+        bean.myBean = new MySubBean();
+        bean.myBean.setName("Ray");
+        bean.myInterface = new MyInterfaceImpl();
+        bean.myInterface.setId("001");
+        bean.myObject = new MyBean();
+        ((MyBean) bean.myObject).setName("Y");
+        context.createMarshaller().marshal(bean, writer);
+        System.out.println(writer.toString());
+        Object result = context.createUnmarshaller().unmarshal(new StringReader(writer.toString()));
+        assertTrue(result instanceof MyJaxbBean);
+        Map<String, String> schemas = JAXBTypeHelper.generateSchema(context);
+        System.out.println(schemas);
+    }
+    
     public void testPOJO() throws Exception {
         JAXBContext context = JAXBContext.newInstance(MyBean.class, MyInterfaceImpl.class);
         StringWriter writer = new StringWriter();
@@ -60,7 +79,7 @@ public class POJOTestCase extends TestCase {
     }
     
     public void testPOJOArray() throws Exception {
-        JAXBContext context = JAXBContext.newInstance(MyBean[].class);
+        JAXBContext context = JAXBContext.newInstance(MyBean[].class, MySubBean.class);
         StringWriter writer = new StringWriter();
         MySubBean bean = new MySubBean();
         bean.setAddtional("SUB");
@@ -82,7 +101,7 @@ public class POJOTestCase extends TestCase {
         JAXBElement e2 = (JAXBElement)result;
         assertTrue(e2.getValue() instanceof MyBean[]);
         MyBean newBean = ((MyBean[])e2.getValue())[0];
-        assertFalse(newBean instanceof MySubBean);
+        assertTrue(newBean instanceof MySubBean);
     }
 
     /*