38 files changed, 2817 insertions, 0 deletions
diff --git a/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2String.java b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2String.java
new file mode 100755
index 0000000000..c188e94f3b
--- /dev/null
+++ b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2String.java
@@ -0,0 +1,61 @@
+/*
+ * 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.databinding.sdo;
+
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.spi.databinding.PullTransformer;
+import org.apache.tuscany.spi.databinding.TransformationContext;
+import org.apache.tuscany.spi.databinding.TransformationException;
+import org.apache.tuscany.spi.databinding.Transformer;
+import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
+import org.osoa.sca.annotations.Service;
+
+import commonj.sdo.DataObject;
+import commonj.sdo.helper.HelperContext;
+import commonj.sdo.helper.XMLHelper;
+
+@Service(Transformer.class)
+public class DataObject2String extends TransformerExtension<DataObject, String> implements
+    PullTransformer<DataObject, String> {
+
+    public String transform(DataObject source, TransformationContext context) {
+        try {
+            HelperContext helperContext = SDOContextHelper.getHelperContext(context);
+            XMLHelper xmlHelper = helperContext.getXMLHelper();
+            QName elementName = SDOContextHelper.getElement(context.getSourceDataType());
+            return xmlHelper.save(source, elementName.getNamespaceURI(), elementName.getLocalPart());
+        } catch (Exception e) {
+            throw new TransformationException(e);
+        }
+    }
+
+    public Class getSourceType() {
+        return DataObject.class;
+    }
+
+    public Class getTargetType() {
+        return String.class;
+    }
+
+    public int getWeight() {
+        return 40;
+    }
+
+}
diff --git a/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2XMLStreamReader.java b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2XMLStreamReader.java
new file mode 100755
index 0000000000..9c93d75adf
--- /dev/null
+++ b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2XMLStreamReader.java
@@ -0,0 +1,70 @@
+/*
+ * 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.databinding.sdo;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.tuscany.sdo.helper.XMLStreamHelper;
+import org.apache.tuscany.sdo.util.SDOUtil;
+import org.apache.tuscany.spi.databinding.PullTransformer;
+import org.apache.tuscany.spi.databinding.TransformationContext;
+import org.apache.tuscany.spi.databinding.TransformationException;
+import org.apache.tuscany.spi.databinding.Transformer;
+import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
+import org.osoa.sca.annotations.Service;
+
+import commonj.sdo.DataObject;
+import commonj.sdo.helper.HelperContext;
+import commonj.sdo.helper.XMLDocument;
+import commonj.sdo.helper.XMLHelper;
+
+@Service(Transformer.class)
+public class DataObject2XMLStreamReader extends TransformerExtension<DataObject, XMLStreamReader> implements
+        PullTransformer<DataObject, XMLStreamReader> {
+
+    public XMLStreamReader transform(DataObject source, TransformationContext context) {
+        try {
+            HelperContext helperContext = SDOContextHelper.getHelperContext(context);
+            XMLStreamHelper streamHelper = SDOUtil.createXMLStreamHelper(helperContext.getTypeHelper());
+            QName elementName = SDOContextHelper.getElement(context.getSourceDataType());
+            XMLHelper xmlHelper = helperContext.getXMLHelper();
+            XMLDocument document =
+                    xmlHelper.createDocument(source, elementName.getNamespaceURI(), elementName.getLocalPart());
+            return streamHelper.createXMLStreamReader(document);
+        } catch (XMLStreamException e) {
+            // TODO: Add context to the exception
+            throw new TransformationException(e);
+        }
+    }
+
+    public Class getSourceType() {
+        return DataObject.class;
+    }
+
+    public Class getTargetType() {
+        return XMLStreamReader.class;
+    }
+
+    public int getWeight() {
+        return 10;
+    }
+
+}
diff --git a/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObjectLoader.java b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObjectLoader.java
new file mode 100755
index 0000000000..25793d1777
--- /dev/null
+++ b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObjectLoader.java
@@ -0,0 +1,73 @@
+/*
+ * 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.databinding.sdo;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.tuscany.sdo.helper.XMLStreamHelper;
+import org.apache.tuscany.sdo.util.SDOUtil;
+import org.apache.tuscany.spi.annotation.Autowire;
+import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.deployer.DeploymentContext;
+import org.apache.tuscany.spi.extension.LoaderExtension;
+import org.apache.tuscany.spi.loader.LoaderException;
+import org.apache.tuscany.spi.loader.LoaderRegistry;
+import org.apache.tuscany.spi.model.ModelObject;
+import org.osoa.sca.annotations.EagerInit;
+import org.osoa.sca.annotations.Property;
+
+import commonj.sdo.DataObject;
+import commonj.sdo.helper.HelperContext;
+import commonj.sdo.helper.TypeHelper;
+
+/**
+ * A SDO model-based Loader to load DataObject from the XML stream
+ */
+@EagerInit
+public class DataObjectLoader extends LoaderExtension<ModelDataObject> {
+    private QName elementName;
+
+    public DataObjectLoader(@Autowire LoaderRegistry registry, 
+                            @Property(name = "namespace", required = true) String namespace, 
+                            @Property(name = "name", required = true) String name) {
+        super(registry);
+        this.elementName = new QName(namespace, name);
+    }
+
+    public ModelDataObject load(CompositeComponent parent,
+                                ModelObject object,
+                                XMLStreamReader reader,
+                                DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
+        assert elementName.equals(reader.getName());
+        HelperContext helperContext = SDOContextHelper.getHelperContext(object);
+        TypeHelper typeHelper = helperContext.getTypeHelper();
+        XMLStreamHelper streamHelper = SDOUtil.createXMLStreamHelper(typeHelper);
+        DataObject dataObject = streamHelper.loadObject(reader);
+        // TODO: Is it required that the object always extends from ModelObject?
+        return new ModelDataObject(dataObject);
+    }
+
+    @Override
+    public QName getXMLType() {
+        return elementName;
+    }
+
+}
diff --git a/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDO.java b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDO.java
new file mode 100644
index 0000000000..8d14773b88
--- /dev/null
+++ b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDO.java
@@ -0,0 +1,47 @@
+/*
+ * 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.databinding.sdo;
+
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.spi.model.ModelObject;
+
+import commonj.sdo.helper.HelperContext;
+
+/**
+ * The model object for import.sdo
+ * 
+ * @version $Rev$ $Date$
+ */
+public class ImportSDO extends ModelObject {
+    public static final QName IMPORT_SDO =
+        new QName("http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0", "import.sdo");
+
+    private HelperContext helperContext;
+
+    public ImportSDO(HelperContext helperContext) {
+        super();
+        this.helperContext = helperContext;
+    }
+
+    public HelperContext getHelperContext() {
+        return helperContext;
+    }
+}
+\ No newline at end of file
diff --git a/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOBuilder.java b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOBuilder.java
new file mode 100644
index 0000000000..31f17860b4
--- /dev/null
+++ b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOBuilder.java
@@ -0,0 +1,57 @@
+/*
+ * 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.databinding.sdo;
+
+import org.apache.tuscany.spi.builder.BuilderException;
+import org.apache.tuscany.spi.component.ComponentRegistrationException;
+import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.SCAObject;
+import org.apache.tuscany.spi.deployer.DeploymentContext;
+import org.apache.tuscany.spi.extension.GenericBuilderExtension;
+
+import commonj.sdo.helper.HelperContext;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class ImportSDOBuilder extends GenericBuilderExtension<SCAObject, ImportSDO> {
+
+    @Override
+    protected Class<ImportSDO> getModelType() {
+        return ImportSDO.class;
+    }
+
+    public SCAObject build(SCAObject parent, ImportSDO modelObject, DeploymentContext deploymentContext)
+        throws BuilderException {
+        if (parent instanceof CompositeComponent) {
+            CompositeComponent component = (CompositeComponent)parent;
+            SDOHelperContext obj = new SDOHelperContext(component, modelObject.getHelperContext());
+            try {
+                component.registerJavaObject(obj.getName(), HelperContext.class, obj.getHelperContext());
+            } catch (ComponentRegistrationException e) {
+                throw new IllegalArgumentException(e);
+            }
+            return obj;
+        } else {
+            return null;
+        }
+    }
+
+}
diff --git a/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOLoader.java b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOLoader.java
new file mode 100755
index 0000000000..f115fc78ec
--- /dev/null
+++ b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOLoader.java
@@ -0,0 +1,163 @@
+/*
+ * 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.databinding.sdo;
+
+import static org.apache.tuscany.databinding.sdo.ImportSDO.IMPORT_SDO;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.net.URI;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.tuscany.spi.annotation.Autowire;
+import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.deployer.DeploymentContext;
+import org.apache.tuscany.spi.extension.LoaderExtension;
+import org.apache.tuscany.spi.loader.LoaderException;
+import org.apache.tuscany.spi.loader.LoaderRegistry;
+import org.apache.tuscany.spi.loader.LoaderUtil;
+import org.apache.tuscany.spi.model.ModelObject;
+import org.osoa.sca.annotations.Constructor;
+
+import commonj.sdo.helper.HelperContext;
+import commonj.sdo.helper.XSDHelper;
+import commonj.sdo.impl.HelperProvider;
+
+/**
+ * Loader that handles &lt;import.sdo&gt; elements.
+ * 
+ * @version $Rev$ $Date$
+ */
+public class ImportSDOLoader extends LoaderExtension {
+
+    @Constructor( {"registry"})
+    public ImportSDOLoader(@Autowire
+    LoaderRegistry registry) {
+        super(registry);
+    }
+
+    public QName getXMLType() {
+        return IMPORT_SDO;
+    }
+
+    public ModelObject load(CompositeComponent parent,
+                            ModelObject object,
+                            XMLStreamReader reader,
+                            DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
+        assert IMPORT_SDO.equals(reader.getName());
+
+        // FIXME: [rfeng] How to associate the TypeHelper with deployment
+        // context?
+        HelperContext helperContext = SDOContextHelper.getHelperContext(object);
+
+        importFactory(reader, deploymentContext, helperContext);
+        importWSDL(reader, deploymentContext, helperContext);
+        LoaderUtil.skipToEndElement(reader);
+        return new ImportSDO(helperContext);
+    }
+
+    private void importFactory(XMLStreamReader reader, DeploymentContext deploymentContext, HelperContext helperContext)
+        throws LoaderException {
+        String factoryName = reader.getAttributeValue(null, "factory");
+        if (factoryName != null) {
+            ClassLoader oldCL = Thread.currentThread().getContextClassLoader();
+            try {
+                // set TCCL as SDO needs it
+                ClassLoader cl = deploymentContext.getClassLoader();
+                Thread.currentThread().setContextClassLoader(cl);
+                Class<?> factoryClass = cl.loadClass(factoryName);
+                register(factoryClass, helperContext);
+            } catch (Exception e) {
+                throw new LoaderException(e.getMessage(), e);
+            } finally {
+                Thread.currentThread().setContextClassLoader(oldCL);
+            }
+        }
+    }
+
+    private static void register(Class factoryClass, HelperContext helperContext) throws Exception {
+        Field field = factoryClass.getField("INSTANCE");
+        Object factory = field.get(null);
+        Method method = factory.getClass().getMethod("register", new Class[] {HelperContext.class});
+        method.invoke(factory, new Object[] {helperContext});
+
+        // FIXME: How do we associate the application HelperContext with the one
+        // imported by the composite
+        HelperContext defaultContext = HelperProvider.getDefaultContext();
+        method.invoke(factory, new Object[] {defaultContext});
+    }
+
+    private void importWSDL(XMLStreamReader reader, DeploymentContext deploymentContext, HelperContext helperContext)
+        throws LoaderException {
+        String location = reader.getAttributeValue(null, "location");
+        if (location == null) {
+            location = reader.getAttributeValue(null, "wsdlLocation");
+        }
+        if (location != null) {
+            try {
+                URL wsdlURL = null;
+                URI uri = URI.create(location);
+                if (uri.isAbsolute()) {
+                    wsdlURL = uri.toURL();
+                }
+                wsdlURL = deploymentContext.getClassLoader().getResource(location);
+                if (null == wsdlURL) {
+                    LoaderException loaderException = new LoaderException("WSDL location error");
+                    loaderException.setResourceURI(location);
+                    throw loaderException;
+                }
+                InputStream xsdInputStream = wsdlURL.openStream();
+                try {
+                    XSDHelper xsdHelper = helperContext.getXSDHelper();
+                    xsdHelper.define(xsdInputStream, wsdlURL.toExternalForm());
+                } finally {
+                    xsdInputStream.close();
+                }
+                // FIXME: How do we associate the application HelperContext with the one
+                // imported by the composite
+                HelperContext defaultContext = HelperProvider.getDefaultContext();
+                xsdInputStream = wsdlURL.openStream();
+                try {
+                    XSDHelper xsdHelper = defaultContext.getXSDHelper();
+                    ClassLoader oldCL = Thread.currentThread().getContextClassLoader();
+                    try {
+                        // set TCCL as SDO needs it
+                        ClassLoader cl = deploymentContext.getClassLoader();
+                        Thread.currentThread().setContextClassLoader(cl);
+                        xsdHelper.define(xsdInputStream, wsdlURL.toExternalForm());
+                    } finally {
+                        Thread.currentThread().setContextClassLoader(oldCL);
+                    }
+                } finally {
+                    xsdInputStream.close();
+                }
+            } catch (IOException e) {
+                LoaderException sfe = new LoaderException(e.getMessage());
+                sfe.setResourceURI(location);
+                throw sfe;
+            }
+        }
+    }
+}
diff --git a/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ModelDataObject.java b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ModelDataObject.java
new file mode 100755
index 0000000000..ba171af498
--- /dev/null
+++ b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ModelDataObject.java
@@ -0,0 +1,43 @@
+/*
+ * 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.databinding.sdo;
+
+import org.apache.tuscany.spi.model.ModelObject;
+
+import commonj.sdo.DataObject;
+
+/**
+ * Wrapper of DataObject as a ModelObject
+ * 
+ * @version $Rev$ $Date$
+ */
+public class ModelDataObject extends ModelObject {
+    private DataObject dataObject;
+
+    public ModelDataObject(DataObject dataObject) {
+        super();
+        this.dataObject = dataObject;
+    }
+
+    public DataObject getDataObject() {
+        return dataObject;
+    }
+    
+    
+}
diff --git a/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOContextHelper.java b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOContextHelper.java
new file mode 100644
index 0000000000..9d37c79228
--- /dev/null
+++ b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOContextHelper.java
@@ -0,0 +1,111 @@
+/*
+ * 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.databinding.sdo;
+
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.sdo.util.SDOUtil;
+import org.apache.tuscany.spi.component.AtomicComponent;
+import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.TargetResolutionException;
+import org.apache.tuscany.spi.databinding.TransformationContext;
+import org.apache.tuscany.spi.idl.XMLType;
+import org.apache.tuscany.spi.model.CompositeComponentType;
+import org.apache.tuscany.spi.model.DataType;
+import org.apache.tuscany.spi.model.ModelObject;
+
+import commonj.sdo.helper.HelperContext;
+import commonj.sdo.impl.HelperProvider;
+
+/**
+ * Helper class to get TypeHelper from the context
+ */
+public final class SDOContextHelper {
+    private SDOContextHelper() {
+    }
+
+    public static HelperContext getHelperContext(TransformationContext context) {
+        if (context == null || context.getMetadata() == null) {
+            return getDefaultHelperContext();
+        }
+        HelperContext helperContext = null;
+        CompositeComponent composite = (CompositeComponent)context.getMetadata().get(CompositeComponent.class);
+        if (composite != null) {
+//            SDOHelperContext sdoContext =
+//                (SDOHelperContext)composite.getExtensions().get(HelperContext.class.getName());
+//            if (sdoContext != null) {
+//                helperContext = sdoContext.getHelperContext();
+//            }
+            AtomicComponent child = (AtomicComponent)composite.getSystemChild(HelperContext.class.getName());
+            try {
+                // The child can be null if no import.sdo is declared
+                if (child != null) {
+                    helperContext = (HelperContext)child.getTargetInstance();
+                }
+            } catch (TargetResolutionException e) {
+                helperContext = null;
+            }
+        }
+        if (helperContext == null) {
+            return getDefaultHelperContext();
+        } else {
+            return helperContext;
+        }
+    }
+
+    public static HelperContext getHelperContext(ModelObject model) {
+        HelperContext helperContext = null;
+        if (model instanceof CompositeComponentType) {
+            // HACK: Retrieve the SDO HelperContext from the
+            // CompositeComponentType
+            // extensions
+            helperContext = (HelperContext)model.getExtensions().get(ImportSDO.IMPORT_SDO);
+            if (helperContext == null) {
+                helperContext = SDOUtil.createHelperContext();
+                ((CompositeComponentType<?, ?, ?>)model).getDeclaredExtensions().put(ImportSDO.IMPORT_SDO,
+                                                                                     helperContext);
+            }
+        }
+
+        if (helperContext == null) {
+            helperContext = getDefaultHelperContext();
+        }
+
+        return helperContext;
+    }
+
+    protected static HelperContext getDefaultHelperContext() {
+        // SDOUtil.createHelperContext();
+        return HelperProvider.getDefaultContext();
+    }
+
+    public static QName getElement(DataType<?> dataType) {
+        Object logical = dataType.getLogical();
+        QName elementName = SDODataBinding.ROOT_ELEMENT;
+        if (logical instanceof XMLType) {
+            XMLType xmlType = (XMLType)logical;
+            QName element = xmlType.getElementName();
+            if (element != null) {
+                elementName = element;
+            }
+        }
+        return elementName;
+    }
+}
diff --git a/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDODataBinding.java b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDODataBinding.java
new file mode 100644
index 0000000000..4178ee9f63
--- /dev/null
+++ b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDODataBinding.java
@@ -0,0 +1,122 @@
+/*
+ * 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.databinding.sdo;
+
+import java.lang.annotation.Annotation;
+
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.spi.databinding.ExceptionHandler;
+import org.apache.tuscany.spi.databinding.SimpleTypeMapper;
+import org.apache.tuscany.spi.databinding.WrapperHandler;
+import org.apache.tuscany.spi.databinding.extension.DataBindingExtension;
+import org.apache.tuscany.spi.idl.XMLType;
+import org.apache.tuscany.spi.model.DataType;
+
+import commonj.sdo.DataObject;
+import commonj.sdo.Type;
+import commonj.sdo.helper.CopyHelper;
+import commonj.sdo.helper.HelperContext;
+import commonj.sdo.helper.XMLDocument;
+import commonj.sdo.impl.HelperProvider;
+
+/**
+ * SDO Databinding
+ * 
+ * @version $Reve$ $Date$
+ */
+public class SDODataBinding extends DataBindingExtension {
+    public static final String NAME = DataObject.class.getName();
+    public static final String[] ALIASES = new String[] {"sdo"};
+    
+    public static final String ROOT_NAMESPACE = "commonj.sdo";
+    public static final QName ROOT_ELEMENT = new QName(ROOT_NAMESPACE, "dataObject");
+
+    private WrapperHandler<Object> wrapperHandler;
+
+    public SDODataBinding() {
+        super(NAME, ALIASES, DataObject.class);
+        wrapperHandler = new SDOWrapperHandler();
+    }
+
+    @Override
+    public boolean introspect(DataType dataType, Annotation[] annotations) {
+        Object physical = dataType.getPhysical();
+        if (!(physical instanceof Class)) {
+            return false;
+        }
+        Class javaType = (Class)physical;
+        HelperContext context = HelperProvider.getDefaultContext();
+        // FIXME: Need a better to test dynamic SDO
+        if (DataObject.class.isAssignableFrom(javaType)) {
+            // Dynamic SDO
+            dataType.setDataBinding(getName());
+            dataType.setLogical(XMLType.UNKNOWN);
+            return true;
+        }
+        // FIXME: We need to access HelperContext
+        Type type = context.getTypeHelper().getType(javaType);
+        if (type == null) {
+            return false;
+        }
+        if (type.isDataType()) {
+            // FIXME: Ignore simple types?
+            return false;
+        }
+        String namespace = type.getURI();
+        String name = context.getXSDHelper().getLocalName(type);
+        QName xmlType = new QName(namespace, name);
+        dataType.setDataBinding(getName());
+        dataType.setLogical(new XMLType(null, xmlType));
+        return true;
+    }
+
+    @Override
+    public WrapperHandler getWrapperHandler() {
+        return wrapperHandler;
+    }
+
+    public SimpleTypeMapper getSimpleTypeMapper() {
+        return new SDOSimpleTypeMapper();
+    }
+
+    @Override
+    public Object copy(Object arg) {
+        HelperContext context = HelperProvider.getDefaultContext();
+        CopyHelper copyHelper = context.getCopyHelper();
+        if (arg instanceof XMLDocument) {
+            XMLDocument document = (XMLDocument)arg;
+            DataObject dataObject = copyHelper.copy(document.getRootObject());
+            return context.getXMLHelper().createDocument(dataObject,
+                                                         document.getRootElementURI(),
+                                                         document.getRootElementName());
+        } else if (arg instanceof DataObject) {
+            return context.getCopyHelper().copy((DataObject)arg);
+        } else {
+            return super.copy(arg);
+        }
+    }
+
+    @Override
+    public ExceptionHandler getExceptionHandler() {
+        return new SDOExceptionHandler();
+    }
+
+}
diff --git a/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOExceptionHandler.java b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOExceptionHandler.java
new file mode 100644
index 0000000000..28a36ea2c8
--- /dev/null
+++ b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOExceptionHandler.java
@@ -0,0 +1,123 @@
+/*
+ * 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.databinding.sdo;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.spi.databinding.ExceptionHandler;
+import org.apache.tuscany.spi.idl.XMLType;
+import org.apache.tuscany.spi.model.DataType;
+
+import commonj.sdo.Type;
+import commonj.sdo.helper.HelperContext;
+import commonj.sdo.impl.HelperProvider;
+
+/**
+ * SDO implementation of ExceptionHandler
+ * 
+ * @version $Rev$ $Date$
+ */
+public class SDOExceptionHandler implements ExceptionHandler {
+    private static final Class[] EMPTY_CLASS_ARRAY = new Class[0];
+
+    // FIXME: Need a way to pass in the HelperContext
+    private HelperContext helperContext = HelperProvider.getDefaultContext();
+
+    /**
+     * <ul>
+     * <li>WrapperException(String message, FaultBean faultInfo) <br>
+     * A constructor where WrapperException is replaced with the name of the
+     * generated wrapper exception and FaultBean is replaced by the name of the
+     * generated fault bean.
+     * <li> WrapperException(String message, FaultBean faultInfo, Throwable
+     * cause) <br>
+     * A constructor whereWrapperException is replaced with the name of the
+     * generated wrapper exception and FaultBean is replaced by the name of the
+     * generated fault bean. The last argument, cause, may be used to convey
+     * protocol specific fault information
+     * </ul>
+     */
+    public Exception createException(DataType<DataType> exceptionType, String message, Object faultInfo, Throwable cause) {
+        Class exceptionClass = (Class)exceptionType.getPhysical();
+        DataType<?> faultBeanType = exceptionType.getLogical();
+        Class faultBeanClass = (Class)faultBeanType.getPhysical();
+        try {
+            Constructor constructor =
+                exceptionClass.getConstructor(new Class[] {String.class, faultBeanClass, Throwable.class});
+            return (Exception)constructor.newInstance(new Object[] {message, faultInfo, cause});
+        } catch (Throwable e) {
+            throw new IllegalArgumentException(e);
+        }
+    }
+
+    public Object getFaultInfo(Exception exception) {
+        if (exception == null) {
+            return null;
+        }
+        try {
+            Method method = exception.getClass().getMethod("getFaultInfo", EMPTY_CLASS_ARRAY);
+            return method.invoke(exception, (Object[])null);
+        } catch (Throwable e) {
+            throw new IllegalArgumentException(e);
+        }
+    }
+
+    public DataType<?> getFaultType(DataType exceptionDataType) {
+        Class exceptionType = (Class) exceptionDataType.getPhysical();
+        Class faultBeanClass = null;
+        try {
+            Method method = exceptionType.getMethod("getFaultInfo", EMPTY_CLASS_ARRAY);
+            faultBeanClass = method.getReturnType();
+        } catch (NoSuchMethodException e) {
+            faultBeanClass = null;
+        }
+        if (faultBeanClass == null) {
+            return null;
+        }
+
+        QName faultElement = null;
+        try {
+            Field field = exceptionType.getField("FAULT_ELEMENT");
+            faultElement = (QName)field.get(null);
+        } catch (NoSuchFieldException e) {
+            // Fall back to type inspection
+            Type type = helperContext.getTypeHelper().getType(faultBeanClass);
+            if (type != null) {
+                String ns = type.getURI();
+                String name = helperContext.getXSDHelper().getLocalName(type);
+                faultElement = new QName(ns, name);
+            }
+        } catch (Throwable e) {
+            // Ignore
+        }
+        if (faultElement == null) {
+            return null;
+        }
+        DataType<XMLType> faultType =
+            new DataType<XMLType>(SDODataBinding.NAME, faultBeanClass, new XMLType(faultElement, null));
+        return faultType;
+
+    }
+
+}
diff --git a/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOHelperContext.java b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOHelperContext.java
new file mode 100644
index 0000000000..3091d7ec8d
--- /dev/null
+++ b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOHelperContext.java
@@ -0,0 +1,48 @@
+/*
+ * 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.databinding.sdo;
+
+import org.apache.tuscany.spi.component.AbstractSCAObject;
+import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.model.Scope;
+
+import commonj.sdo.helper.HelperContext;
+
+public class SDOHelperContext extends AbstractSCAObject {
+    private HelperContext helperContext;
+
+    /**
+     * @param name
+     * @param parent
+     */
+    public SDOHelperContext(CompositeComponent parent, HelperContext helperContext) {
+        super(HelperContext.class.getName(), parent);
+        this.helperContext = helperContext;
+    }
+
+    public Scope getScope() {
+        return Scope.COMPOSITE;
+    }
+
+    public HelperContext getHelperContext() {
+        return helperContext;
+    }
+
+}
+\ No newline at end of file
diff --git a/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOSimpleTypeMapper.java b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOSimpleTypeMapper.java
new file mode 100644
index 0000000000..3b57323c73
--- /dev/null
+++ b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOSimpleTypeMapper.java
@@ -0,0 +1,66 @@
+/*
+ * 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.databinding.sdo;
+
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.sdo.util.SDOUtil;
+import org.apache.tuscany.spi.databinding.SimpleTypeMapper;
+import org.apache.tuscany.spi.databinding.TransformationContext;
+
+import commonj.sdo.Type;
+import commonj.sdo.helper.HelperContext;
+import commonj.sdo.helper.TypeHelper;
+
+/**
+ * SDO Java/XML mapping for simple XSD types
+ */
+public class SDOSimpleTypeMapper implements SimpleTypeMapper {
+    public static final String URI_2001_SCHEMA_XSD = "http://www.w3.org/2001/XMLSchema";
+
+    public SDOSimpleTypeMapper() {
+        super();
+    }
+
+    public Object toJavaObject(QName typeName, String value, TransformationContext context) {
+        Type type = null;
+        if (URI_2001_SCHEMA_XSD.equals(typeName.getNamespaceURI())) {
+            type = SDOUtil.getXSDSDOType(typeName.getLocalPart());
+        } else {
+            HelperContext helperContext = SDOContextHelper.getHelperContext(context);
+            TypeHelper typeHelper = helperContext.getTypeHelper();
+            type = typeHelper.getType(typeName.getNamespaceURI(), typeName.getLocalPart());
+        }
+        return SDOUtil.createFromString(type, value);
+    }
+
+    public String toXMLLiteral(QName typeName, Object obj, TransformationContext context) {
+        Type type = null;
+        if (URI_2001_SCHEMA_XSD.equals(typeName.getNamespaceURI())) {
+            type = SDOUtil.getXSDSDOType(typeName.getLocalPart());
+        } else {
+            HelperContext helperContext = SDOContextHelper.getHelperContext(context);
+            TypeHelper typeHelper = helperContext.getTypeHelper();
+            type = typeHelper.getType(typeName.getNamespaceURI(), typeName.getLocalPart());
+        }
+        return SDOUtil.convertToString(type, obj);
+    }
+
+}
diff --git a/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOWrapperHandler.java b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOWrapperHandler.java
new file mode 100644
index 0000000000..dfbf7dabce
--- /dev/null
+++ b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOWrapperHandler.java
@@ -0,0 +1,99 @@
+/*
+ * 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.databinding.sdo;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.spi.databinding.TransformationContext;
+import org.apache.tuscany.spi.databinding.WrapperHandler;
+import org.apache.tuscany.spi.idl.ElementInfo;
+
+import commonj.sdo.DataObject;
+import commonj.sdo.Property;
+import commonj.sdo.Sequence;
+import commonj.sdo.Type;
+import commonj.sdo.helper.DataFactory;
+import commonj.sdo.helper.HelperContext;
+import commonj.sdo.helper.XMLDocument;
+import commonj.sdo.helper.XMLHelper;
+
+/**
+ * SDO Wrapper Handler
+ */
+public class SDOWrapperHandler implements WrapperHandler<Object> {
+
+    /**
+     * @see org.apache.tuscany.spi.databinding.WrapperHandler#create(ElementInfo, TransformationContext)
+     */
+    public Object create(ElementInfo element, TransformationContext context) {
+        HelperContext helperContext = SDOContextHelper.getHelperContext(context);
+        QName typeName = element.getType().getQName();
+        DataFactory dataFactory = helperContext.getDataFactory();
+        DataObject root = dataFactory.create(typeName.getNamespaceURI(), typeName.getLocalPart());
+        XMLHelper xmlHelper = helperContext.getXMLHelper();
+        return xmlHelper.createDocument(root, element.getQName().getNamespaceURI(), element.getQName().getLocalPart());
+    }
+
+    /**
+     * @see org.apache.tuscany.spi.databinding.WrapperHandler#setChild(java.lang.Object, int, ElementInfo,
+     *      java.lang.Object)
+     */
+    public void setChild(Object wrapper, int i, ElementInfo childElement, Object value) {
+        DataObject wrapperDO =
+            (wrapper instanceof XMLDocument) ? ((XMLDocument)wrapper).getRootObject() : (DataObject)wrapper;
+        wrapperDO.set(i, value);
+    }
+
+    @SuppressWarnings("unchecked")
+    public List getChildren(Object wrapper) {
+        DataObject wrapperDO =
+            (wrapper instanceof XMLDocument) ? ((XMLDocument)wrapper).getRootObject() : (DataObject)wrapper;
+        List<Property> properties = wrapperDO.getInstanceProperties();
+        List<Object> elements = new ArrayList<Object>();
+        Type type = wrapperDO.getType();
+        if (type.isSequenced()) {
+            // Add values in the sequence
+            Sequence sequence = wrapperDO.getSequence();
+            for (int i = 0; i < sequence.size(); i++) {
+                // Skip mixed text
+                if (sequence.getProperty(i) != null) {
+                    elements.add(sequence.getValue(i));
+                }
+            }
+        } else {
+            for (Property p : properties) {
+                Object child = wrapperDO.get(p);
+                if (p.isMany()) {
+                    for (Object c : (Collection<?>)child) {
+                        elements.add(c);
+                    }
+                } else {
+                    elements.add(child);
+                }
+            }
+        }
+        return elements;
+    }
+
+}
diff --git a/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/String2DataObject.java b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/String2DataObject.java
new file mode 100755
index 0000000000..bd288c74e7
--- /dev/null
+++ b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/String2DataObject.java
@@ -0,0 +1,58 @@
+/*
+ * 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.databinding.sdo;
+
+import org.apache.tuscany.spi.databinding.PullTransformer;
+import org.apache.tuscany.spi.databinding.TransformationContext;
+import org.apache.tuscany.spi.databinding.TransformationException;
+import org.apache.tuscany.spi.databinding.Transformer;
+import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
+import org.osoa.sca.annotations.Service;
+
+import commonj.sdo.DataObject;
+import commonj.sdo.helper.HelperContext;
+import commonj.sdo.helper.XMLHelper;
+
+@Service(Transformer.class)
+public class String2DataObject extends TransformerExtension<String, DataObject> implements
+    PullTransformer<String, DataObject> {
+
+    public DataObject transform(String source, TransformationContext context) {
+        try {
+            HelperContext helperContext = SDOContextHelper.getHelperContext(context);
+            XMLHelper xmlHelper = helperContext.getXMLHelper();
+            return xmlHelper.load(source).getRootObject();
+        } catch (Exception e) {
+            throw new TransformationException(e);
+        }
+    }
+
+    public Class getSourceType() {
+        return String.class;
+    }
+
+    public Class getTargetType() {
+        return DataObject.class;
+    }
+
+    public int getWeight() {
+        return 50;
+    }
+
+}
diff --git a/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2String.java b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2String.java
new file mode 100644
index 0000000000..38f48cebee
--- /dev/null
+++ b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2String.java
@@ -0,0 +1,62 @@
+/*
+ * 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.databinding.sdo;
+
+import java.io.StringWriter;
+
+import org.apache.tuscany.spi.databinding.PullTransformer;
+import org.apache.tuscany.spi.databinding.TransformationContext;
+import org.apache.tuscany.spi.databinding.TransformationException;
+import org.apache.tuscany.spi.databinding.Transformer;
+import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
+import org.osoa.sca.annotations.Service;
+
+import commonj.sdo.helper.HelperContext;
+import commonj.sdo.helper.XMLDocument;
+import commonj.sdo.helper.XMLHelper;
+
+@Service(Transformer.class)
+public class XMLDocument2String extends TransformerExtension<XMLDocument, String> implements
+    PullTransformer<XMLDocument, String> {
+
+    public String transform(XMLDocument source, TransformationContext context) {
+        try {
+            HelperContext helperContext = SDOContextHelper.getHelperContext(context);
+            XMLHelper xmlHelper = helperContext.getXMLHelper();
+            StringWriter writer = new StringWriter();
+            xmlHelper.save(source, writer, null);
+            return writer.toString();
+        } catch (Exception e) {
+            throw new TransformationException(e);
+        }
+    }
+
+    public Class getSourceType() {
+        return XMLDocument.class;
+    }
+
+    public Class getTargetType() {
+        return String.class;
+    }
+
+    public int getWeight() {
+        return 40;
+    }
+
+}
diff --git a/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReader.java b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReader.java
new file mode 100755
index 0000000000..bd20089001
--- /dev/null
+++ b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReader.java
@@ -0,0 +1,66 @@
+/*
+ * 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.databinding.sdo;
+
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.tuscany.sdo.helper.XMLStreamHelper;
+import org.apache.tuscany.sdo.util.SDOUtil;
+import org.apache.tuscany.spi.databinding.PullTransformer;
+import org.apache.tuscany.spi.databinding.TransformationContext;
+import org.apache.tuscany.spi.databinding.TransformationException;
+import org.apache.tuscany.spi.databinding.Transformer;
+import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
+import org.osoa.sca.annotations.Service;
+
+import commonj.sdo.helper.HelperContext;
+import commonj.sdo.helper.XMLDocument;
+
+@Service(Transformer.class)
+public class XMLDocument2XMLStreamReader extends TransformerExtension<XMLDocument, XMLStreamReader> implements
+    PullTransformer<XMLDocument, XMLStreamReader> {
+    /**
+     * @param source
+     * @param context
+     * @return
+     */
+    public XMLStreamReader transform(XMLDocument source, TransformationContext context) {
+        try {
+            HelperContext helperContext = SDOContextHelper.getHelperContext(context);
+            XMLStreamHelper streamHelper = SDOUtil.createXMLStreamHelper(helperContext.getTypeHelper());
+            return streamHelper.createXMLStreamReader(source);
+        } catch (XMLStreamException e) {
+            throw new TransformationException(e);
+        }
+    }
+
+    public Class getSourceType() {
+        return XMLDocument.class;
+    }
+
+    public Class getTargetType() {
+        return XMLStreamReader.class;
+    }
+
+    public int getWeight() {
+        return 10;
+    }
+
+}
diff --git a/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2DataObject.java b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2DataObject.java
new file mode 100755
index 0000000000..c29413101d
--- /dev/null
+++ b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2DataObject.java
@@ -0,0 +1,67 @@
+/*
+ * 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.databinding.sdo;
+
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.tuscany.sdo.helper.XMLStreamHelper;
+import org.apache.tuscany.sdo.util.SDOUtil;
+import org.apache.tuscany.spi.databinding.PullTransformer;
+import org.apache.tuscany.spi.databinding.TransformationContext;
+import org.apache.tuscany.spi.databinding.TransformationException;
+import org.apache.tuscany.spi.databinding.Transformer;
+import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
+import org.osoa.sca.annotations.Service;
+
+import commonj.sdo.DataObject;
+import commonj.sdo.helper.HelperContext;
+
+@Service(Transformer.class)
+public class XMLStreamReader2DataObject extends TransformerExtension<XMLStreamReader, DataObject> implements
+    PullTransformer<XMLStreamReader, DataObject> {
+
+    public DataObject transform(XMLStreamReader source, TransformationContext context) {
+        try {
+            HelperContext helperContext = SDOContextHelper.getHelperContext(context);
+            XMLStreamHelper streamHelper = SDOUtil.createXMLStreamHelper(helperContext.getTypeHelper());
+            // The XMLStreamHelper requires that the reader is posistioned at
+            // START_ELEMENT
+            while (source.getEventType() != XMLStreamConstants.START_ELEMENT && source.hasNext()) {
+                source.next();
+            }
+            return streamHelper.loadObject(source);
+        } catch (Exception e) {
+            throw new TransformationException(e);
+        }
+    }
+
+    public Class getTargetType() {
+        return DataObject.class;
+    }
+
+    public Class getSourceType() {
+        return XMLStreamReader.class;
+    }
+
+    public int getWeight() {
+        return 15;
+    }
+
+}
diff --git a/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2XMLDocument.java b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2XMLDocument.java
new file mode 100755
index 0000000000..ff9e0aa2e1
--- /dev/null
+++ b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2XMLDocument.java
@@ -0,0 +1,61 @@
+/*
+ * 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.databinding.sdo;
+
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.tuscany.sdo.helper.XMLStreamHelper;
+import org.apache.tuscany.sdo.util.SDOUtil;
+import org.apache.tuscany.spi.databinding.PullTransformer;
+import org.apache.tuscany.spi.databinding.TransformationContext;
+import org.apache.tuscany.spi.databinding.TransformationException;
+import org.apache.tuscany.spi.databinding.Transformer;
+import org.apache.tuscany.spi.databinding.extension.TransformerExtension;
+import org.osoa.sca.annotations.Service;
+
+import commonj.sdo.helper.HelperContext;
+import commonj.sdo.helper.XMLDocument;
+
+@Service(Transformer.class)
+public class XMLStreamReader2XMLDocument extends TransformerExtension<XMLStreamReader, XMLDocument> implements
+    PullTransformer<XMLStreamReader, XMLDocument> {
+
+    public XMLDocument transform(XMLStreamReader source, TransformationContext context) {
+        try {
+            HelperContext helperContext = SDOContextHelper.getHelperContext(context);
+            XMLStreamHelper streamHelper = SDOUtil.createXMLStreamHelper(helperContext.getTypeHelper());
+            return streamHelper.load(source);
+        } catch (Exception e) {
+            throw new TransformationException(e);
+        }
+    }
+
+    public Class getTargetType() {
+        return XMLDocument.class;
+    }
+
+    public Class getSourceType() {
+        return XMLStreamReader.class;
+    }
+
+    public int getWeight() {
+        return 15;
+    }
+
+}
diff --git a/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/databinding.sdo.scdl b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/databinding.sdo.scdl
new file mode 100644
index 0000000000..e23b3f80bb
--- /dev/null
+++ b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/databinding.sdo.scdl
@@ -0,0 +1,72 @@
+<?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.    
+-->
+<!--
+    SDO databinding extension
+    
+    This is the copy to be included by other extensions
+    
+    $Rev: 431086 $ $Date: 2006-08-12 13:58:17 -0700 (Sat, 12 Aug 2006) $
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+           xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT"
+           name="org.apache.tuscany.databinding.sdo.include">
+
+    <dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT">
+        <group>org.apache.tuscany.sca.services.databinding</group>
+        <name>databinding-sdo</name>
+        <version>0.1-integration-incubating-SNAPSHOT</version>
+    </dependency>
+    
+    <!-- import.sdo element loader implementations -->
+    <component name="elementLoader.import.sdo">
+        <system:implementation.system class="org.apache.tuscany.databinding.sdo.ImportSDOLoader"/>
+    </component>
+
+    <component name="databinding.sdo">
+        <system:implementation.system class="org.apache.tuscany.databinding.sdo.SDODataBinding" />
+    </component>    
+
+    <component name="transformer.DataObject2String">
+        <system:implementation.system class="org.apache.tuscany.databinding.sdo.DataObject2String"/>
+    </component>
+    <component name="transformer.DataObject2XMLStreamReader">
+        <system:implementation.system class="org.apache.tuscany.databinding.sdo.DataObject2XMLStreamReader"/>
+    </component>
+    <component name="transformer.XMLDocument2String">
+        <system:implementation.system class="org.apache.tuscany.databinding.sdo.XMLDocument2String"/>
+    </component>
+    <component name="transformer.String2DataObject">
+        <system:implementation.system class="org.apache.tuscany.databinding.sdo.String2DataObject"/>
+    </component>
+    <component name="transformer.XMLDocument2XMLStreamReader">
+        <system:implementation.system class="org.apache.tuscany.databinding.sdo.XMLDocument2XMLStreamReader"/>
+    </component>
+    <component name="transformer.XMLStreamReader2DataObject">
+        <system:implementation.system class="org.apache.tuscany.databinding.sdo.XMLStreamReader2DataObject"/>
+    </component>
+    <component name="transformer.XMLStreamReader2XMLDocument">
+        <system:implementation.system class="org.apache.tuscany.databinding.sdo.XMLStreamReader2XMLDocument"/>
+    </component>
+
+    <component name="sdotype.builder">
+        <system:implementation.system class="org.apache.tuscany.databinding.sdo.ImportSDOBuilder"/>
+    </component>
+    
+</composite>
diff --git a/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/default.scdl b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/default.scdl
new file mode 100644
index 0000000000..2b2040c148
--- /dev/null
+++ b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/default.scdl
@@ -0,0 +1,66 @@
+<?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.    
+-->
+<!--
+    SDO databinding extension
+    
+    $Rev: 431086 $ $Date: 2006-08-12 13:58:17 -0700 (Sat, 12 Aug 2006) $
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+           xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT"
+           name="org.apache.tuscany.databinding.sdo">
+
+    <dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT">
+        <group>org.apache.tuscany.sca.services.databinding</group>
+        <name>databinding-sdo</name>
+        <version>0.1-integration-incubating-SNAPSHOT</version>
+    </dependency>
+    
+    <!-- import.sdo element loader implementations -->
+    <component name="elementLoader.import.sdo">
+        <system:implementation.system class="org.apache.tuscany.databinding.sdo.ImportSDOLoader"/>
+    </component>
+    
+    <component name="databinding.sdo">
+        <system:implementation.system class="org.apache.tuscany.databinding.sdo.SDODataBinding" />
+    </component>    
+
+    <component name="transformer.DataObject2String">
+        <system:implementation.system class="org.apache.tuscany.databinding.sdo.DataObject2String"/>
+    </component>
+    <component name="transformer.DataObject2XMLStreamReader">
+        <system:implementation.system class="org.apache.tuscany.databinding.sdo.DataObject2XMLStreamReader"/>
+    </component>
+    <component name="transformer.XMLDocument2String">
+        <system:implementation.system class="org.apache.tuscany.databinding.sdo.XMLDocument2String"/>
+    </component>
+    <component name="transformer.String2DataObject">
+        <system:implementation.system class="org.apache.tuscany.databinding.sdo.String2DataObject"/>
+    </component>
+    <component name="transformer.XMLDocument2XMLStreamReader">
+        <system:implementation.system class="org.apache.tuscany.databinding.sdo.XMLDocument2XMLStreamReader"/>
+    </component>
+    <component name="transformer.XMLStreamReader2DataObject">
+        <system:implementation.system class="org.apache.tuscany.databinding.sdo.XMLStreamReader2DataObject"/>
+    </component>
+    <component name="transformer.XMLStreamReader2XMLDocument">
+        <system:implementation.system class="org.apache.tuscany.databinding.sdo.XMLStreamReader2XMLDocument"/>
+    </component>
+    
+</composite>
diff --git a/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/extension.composite b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/extension.composite
new file mode 100644
index 0000000000..a9104cc401
--- /dev/null
+++ b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/extension.composite
@@ -0,0 +1,22 @@
+<?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.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" name="org.apache.tuscany.databinding.sdo">
+    <include name="org.apache.tuscany.databinding.sdo.include" scdlLocation="databinding.sdo.scdl" />
+</composite>
+\ No newline at end of file
diff --git a/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java
new file mode 100644
index 0000000000..8c4f243df5
--- /dev/null
+++ b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java
@@ -0,0 +1,67 @@
+/*
+ * 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 com.example.stock.sdo.fault;
+
+import javax.xml.namespace.QName;
+
+import com.example.stock.sdo.InvalidSymbolFault;
+
+/**
+ * Hand-crafted java exception for SDO fault
+ *
+ */
+public class InvalidSymbolFault_Exception extends Exception {
+    /**
+     * Generated QName for the fault element
+     */
+    public static final QName FAULT_ELEMENT = new QName("http://www.example.com/stock", "InvalidSymbolFault");
+    /**
+     * Java type that goes as soapenv:Fault detail element.
+     */
+    private InvalidSymbolFault faultInfo;
+
+    /**
+     * @param faultInfo
+     * @param message
+     */
+    public InvalidSymbolFault_Exception(String message, InvalidSymbolFault faultInfo) {
+        super(message);
+        this.faultInfo = faultInfo;
+    }
+
+    /**
+     * @param faultInfo
+     * @param message
+     * @param cause
+     */
+    public InvalidSymbolFault_Exception(String message, InvalidSymbolFault faultInfo, Throwable cause) {
+        super(message, cause);
+        this.faultInfo = faultInfo;
+    }
+
+    /**
+     * @return returns fault bean:
+     *         org.apache.tuscany.sca.test.exceptions.impl.jaxb.InvalidSymbolFault
+     */
+    public InvalidSymbolFault getFaultInfo() {
+        return faultInfo;
+    }
+
+}
diff --git a/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObject2StringTestCase.java b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObject2StringTestCase.java
new file mode 100644
index 0000000000..182156c7ac
--- /dev/null
+++ b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObject2StringTestCase.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.databinding.sdo;
+
+import javax.xml.namespace.QName;
+
+import junit.framework.Assert;
+
+import org.apache.tuscany.spi.model.DataType;
+
+import com.example.ipo.sdo.PurchaseOrderType;
+import commonj.sdo.DataObject;
+
+/**
+ * 
+ */
+public class DataObject2StringTestCase extends SDOTransformerTestCaseBase {
+    @Override
+    protected DataType<?> getSourceDataType() {
+        return new DataType<QName>(binding, PurchaseOrderType.class, ORDER_QNAME);
+    }
+
+    @Override
+    protected DataType<?> getTargetDataType() {
+        return new DataType<Class<String>>(String.class, String.class);
+    }
+
+    public final void testTransform() {
+        String xml = new DataObject2String().transform(dataObject, context);
+        Assert.assertTrue(xml.indexOf("<city>San Jose</city>") != -1);
+        DataObject po = new String2DataObject().transform(xml, reversedContext);
+        Assert.assertTrue(po instanceof PurchaseOrderType);
+        PurchaseOrderType orderType = (PurchaseOrderType)po;
+        Assert.assertEquals("San Jose", orderType.getBillTo().getCity());
+    }
+
+    public final void testXML() {
+        String xml =
+            "<foo xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " 
+            + "xmlns:ipo=\"http://www.example.com/IPO\" xsi:type=\"ipo:USAddress\"/>";
+        DataObject dataObject = new String2DataObject().transform(xml, reversedContext);
+        context.setSourceDataType(new DataType<QName>(DataObject.class.getName(), DataObject.class, null));
+        xml = new DataObject2String().transform(dataObject, context);
+        Assert.assertTrue(xml.contains("xsi:type=\"ipo:USAddress\""));
+    }
+
+}
diff --git a/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObject2XMLStreamReaderTestCase.java b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
new file mode 100644
index 0000000000..7a1f03e36f
--- /dev/null
+++ b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
@@ -0,0 +1,57 @@
+/*
+ * 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.databinding.sdo;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.tuscany.spi.model.DataType;
+
+import com.example.ipo.sdo.PurchaseOrderType;
+
+/**
+ * 
+ */
+public class DataObject2XMLStreamReaderTestCase extends SDOTransformerTestCaseBase {
+
+    @Override
+    protected DataType<?> getSourceDataType() {
+        return new DataType<QName>(binding, PurchaseOrderType.class, ORDER_QNAME);
+    }
+
+    @Override
+    protected DataType<?> getTargetDataType() {
+        return new DataType<Class<XMLStreamReader>>(XMLStreamReader.class, XMLStreamReader.class);
+    }
+
+    public final void testTransform() throws XMLStreamException {
+        XMLStreamReader reader = new DataObject2XMLStreamReader().transform(dataObject, context);
+        while (reader.hasNext()) {
+            int event = reader.next();
+            if (event == XMLStreamConstants.START_ELEMENT) {
+                break;
+            }
+        }
+        new XMLStreamReader2DataObject().transform(reader, reversedContext);
+    }
+
+}
diff --git a/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObjectLoaderTestCase.java b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObjectLoaderTestCase.java
new file mode 100755
index 0000000000..f38e0426cb
--- /dev/null
+++ b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObjectLoaderTestCase.java
@@ -0,0 +1,82 @@
+/*
+ * 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.databinding.sdo;
+
+import java.io.StringReader;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamReader;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import org.apache.tuscany.core.component.scope.CompositeScopeContainer;
+import org.apache.tuscany.core.deployer.RootDeploymentContext;
+import org.apache.tuscany.spi.deployer.DeploymentContext;
+
+import commonj.sdo.helper.XSDHelper;
+
+public class DataObjectLoaderTestCase extends TestCase {
+
+    private XSDHelper xsdHelper = XSDHelper.INSTANCE;
+
+    private QName name = new QName("http://www.osoa.org/xmlns/mock/0.9", "implementation.mock");
+
+    private String xml =
+        "<module name=\"m\" xmlns=\"http://www.osoa.org/xmlns/sca/0.9\" " + "xmlns:mock=\"http://www.osoa.org/xmlns/mock/0.9\" "
+            + "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"  "
+            + "xsi:schemaLocation=\"http://www.osoa.org/xmlns/mock/0.9 "
+            + "sca-implementation-mock.xsd http://www.osoa.org/xmlns/sca/0.9 sca-core.xsd \">"
+            + "<component name=\"c\"><mock:implementation.mock myAttr=\"helloworld.HelloWorldImpl\" />"
+            + "</component></module>";
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        URL url = getClass().getClassLoader().getResource("model/sca-implementation-mock.xsd");
+        // URL url =
+        // getClass().getClassLoader().getResource("model/sca-core.xsd");
+        xsdHelper.define(url.openStream(), url.toExternalForm());
+    }
+
+    public void testLoader() throws Exception {
+        XMLInputFactory inputFactory = XMLInputFactory.newInstance();
+        XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(xml));
+        int event = reader.getEventType();
+        while (!(event == XMLStreamConstants.START_ELEMENT && reader.getName().equals(name)) && reader.hasNext()) {
+            event = reader.nextTag();
+        }
+        DataObjectLoader loader = new DataObjectLoader(null, name.getNamespaceURI(), name.getLocalPart());
+        DeploymentContext context =
+            new RootDeploymentContext(getClass().getClassLoader(), inputFactory, new CompositeScopeContainer(null),
+                                      null);
+        ModelDataObject modelObject = (ModelDataObject)loader.load(null, null, reader, context);
+        Assert.assertNotNull(modelObject.getDataObject());
+        Assert.assertTrue(modelObject.getDataObject().getString("myAttr").equals("helloworld.HelloWorldImpl"));
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+}
diff --git a/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/ImportSDOLoaderTestCase.java b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/ImportSDOLoaderTestCase.java
new file mode 100755
index 0000000000..e87526bb9a
--- /dev/null
+++ b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/ImportSDOLoaderTestCase.java
@@ -0,0 +1,87 @@
+/*
+ * 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.databinding.sdo;
+
+import java.io.StringReader;
+
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.core.deployer.RootDeploymentContext;
+import org.apache.tuscany.spi.deployer.DeploymentContext;
+import org.apache.tuscany.spi.loader.LoaderException;
+
+import com.example.ipo.sdo.SdoFactory;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class ImportSDOLoaderTestCase extends TestCase {
+    private static boolean inited;
+
+    private ImportSDOLoader loader;
+    private XMLInputFactory xmlFactory;
+    private DeploymentContext deploymentContext;
+
+    public void testMinimal() throws XMLStreamException, LoaderException {
+        String xml = "<import.sdo xmlns='http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0'/>";
+        XMLStreamReader reader = getReader(xml);
+        assertTrue(loader.load(null, null, reader, deploymentContext) instanceof ImportSDO);
+    }
+
+    public void testLocation() throws XMLStreamException, LoaderException {
+        String xml = "<import.sdo xmlns='http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0' location='ipo.xsd'/>";
+        XMLStreamReader reader = getReader(xml);
+        assertTrue(loader.load(null, null, reader, deploymentContext) instanceof ImportSDO);
+    }
+    
+    public void testFactory() throws XMLStreamException, LoaderException {
+        String xml = "<import.sdo xmlns='http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0' "
+                + "factory='org.apache.tuscany.databinding.sdo.ImportSDOLoaderTestCase$MockFactory'/>";
+        XMLStreamReader reader = getReader(xml);
+        assertFalse(inited);
+        assertTrue(loader.load(null, null, reader, deploymentContext) instanceof ImportSDO);
+        assertTrue(inited);
+    }
+
+    protected void setUp() throws Exception {
+        super.setUp();
+        loader = new ImportSDOLoader(null);
+        xmlFactory = XMLInputFactory.newInstance();
+        deploymentContext = new RootDeploymentContext(getClass().getClassLoader(), xmlFactory, null, null);
+    }
+
+    protected XMLStreamReader getReader(String xml) throws XMLStreamException {
+        XMLStreamReader reader = xmlFactory.createXMLStreamReader(new StringReader(xml));
+        reader.next();
+        return reader;
+    }
+
+    public static class MockFactory {
+        public static final Object INSTANCE = SdoFactory.INSTANCE;
+
+        static {
+            ImportSDOLoaderTestCase.inited = true;
+        }
+    }
+}
+
diff --git a/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDODataBindingTestCase.java b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDODataBindingTestCase.java
new file mode 100644
index 0000000000..e2145f1a5c
--- /dev/null
+++ b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDODataBindingTestCase.java
@@ -0,0 +1,110 @@
+/*
+ * 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.databinding.sdo;
+
+import javax.xml.namespace.QName;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import org.apache.tuscany.spi.idl.XMLType;
+import org.apache.tuscany.spi.model.DataType;
+
+import com.example.ipo.sdo.PurchaseOrderType;
+import com.example.ipo.sdo.SdoFactory;
+import com.example.ipo.sdo.USAddress;
+import commonj.sdo.DataObject;
+import commonj.sdo.helper.HelperContext;
+import commonj.sdo.helper.XMLDocument;
+import commonj.sdo.impl.HelperProvider;
+
+/**
+ * 
+ */
+public class SDODataBindingTestCase extends TestCase {
+    protected static final QName ORDER_QNAME = new QName("http://www.example.com/IPO", "purchaseOrder");
+    private SDODataBinding binding;
+    private HelperContext context;
+
+    /**
+     * @see junit.framework.TestCase#setUp()
+     */
+    protected void setUp() throws Exception {
+        super.setUp();
+        binding = new SDODataBinding();
+        context = HelperProvider.getDefaultContext();
+        SdoFactory.INSTANCE.register(context);
+    }
+
+    public final void testIntrospect() {
+        DataType dataType = new DataType(DataObject.class, null);
+        boolean yes = binding.introspect(dataType, null);
+        assertTrue(yes);
+        assertTrue(dataType.getDataBinding().equals(binding.getName()));
+        assertTrue(dataType.getPhysical() == DataObject.class && dataType.getLogical() == XMLType.UNKNOWN);
+        dataType = new DataType(PurchaseOrderType.class, null);
+        yes = binding.introspect(dataType, null);
+        assertTrue(yes);
+        assertEquals(PurchaseOrderType.class, dataType.getPhysical());
+        assertEquals(new QName("http://www.example.com/IPO", "PurchaseOrderType"), ((XMLType)dataType.getLogical())
+            .getTypeName());
+        dataType = new DataType(USAddress.class, null);
+        yes = binding.introspect(dataType, null);
+        assertTrue(yes);
+        assertEquals(USAddress.class, dataType.getPhysical());
+        assertEquals(new QName("http://www.example.com/IPO", "USAddress"), ((XMLType)dataType.getLogical())
+            .getTypeName());
+    }
+
+    public final void testCopyRoot() {
+        PurchaseOrderType po = SdoFactory.INSTANCE.createPurchaseOrderType();
+        po.setComment("Comment");
+        Object copy = binding.copy(po);
+        assertTrue(copy instanceof PurchaseOrderType);
+        assertTrue(po != copy);
+        assertTrue(context.getEqualityHelper().equal((DataObject)po, (DataObject)copy));
+        assertEquals("Comment", ((PurchaseOrderType)copy).getComment());
+    }
+
+    public final void testCopyNonRoot() {
+        USAddress address = SdoFactory.INSTANCE.createUSAddress();
+        address.setCity("San Jose");
+        Object copy = binding.copy(address);
+        assertTrue(copy instanceof USAddress);
+        assertTrue(address != copy);
+        assertTrue(context.getEqualityHelper().equal((DataObject)address, (DataObject)copy));
+        assertEquals("San Jose", ((USAddress)copy).getCity());
+    }
+
+    public final void testCopyXMLDocument() {
+        PurchaseOrderType po = SdoFactory.INSTANCE.createPurchaseOrderType();
+        po.setComment("Comment");
+        XMLDocument doc =
+            context.getXMLHelper().createDocument((DataObject)po,
+                                                  ORDER_QNAME.getNamespaceURI(),
+                                                  ORDER_QNAME.getLocalPart());
+        Object copy = binding.copy(doc);
+        assertTrue(copy instanceof XMLDocument);
+        XMLDocument docCopy = (XMLDocument)copy;
+        assertTrue(doc != copy);
+        assertTrue(context.getEqualityHelper().equal((DataObject)po, docCopy.getRootObject()));
+        assertEquals("Comment", ((PurchaseOrderType)docCopy.getRootObject()).getComment());
+    }
+}
diff --git a/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDOExceptionHandlerTestCase.java b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDOExceptionHandlerTestCase.java
new file mode 100644
index 0000000000..8226891c35
--- /dev/null
+++ b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDOExceptionHandlerTestCase.java
@@ -0,0 +1,81 @@
+/*
+ * 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.databinding.sdo;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.spi.idl.XMLType;
+import org.apache.tuscany.spi.model.DataType;
+
+import com.example.stock.sdo.InvalidSymbolFault;
+import com.example.stock.sdo.StockFactory;
+import com.example.stock.sdo.fault.InvalidSymbolFault_Exception;
+import commonj.sdo.impl.HelperProvider;
+
+/**
+ * Test case for SDOExceptionHandler
+ */
+public class SDOExceptionHandlerTestCase extends TestCase {
+    // FIXME: Tuscany SDO impl uses _._type for anonymouse type, by the SDO
+    // spec, it should be same as the
+    // enclosing element/attribute name
+    private SDOExceptionHandler handler;
+
+    /**
+     * @see junit.framework.TestCase#setUp()
+     */
+    protected void setUp() throws Exception {
+        super.setUp();
+        this.handler = new SDOExceptionHandler();
+        StockFactory.INSTANCE.register(HelperProvider.getDefaultContext());
+    }
+
+    public void testGetFaultType() {
+        DataType execType = new DataType<XMLType>(InvalidSymbolFault_Exception.class, XMLType.UNKNOWN);
+        DataType<?> dataType = handler.getFaultType(execType);
+        assertEquals(InvalidSymbolFault.class, dataType.getPhysical());
+        assertEquals(InvalidSymbolFault_Exception.FAULT_ELEMENT, ((XMLType) dataType.getLogical()).getElementName());
+        assertEquals(SDODataBinding.NAME, dataType.getDataBinding());
+    }
+
+    public void testCreate() {
+        DataType execType = new DataType<XMLType>(InvalidSymbolFault_Exception.class, XMLType.UNKNOWN);
+        DataType<?> faultType = handler.getFaultType(execType);
+        InvalidSymbolFault fault = StockFactory.INSTANCE.createInvalidSymbolFault();
+        fault.setMessage("ABC");
+        fault.setSymbol("IBM0");
+        DataType<DataType> exType = new DataType<DataType>(InvalidSymbolFault_Exception.class, faultType);
+        Exception ex = handler.createException(exType, "Invalid symbol", fault, null);
+        assertTrue(ex instanceof InvalidSymbolFault_Exception);
+        InvalidSymbolFault_Exception exception = (InvalidSymbolFault_Exception)ex;
+        assertEquals("Invalid symbol", exception.getMessage());
+        assertSame(fault, exception.getFaultInfo());
+    }
+
+    public void testGetFaultInfo() {
+        InvalidSymbolFault fault = StockFactory.INSTANCE.createInvalidSymbolFault();
+        fault.setMessage("ABC");
+        fault.setSymbol("IBM0");
+        InvalidSymbolFault_Exception exception = new InvalidSymbolFault_Exception("Invalid symbol", fault);
+        Object faultInfo = handler.getFaultInfo(exception);
+        assertSame(fault, faultInfo);
+    }
+
+}
diff --git a/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDOTransformerTestCaseBase.java b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDOTransformerTestCaseBase.java
new file mode 100644
index 0000000000..58a05fcf9b
--- /dev/null
+++ b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDOTransformerTestCaseBase.java
@@ -0,0 +1,79 @@
+/*
+ * 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.databinding.sdo;
+
+import javax.xml.namespace.QName;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.core.databinding.impl.TransformationContextImpl;
+import org.apache.tuscany.spi.databinding.TransformationContext;
+import org.apache.tuscany.spi.model.DataType;
+
+import com.example.ipo.sdo.PurchaseOrderType;
+import com.example.ipo.sdo.SdoFactory;
+import com.example.ipo.sdo.USAddress;
+import commonj.sdo.DataObject;
+import commonj.sdo.helper.HelperContext;
+import commonj.sdo.impl.HelperProvider;
+
+/**
+ * The base class for SDO-related test cases
+ */
+public abstract class SDOTransformerTestCaseBase extends TestCase {
+    protected static final QName ORDER_QNAME = new QName("http://www.example.com/IPO", "purchaseOrder");
+
+    protected HelperContext helperContext;
+    protected String binding = DataObject.class.getName();
+    protected TransformationContext context;
+    protected TransformationContext reversedContext; 
+    protected DataObject dataObject;
+
+    /**
+     * @see junit.framework.TestCase#setUp()
+     */
+    protected void setUp() throws Exception {
+        super.setUp();
+        helperContext = HelperProvider.getDefaultContext();
+        SdoFactory.INSTANCE.register(helperContext);
+        
+        context = new TransformationContextImpl();
+        context.setSourceDataType(getSourceDataType());
+        context.setTargetDataType(getTargetDataType());
+
+        reversedContext = new TransformationContextImpl();
+        reversedContext.setSourceDataType(getTargetDataType());
+        reversedContext.setTargetDataType(getSourceDataType());
+        
+        PurchaseOrderType po = SdoFactory.INSTANCE.createPurchaseOrderType();
+        USAddress address = SdoFactory.INSTANCE.createUSAddress();
+        address.setCity("San Jose");
+        address.setStreet("123 ABC St");
+        address.setState("CA");
+        address.setStreet("95131");
+        po.setBillTo(address);
+        dataObject = (DataObject) po;
+    }
+
+    protected abstract DataType<?> getSourceDataType();
+
+    protected abstract DataType<?> getTargetDataType();
+
+}
diff --git a/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDOWrapperHandlerTestCase.java b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDOWrapperHandlerTestCase.java
new file mode 100644
index 0000000000..3ddd1c85dd
--- /dev/null
+++ b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDOWrapperHandlerTestCase.java
@@ -0,0 +1,65 @@
+/*
+ * 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.databinding.sdo;
+
+import static junit.framework.Assert.assertEquals;
+
+import java.util.List;
+
+import org.apache.tuscany.sdo.util.SDOUtil;
+import org.junit.Before;
+import org.junit.Test;
+
+import commonj.sdo.helper.HelperContext;
+import commonj.sdo.helper.XMLDocument;
+import commonj.sdo.helper.XMLHelper;
+import commonj.sdo.helper.XSDHelper;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class SDOWrapperHandlerTestCase {
+    private HelperContext context;
+    private SDOWrapperHandler handler;
+
+    @Before
+    public void setUp() throws Exception {
+        context = SDOUtil.createHelperContext();
+        handler = new SDOWrapperHandler();
+    }
+
+    @Test
+    public void testWrapperAnyType() throws Exception {
+        XMLHelper xmlHelper = context.getXMLHelper();
+        XMLDocument document = xmlHelper.load(getClass().getResourceAsStream("/wrapper.xml"));
+        List children = handler.getChildren(document);
+        assertEquals(5, children.size());
+    }
+
+    @Test
+    public void testWrapper() throws Exception {
+        XSDHelper xsdHelper = context.getXSDHelper();
+        xsdHelper.define(getClass().getResourceAsStream("/wrapper.xsd"), null);
+        XMLHelper xmlHelper = context.getXMLHelper();
+        XMLDocument document = xmlHelper.load(getClass().getResourceAsStream("/wrapper.xml"));
+        List children = handler.getChildren(document);
+        assertEquals(5, children.size());
+    }
+
+}
diff --git a/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
new file mode 100644
index 0000000000..c58636decc
--- /dev/null
+++ b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
@@ -0,0 +1,60 @@
+/*
+ * 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.databinding.sdo;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+import junit.framework.Assert;
+
+import org.apache.tuscany.spi.model.DataType;
+
+import com.example.ipo.sdo.PurchaseOrderType;
+import commonj.sdo.helper.XMLDocument;
+
+/**
+ * 
+ */
+public class XMLDocument2XMLStreamReaderTestCase extends SDOTransformerTestCaseBase {
+
+    @Override
+    protected DataType<?> getSourceDataType() {
+        return new DataType<QName>(XMLDocument.class.getName(), XMLDocument.class, ORDER_QNAME);
+    }
+
+    @Override
+    protected DataType<?> getTargetDataType() {
+        return new DataType<Class<XMLStreamReader>>(XMLStreamReader.class, XMLStreamReader.class);
+    }
+
+    public final void testTransform() throws XMLStreamException {
+        XMLDocument document =
+            helperContext.getXMLHelper().createDocument(dataObject,
+                                                        ORDER_QNAME.getNamespaceURI(),
+                                                        ORDER_QNAME.getLocalPart());
+        XMLStreamReader reader = new XMLDocument2XMLStreamReader().transform(document, context);
+        XMLDocument document2 = new XMLStreamReader2XMLDocument().transform(reader, reversedContext);
+        Assert.assertEquals(ORDER_QNAME.getNamespaceURI(), document2.getRootElementURI());
+        Assert.assertEquals(ORDER_QNAME.getLocalPart(), document2.getRootElementName());
+        Assert.assertTrue(document2.getRootObject() instanceof PurchaseOrderType);
+    }
+
+}
diff --git a/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/resources/META-INF/tuscany/databinding.sdo.scdl b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/resources/META-INF/tuscany/databinding.sdo.scdl
new file mode 100644
index 0000000000..8f4ee4be3e
--- /dev/null
+++ b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/resources/META-INF/tuscany/databinding.sdo.scdl
@@ -0,0 +1,34 @@
+<?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.    
+-->
+<!--
+    import.sdo configuration
+    
+    $Rev: 431086 $ $Date: 2006-08-12 13:58:17 -0700 (Sat, 12 Aug 2006) $
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+           xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT"
+           name="org.apache.tuscany.databinding.sdo">
+
+    <!-- import.sdo element loader implementations -->
+    <component name="elementLoader.import.sdo">
+        <system:implementation.system class="org.apache.tuscany.databinding.sdo.ImportSDOLoader"/>
+    </component>
+    
+</composite>
diff --git a/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/resources/ipo.xsd b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/resources/ipo.xsd
new file mode 100755
index 0000000000..5468542693
--- /dev/null
+++ b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/resources/ipo.xsd
@@ -0,0 +1,118 @@
+<schema targetNamespace="http://www.example.com/IPO"
+	xmlns="http://www.w3.org/2001/XMLSchema"
+	xmlns:ipo="http://www.example.com/IPO">
+
+	<annotation>
+		<documentation xml:lang="en">
+			International Purchase order schema for Example.com
+			Copyright 2000 Example.com. All rights reserved.
+		</documentation>
+	</annotation>
+
+
+	<element name="purchaseOrder" type="ipo:PurchaseOrderType" />
+
+	<element name="comment" type="string" />
+
+	<complexType name="PurchaseOrderType">
+		<sequence>
+			<element name="shipTo" type="ipo:Address" />
+			<element name="billTo" type="ipo:Address" />
+			<element ref="ipo:comment" minOccurs="0" />
+			<element name="items" type="ipo:Items" />
+		</sequence>
+		<attribute name="orderDate" type="date" />
+	</complexType>
+
+	<complexType name="Items">
+		<sequence>
+			<element name="item" minOccurs="0" maxOccurs="unbounded">
+				<complexType>
+					<sequence>
+						<element name="productName" type="string" />
+						<element name="quantity">
+							<simpleType>
+								<restriction base="positiveInteger">
+									<maxExclusive value="100" />
+								</restriction>
+							</simpleType>
+						</element>
+						<element name="USPrice" type="decimal" />
+						<element ref="ipo:comment" minOccurs="0" />
+						<element name="shipDate" type="date"
+							minOccurs="0" />
+					</sequence>
+					<attribute name="partNum" type="ipo:SKU"
+						use="required" />
+				</complexType>
+			</element>
+		</sequence>
+	</complexType>
+
+	<simpleType name="SKU">
+		<restriction base="string">
+			<pattern value="\d{3}-[A-Z]{2}" />
+		</restriction>
+	</simpleType>
+
+	<complexType name="Address">
+		<sequence>
+			<element name="name" type="string" />
+			<element name="street" type="string" />
+			<element name="city" type="string" />
+		</sequence>
+	</complexType>
+
+	<complexType name="USAddress">
+		<complexContent>
+			<extension base="ipo:Address">
+				<sequence>
+					<element name="state" type="ipo:USState" />
+					<element name="zip" type="positiveInteger" />
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+
+	<complexType name="UKAddress">
+		<complexContent>
+			<extension base="ipo:Address">
+				<sequence>
+					<element name="postcode" type="ipo:UKPostcode" />
+				</sequence>
+				<attribute name="exportCode" type="positiveInteger"
+					fixed="1" />
+			</extension>
+		</complexContent>
+	</complexType>
+
+	<!-- other Address derivations for more countries -->
+
+	<simpleType name="USState">
+		<restriction base="string">
+			<enumeration value="AK" />
+			<enumeration value="AL" />
+			<enumeration value="AR" />
+			<enumeration value="CA" />
+			<enumeration value="PA" />
+			<!-- and so on ... -->
+		</restriction>
+	</simpleType>
+
+	<simpleType name="Postcode">
+		<restriction base="string">
+			<length value="7" fixed="true" />
+		</restriction>
+	</simpleType>
+
+
+	<simpleType name="UKPostcode">
+		<restriction base="ipo:Postcode">
+			<pattern value="[A-Z]{2}\d\s\d[A-Z]{2}" />
+		</restriction>
+	</simpleType>
+
+
+
+</schema>
+
diff --git a/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/resources/model/sca-core.xsd b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/resources/model/sca-core.xsd
new file mode 100755
index 0000000000..56c6977254
--- /dev/null
+++ b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/resources/model/sca-core.xsd
@@ -0,0 +1,233 @@
+<?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.    
+-->
+<schema xmlns="http://www.w3.org/2001/XMLSchema" 
+		targetNamespace="http://www.osoa.org/xmlns/sca/0.9" 
+		xmlns:sca="http://www.osoa.org/xmlns/sca/0.9"
+		elementFormDefault="qualified">
+
+	<element name="componentType" type="sca:ComponentType"/>
+	<complexType name="ComponentType">
+		<sequence>
+			<element minOccurs="0" maxOccurs="unbounded" name="service" type="sca:Service"/>
+			<element minOccurs="0" maxOccurs="unbounded" name="reference" type="sca:Reference"/>
+			<element minOccurs="0" maxOccurs="unbounded" name="property" type="sca:Property"/>
+		    <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</sequence>
+		<anyAttribute namespace="##any" processContents="lax"/>
+	</complexType>
+
+	<complexType name="Service">
+		<sequence>
+			<element minOccurs="1" maxOccurs="1" ref="sca:interface"/>
+		    <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</sequence>
+		<attribute name="name" type="NCName" use="required"/>
+		<anyAttribute namespace="##any" processContents="lax"/>
+	</complexType>
+
+	<element name="interface" type="sca:Interface"/>
+	<complexType name="Interface"/>
+
+	<complexType name="Reference">
+		<sequence>
+			<element minOccurs="1" maxOccurs="1" ref="sca:interface"/>
+		    <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</sequence>
+		<attribute name="name" type="NCName" use="required"/>
+		<attribute name="multiplicity" type="sca:Multiplicity" use="optional" default="1..1"/>
+		<anyAttribute namespace="##any" processContents="lax"/>
+	</complexType>
+
+	<complexType name="Property">
+		<sequence>
+		    <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</sequence>
+  		<attribute name="name" type="NCName" use="required"/>
+   		<attribute name="type" type="QName" use="required"/>		
+  		<attribute name="many" type="boolean" default="false" use="optional"/>
+  		<attribute name="required" type="boolean" default="false" use="optional"/>  		
+		<attribute name="default" type="string" use="optional"/>
+		<anyAttribute namespace="##any" processContents="lax"/>
+	</complexType>
+
+
+	<element name="moduleFragment" type="sca:ModuleFragment"/>
+	<complexType name="ModuleFragment">
+		<sequence>
+			<element minOccurs="0" maxOccurs="unbounded" name="entryPoint" type="sca:EntryPoint"/>
+			<element minOccurs="0" maxOccurs="unbounded" name="component" type="sca:Component"/>
+			<element minOccurs="0" maxOccurs="unbounded" name="externalService" type="sca:ExternalService"/>
+			<element minOccurs="0" maxOccurs="unbounded" name="wire" type="sca:ModuleWire"/>
+			<any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</sequence>
+		<attribute name="name" type="NCName" use="required"/>
+		<anyAttribute namespace="##any" processContents="lax"/>
+	</complexType>
+
+	<element name="module" type="sca:Module"/>
+	<complexType name="Module">
+		<complexContent>
+			<extension base="sca:ModuleFragment"/>
+		</complexContent>
+	</complexType>
+
+	<complexType name="EntryPoint">
+		<sequence>
+			<element minOccurs="0" maxOccurs="1" ref="sca:interface"/>
+			<element minOccurs="1" maxOccurs="unbounded" ref="sca:binding"/>
+			<element minOccurs="1" maxOccurs="unbounded" name="reference" type="anyURI"/>
+			<any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</sequence>
+		<attribute name="name" type="NCName" use="required"/>
+		<attribute name="multiplicity" type="sca:Multiplicity" use="optional" default="1..1"/>
+		<anyAttribute namespace="##any" processContents="lax"/>
+	</complexType>
+	<!-- a multiplicity 1..1 or 0..n sample
+			<reference>StockQuoteComponent</reference>		- type must be URI
+		 a multiplicity 1..n or 0..n sample
+			<reference>StockQuoteComponent1</reference>		- type must be URI
+			<reference>StockQuoteComponent2</reference>
+	 -->
+
+	<element name="binding" type="sca:Binding"/>
+	<complexType name="Binding">
+		<attribute name="uri" type="anyURI" use="optional"/>
+	</complexType>
+	
+	<complexType name="Component">
+		<sequence>
+			<element minOccurs="1" maxOccurs="1" ref="sca:implementation"/>
+			<element minOccurs="0" maxOccurs="1" name="properties" type="sca:PropertyValues"/>
+			<element minOccurs="0" maxOccurs="1" name="references" type="sca:ReferenceValues"/>
+			<any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</sequence>
+		<attribute name="name" type="NCName" use="required"/>
+		<anyAttribute namespace="##any" processContents="lax"/>
+	</complexType>
+	<!-- a multiplicity 1..1 or 0..1 sample
+			<references>
+				<v:stockQuote>StockQuoteComponent</v:stockquote>	- type must be URI
+			</references>
+		 a multiplicity 1..n or 0..n sample
+			<references>
+				<v:stockQuote>StockQuoteComponent1</v:stockQuote>	- type must be URI
+				<v:stockQuote>StockQuoteComponent2</v:stockQuote>
+			</references>
+	 -->
+
+	<element name="implementation" type="sca:Implementation"/>
+	<complexType name="Implementation"/>
+
+	<complexType name="PropertyValues">
+		<sequence>
+			<any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</sequence>
+		<anyAttribute namespace="##any" processContents="lax"/>			
+	</complexType>
+
+	<complexType name="ReferenceValues">
+		<sequence>
+			<any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</sequence>
+		<anyAttribute namespace="##any" processContents="lax"/>			
+	</complexType>
+
+
+	<complexType name="ExternalService">
+		<sequence>
+			<element minOccurs="1" maxOccurs="1" ref="sca:interface"/>
+			<element minOccurs="0" maxOccurs="unbounded" ref="sca:binding"/>
+		</sequence>
+		<attribute name="name" type="NCName" use="required"/>
+		<attribute name="overridable" type="sca:OverrideOptions" default="may" use="optional"/>
+		<anyAttribute namespace="##any" processContents="lax"/>
+	</complexType>
+
+	
+	<complexType name="ModuleWire">
+		<sequence>
+			<element minOccurs="1" maxOccurs="1" ref="sca:source.uri"/>
+			<element minOccurs="1" maxOccurs="1" ref="sca:target.uri"/>
+			<any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</sequence>
+		<anyAttribute namespace="##any" processContents="lax"/>
+	</complexType>
+
+	<element name="source" type="anyType"/>
+	<element name="target" type="anyType"/>
+	
+	<element name="source.uri" type="anyURI" substitutionGroup="sca:source"/>
+	<element name="target.uri" type="anyURI" substitutionGroup="sca:target"/>
+
+	<element name="subsystem" type="sca:Subsystem"/>
+	<complexType name="Subsystem">
+		<sequence>
+			<element minOccurs="0" maxOccurs="unbounded" name="entryPoint" type="sca:EntryPoint"/>
+			<element minOccurs="0" maxOccurs="unbounded" name="moduleComponent" type="sca:ModuleComponent"/>
+			<element minOccurs="0" maxOccurs="unbounded" name="externalService" type="sca:ExternalService"/>
+			<element minOccurs="0" maxOccurs="unbounded" name="wire" type="sca:SystemWire"/>
+			<any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</sequence>
+		<attribute name="name" type="NCName" use="required"/>
+		<attribute name="uri" type="anyURI" use="optional"/>		
+		<anyAttribute namespace="##any" processContents="lax"/>
+	</complexType>
+	
+	<complexType name="ModuleComponent">
+		<sequence>
+			<element minOccurs="0" maxOccurs="1" name="properties" type="sca:PropertyValues"/>
+			<element minOccurs="0" maxOccurs="1" name="references" type="sca:ReferenceValues"/>
+			<any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</sequence>
+		<attribute name="name" type="NCName" use="required"/>
+		<attribute name="module" type="NCName" use="required"/>
+		<attribute name="uri" type="anyURI" use="optional"/>		
+		<anyAttribute namespace="##any" processContents="lax"/>
+	</complexType>
+
+	<complexType name="SystemWire">
+		<sequence>
+			<element minOccurs="1" maxOccurs="1" ref="sca:source"/>
+			<element minOccurs="1" maxOccurs="1" ref="sca:target"/>
+			<any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</sequence>
+	</complexType>
+
+	<element name="source.epr" type="anyType" substitutionGroup="sca:source"/>
+	<element name="target.epr" type="anyType" substitutionGroup="sca:target"/>
+
+	<simpleType name="Multiplicity">
+		<restriction base="string">
+			<enumeration value="0..1"/>
+			<enumeration value="1..1"/>
+			<enumeration value="0..n"/>
+			<enumeration value="1..n"/>
+		</restriction>
+	</simpleType>
+
+	<simpleType name="OverrideOptions">
+		<restriction base="string">
+			<enumeration value="no"/>
+			<enumeration value="may"/>
+			<enumeration value="must"/>
+		</restriction>
+	</simpleType>
+
+</schema>
diff --git a/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd
new file mode 100755
index 0000000000..bbaf58f00c
--- /dev/null
+++ b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd
@@ -0,0 +1,43 @@
+<?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.    
+-->
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="http://www.osoa.org/xmlns/mock/0.9"
+	elementFormDefault="qualified"
+	xmlns:mock="http://www.osoa.org/xmlns/mock/0.9"
+	xmlns:sca="http://www.osoa.org/xmlns/sca/0.9">
+
+	<import namespace="http://www.osoa.org/xmlns/sca/0.9"
+		schemaLocation="sca-core.xsd" />
+
+	<element name="implementation.mock" type="mock:MockImplementation"
+		substitutionGroup="sca:implementation" />
+	<complexType name="MockImplementation">
+		<complexContent>
+			<extension base="sca:Implementation">
+				<sequence>
+					<any namespace="##other" processContents="lax"
+						minOccurs="0" maxOccurs="unbounded" />
+				</sequence>
+				<attribute name="myAttr" type="NCName" use="required" />
+				<anyAttribute namespace="##any" processContents="lax" />
+			</extension>
+		</complexContent>
+	</complexType>
+</schema>
diff --git a/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/resources/stock.xsd b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/resources/stock.xsd
new file mode 100644
index 0000000000..a0a6717371
--- /dev/null
+++ b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/resources/stock.xsd
@@ -0,0 +1,33 @@
+<?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.    
+-->
+<schema targetNamespace="http://www.example.com/stock" xmlns="http://www.w3.org/2001/XMLSchema">
+    <!-- Faults -->
+    <element name="InvalidSymbolFault">
+        <complexType>
+            <sequence>
+                <element name="message" minOccurs="1" type="string" />
+                <element name="symbol" minOccurs="1" type="string" />
+            </sequence>
+        </complexType>
+    </element>
+
+    <element name="MarketClosedFault" type="string" />
+
+</schema>
+\ No newline at end of file
diff --git a/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/resources/wrapper.xml b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/resources/wrapper.xml
new file mode 100644
index 0000000000..3e7fe81817
--- /dev/null
+++ b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/resources/wrapper.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<p:op xmlns:p="http://www.example.com/wrapper" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.example.com/wrapper wrapper.xsd ">
+    <message>message</message>
+    <symbol>symbol</symbol>
+    <message>message1</message>
+    <symbol>symbol1</symbol>
+    <symbol>symbol2</symbol>
+</p:op>
diff --git a/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/resources/wrapper.xsd b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/resources/wrapper.xsd
new file mode 100644
index 0000000000..ea4dc5f7f3
--- /dev/null
+++ b/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/test/resources/wrapper.xsd
@@ -0,0 +1,38 @@
+<?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.    
+-->
+<schema targetNamespace="http://www.example.com/wrapper" xmlns="http://www.w3.org/2001/XMLSchema">
+    <!-- Faults -->
+    <element name="op">
+        <complexType>
+            <sequence maxOccurs="unbounded">
+                <element name="message" minOccurs="1" type="string" />
+                <element name="symbol" minOccurs="1" maxOccurs="3" type="string" />
+            </sequence>
+        </complexType>
+    </element>
+
+    <element name="opResponse">
+        <complexType>
+            <sequence maxOccurs="1">
+                <element name="price" minOccurs="1" maxOccurs="unbounded" type="string" />
+            </sequence>
+        </complexType>
+    </element>
+</schema>
+\ No newline at end of file