Moving 1.x branches

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

37 files changed, 0 insertions, 3167 deletions

diff --git a/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java b/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java
deleted file mode 100644
index 503e54e530..0000000000
--- a/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.sca.databinding.sdo;
-
-import javax.xml.namespace.QName;
-import javax.xml.transform.dom.DOMResult;
-
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.apache.tuscany.sca.databinding.impl.DOMHelper;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.XMLDocument;
-import commonj.sdo.helper.XMLHelper;
-
-public class DataObject2Node extends BaseTransformer<DataObject, Node> implements
-    PullTransformer<DataObject, Node> {
-
-    public Node transform(DataObject source, TransformationContext context) {
-        if (source == null) {
-            return null;
-        }
-        try {
-            HelperContext helperContext = SDOContextHelper.getHelperContext(context, true);
-            XMLHelper xmlHelper = helperContext.getXMLHelper();
-            QName elementName = SDOContextHelper.getElement(context);
-            Document doc = DOMHelper.newDocument();
-            DOMResult result = new DOMResult(doc);
-            XMLDocument xmlDoc = xmlHelper.createDocument(source, elementName.getNamespaceURI(), elementName.getLocalPart());
-            xmlHelper.save(xmlDoc, result, null);
-            return doc.getDocumentElement();
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<DataObject> getSourceType() {
-        return DataObject.class;
-    }
-
-    @Override
-    protected Class<Node> getTargetType() {
-        return Node.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 40;
-    }
-
-}
diff --git a/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java b/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java
deleted file mode 100644
index 8ce8eae587..0000000000
--- a/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.sca.databinding.sdo;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.XMLHelper;
-
-public class DataObject2String extends BaseTransformer<DataObject, String> implements
-    PullTransformer<DataObject, String> {
-
-    public String transform(DataObject source, TransformationContext context) {
-        if (source == null) {
-            return null;
-        }            
-        try {
-            HelperContext helperContext = SDOContextHelper.getHelperContext(context, true);
-            XMLHelper xmlHelper = helperContext.getXMLHelper();
-            QName elementName = SDOContextHelper.getElement(context);
-            return xmlHelper.save(source, elementName.getNamespaceURI(), elementName.getLocalPart());
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<DataObject> getSourceType() {
-        return DataObject.class;
-    }
-
-    @Override
-    protected Class<String> getTargetType() {
-        return String.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 40;
-    }
-
-}
diff --git a/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java b/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
deleted file mode 100644
index 116ac4c553..0000000000
--- a/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.sca.databinding.sdo;
-
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.apache.tuscany.sdo.api.SDOUtil;
-import org.apache.tuscany.sdo.api.XMLStreamHelper;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.XMLDocument;
-import commonj.sdo.helper.XMLHelper;
-
-public class DataObject2XMLStreamReader extends BaseTransformer<DataObject, XMLStreamReader> implements
-        PullTransformer<DataObject, XMLStreamReader> {
-
-    public XMLStreamReader transform(final DataObject source, TransformationContext context) {
-        if (source == null) {
-            return null;
-        }            
-        try {
-            HelperContext helperContext = SDOContextHelper.getHelperContext(context, true);
-            XMLStreamHelper streamHelper = SDOUtil.createXMLStreamHelper(helperContext);
-            final QName elementName = SDOContextHelper.getElement(context);
-            final XMLHelper xmlHelper = helperContext.getXMLHelper();
-            // Allow privileged access to read properties. REquires java.util.PropertyPermission
-            // XML.load.form.lax read in security policy.
-            XMLDocument document = AccessController.doPrivileged(new PrivilegedAction<XMLDocument>() {
-                public XMLDocument run() {
-                    return xmlHelper.createDocument(source, elementName.getNamespaceURI(), elementName.getLocalPart());
-                }
-            });
-                    
-            return streamHelper.createXMLStreamReader(document);
-        } catch (XMLStreamException e) {
-            // TODO: Add context to the exception
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<DataObject> getSourceType() {
-        return DataObject.class;
-    }
-
-    @Override
-    protected Class<XMLStreamReader> getTargetType() {
-        return XMLStreamReader.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 10;
-    }
-
-}
diff --git a/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java b/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java
deleted file mode 100644
index 30a3e1c3a9..0000000000
--- a/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.databinding.sdo;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.impl.BaseImpl;
-
-import commonj.sdo.helper.HelperContext;
-
-/**
- * The model object for import.sdo
- * 
- * @version $Rev$ $Date$
- */
-public class ImportSDO extends BaseImpl {
-    public static final QName IMPORT_SDO =
-        new QName("http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0", "import.sdo");
-
-    private HelperContext helperContext;
-    private String factoryClassName;
-    private String schemaLocation;
-
-    public ImportSDO(HelperContext helperContext) {
-        super();
-        this.helperContext = helperContext;
-        setUnresolved(true);
-    }
-
-    public HelperContext getHelperContext() {
-        return helperContext;
-    }
-
-    /**
-     * @return the factoryClassName
-     */
-    public String getFactoryClassName() {
-        return factoryClassName;
-    }
-
-    /**
-     * @param factoryClassName the factoryClassName to set
-     */
-    public void setFactoryClassName(String factoryClassName) {
-        this.factoryClassName = factoryClassName;
-    }
-
-    /**
-     * @return the schemaLocation
-     */
-    public String getSchemaLocation() {
-        return schemaLocation;
-    }
-
-    /**
-     * @param schemaLocation the schemaLocation to set
-     */
-    public void setSchemaLocation(String schemaLocation) {
-        this.schemaLocation = schemaLocation;
-    }
-}
\ No newline at end of file
diff --git a/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java b/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java
deleted file mode 100644
index 115af19042..0000000000
--- a/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.sca.databinding.sdo;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static org.apache.tuscany.sca.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.URL;
-import java.net.URLConnection;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl;
-import org.apache.tuscany.sca.contribution.Artifact;
-import org.apache.tuscany.sca.contribution.ContributionFactory;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ClassReference;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.XSDHelper;
-
-/**
- * Loader that handles &lt;import.sdo&gt; elements.
- * 
- * @version $Rev$ $Date$
- * @deprecated
- */
-@Deprecated
-public class ImportSDOProcessor implements StAXArtifactProcessor<ImportSDO> {
-    
-    private ContributionFactory contributionFactory;
-    private Monitor monitor;
-
-    public ImportSDOProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-        this.contributionFactory = modelFactories.getFactory(ContributionFactory.class);
-        this.monitor = monitor;
-    }
-    
-    /**
-     * Report a error.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void error(String message, Object model, Object... messageParameters) {
-		 if (monitor != null) {
-		    Problem problem = new ProblemImpl(this.getClass().getName(), "databinding-sdo-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-		    monitor.problem(problem);
-		 }
-    }
-     
-     /**
-      * Report a exception.
-      * 
-      * @param problems
-      * @param message
-      * @param model
-      */
-    private void error(String message, Object model, Exception ex) {
-     	 if (monitor != null) {
-     		 Problem problem = new ProblemImpl(this.getClass().getName(), "databinding-sdo-validation-messages", Severity.ERROR, model, message, ex);
-     	     monitor.problem(problem);
-     	 }        
-    }
-
-    public QName getXMLType() {
-        return IMPORT_SDO;
-    }
-
-    public ImportSDO read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        assert IMPORT_SDO.equals(reader.getName());
-
-        // FIXME: How do we associate the application HelperContext with the one
-        // imported by the composite
-        ImportSDO importSDO = new ImportSDO(SDOContextHelper.getDefaultHelperContext());
-        String factoryName = reader.getAttributeValue(null, "factory");
-        if (factoryName != null) {
-            importSDO.setFactoryClassName(factoryName);
-        }
-        String location = reader.getAttributeValue(null, "location");
-        if (location != null) {
-            importSDO.setSchemaLocation(location);
-        }
-
-        // Skip to end element
-        while (reader.hasNext()) {
-            if (reader.next() == END_ELEMENT && ImportSDO.IMPORT_SDO.equals(reader.getName())) {
-                break;
-            }
-        }
-        return importSDO;
-    }
-
-    private void importFactory(ImportSDO importSDO, ModelResolver resolver) throws ContributionResolveException {
-        String factoryName = importSDO.getFactoryClassName();
-        if (factoryName != null) {
-            ClassReference reference = new ClassReference(factoryName);
-            ClassReference resolved = resolver.resolveModel(ClassReference.class, reference);
-            if (resolved != null && !resolved.isUnresolved()) {
-            	try {
-                    Class<?> factoryClass = resolved.getJavaClass();
-                    register(factoryClass, importSDO.getHelperContext());
-                    importSDO.setUnresolved(false);
-                } catch (Exception e) {
-                	ContributionResolveException ce = new ContributionResolveException(e);
-                	error("ContributionResolveException", resolver, ce);
-                    //throw ce;
-                }                
-            } else {
-            	error("FailToResolveClass", resolver, factoryName);
-                //ContributionResolveException loaderException =
-                    //new ContributionResolveException("Fail to resolve class: " + factoryName);
-                //throw loaderException;
-            }            
-        }
-    }
-
-    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});
-
-        //        HelperContext defaultContext = HelperProvider.getDefaultContext();
-        //        method.invoke(factory, new Object[] {defaultContext});
-    }
-
-    private void importWSDL(ImportSDO importSDO, ModelResolver resolver) throws ContributionResolveException {
-        String location = importSDO.getSchemaLocation();
-        if (location != null) {
-            try {
-                Artifact artifact = contributionFactory.createArtifact();
-                artifact.setURI(location);
-                artifact = resolver.resolveModel(Artifact.class, artifact);
-                if (artifact.getLocation() != null) {
-                	String wsdlURL = artifact.getLocation();
-                    URLConnection connection = new URL(wsdlURL).openConnection();
-                    connection.setUseCaches(false);
-                    InputStream xsdInputStream = connection.getInputStream();
-                    try {
-                        XSDHelper xsdHelper = importSDO.getHelperContext().getXSDHelper();
-                        xsdHelper.define(xsdInputStream, wsdlURL);
-                    } finally {
-                        xsdInputStream.close();
-                    }
-                    importSDO.setUnresolved(false);
-                } else {
-                   	error("FailToResolveLocation", resolver, location);
-                    //ContributionResolveException loaderException = new ContributionResolveException("Fail to resolve location: " + location);
-                    //throw loaderException;
-                }                
-            } catch (IOException e) {
-            	ContributionResolveException ce = new ContributionResolveException(e);
-            	error("ContributionResolveException", resolver, ce);
-                //throw ce;
-            }            
-        }
-    }
-
-    public QName getArtifactType() {
-        return ImportSDO.IMPORT_SDO;
-    }
-
-    public void write(ImportSDO model, XMLStreamWriter outputSource) throws ContributionWriteException {
-        // Not implemented as <import.sdo> is deprecated
-    }
-
-    public Class<ImportSDO> getModelType() {
-        return ImportSDO.class;
-    }
-
-    public void resolve(ImportSDO importSDO, ModelResolver resolver) throws ContributionResolveException {
-        importFactory(importSDO, resolver);
-        importWSDL(importSDO, resolver);
-        if (!importSDO.isUnresolved()) {
-            resolver.addModel(importSDO);
-        }
-    }
-
-}
diff --git a/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java b/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java
deleted file mode 100644
index 4a05492dd8..0000000000
--- a/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.sca.databinding.sdo;
-
-import javax.xml.transform.dom.DOMSource;
-
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.apache.tuscany.sca.databinding.impl.DOMHelper;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.XMLDocument;
-import commonj.sdo.helper.XMLHelper;
-
-public class Node2DataObject extends BaseTransformer<Node, DataObject> implements PullTransformer<Node, DataObject> {
-
-    public DataObject transform(Node source, TransformationContext context) {
-        if (source == null) {
-            return null;
-        }
-        try {
-            HelperContext helperContext = SDOContextHelper.getHelperContext(context, false);
-            XMLHelper xmlHelper = helperContext.getXMLHelper();
-            Document doc = DOMHelper.promote(source);
-            DOMSource domSource = new DOMSource(doc);
-            XMLDocument xmlDoc = xmlHelper.load(domSource, doc.getDocumentURI(), null);
-            return xmlDoc.getRootObject();
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<Node> getSourceType() {
-        return Node.class;
-    }
-
-    @Override
-    protected Class<DataObject> getTargetType() {
-        return DataObject.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 40;
-    }
-
-}
diff --git a/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java b/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java
deleted file mode 100644
index 695722be18..0000000000
--- a/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.databinding.sdo;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.util.DataTypeHelper;
-import org.apache.tuscany.sca.databinding.util.LRUCache;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-import org.apache.tuscany.sdo.api.SDOUtil;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.Type;
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.TypeHelper;
-import commonj.sdo.impl.HelperProvider;
-
-/**
- * Helper class to get TypeHelper from the context
- *
- * @version $Rev$ $Date$
- */
-public final class SDOContextHelper {
-    private static final LRUCache<Object, HelperContext> cache = new LRUCache<Object, HelperContext>(1024);
-
-    private SDOContextHelper() {
-    }
-
-    public static HelperContext getHelperContext(TransformationContext context, boolean source) {
-        if (context == null) {
-            return getDefaultHelperContext();
-        }
-
-        HelperContext helperContext = null;
-        Operation op = source ? context.getSourceOperation() : context.getTargetOperation();
-        if (op == null) {
-            DataType<?> dt = source ? context.getSourceDataType() : context.getTargetDataType();
-
-            helperContext = dt.getMetaData(HelperContext.class);
-            if (helperContext != null) {
-                return helperContext;
-            }
-            helperContext = SDOUtil.createHelperContext();
-            boolean found = register(helperContext, dt);
-            if (!found) {
-                helperContext = getDefaultHelperContext();
-            }
-            dt.setMetaData(HelperContext.class, helperContext);
-            return helperContext;
-        } else {
-            return getHelperContext(op);
-        }
-
-    }
-
-    public static HelperContext getHelperContext(Operation op) {
-        if (op == null) {
-            return getDefaultHelperContext();
-        }
-
-        HelperContext helperContext = op.getInputType().getMetaData(HelperContext.class);
-
-        if (helperContext != null) {
-            return helperContext;
-        }
-
-        // Use the default HelperContext until a type is registered later on
-        helperContext = getDefaultHelperContext();
-
-        /*
-        List<DataType> dataTypes = DataTypeHelper.getDataTypes(op, false);
-        boolean found = false;
-        for (DataType d : dataTypes) {
-            if (register(helperContext, d)) {
-                found = true;
-            }
-        }
-        if (!found) {
-            helperContext = getDefaultHelperContext();
-        }
-        */
-        op.getInputType().setMetaData(HelperContext.class, helperContext);
-        return helperContext;
-    }
-
-    /**
-     * @param helperContext
-     * @param dataType
-     * @return
-     */
-    private static boolean register(HelperContext helperContext, DataType dataType) {
-        if (dataType == null) {
-            return false;
-        }
-        Set<Class<?>> classes = DataTypeHelper.findClasses(dataType);
-        boolean found = false;
-        for (Class<?> cls : classes) {
-            found = register(helperContext, dataType.getPhysical()) || found;
-        }
-        return found;
-    }
-
-    /**
-     * FIXME: [rfeng] This is a hack to get the factory out a SDO class
-     * @param helperContext
-     * @param javaType
-     */
-
-    public static boolean register(HelperContext helperContext, Class javaType) {
-        if (javaType == null || DataObject.class == javaType) {
-            return false;
-        }
-        try {
-            Type type = helperContext.getTypeHelper().getType(javaType);
-            if (type != null && (!type.isDataType())) {
-                Method method = type.getClass().getMethod("getEPackage");
-                Object factory = method.invoke(type, new Object[] {});
-                method = factory.getClass().getMethod("register", HelperContext.class);
-                method.invoke(factory, new Object[] {helperContext});
-                return true;
-            }
-            return false;
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    public static HelperContext getDefaultHelperContext() {
-        // SDOUtil.createHelperContext();
-        return HelperProvider.getDefaultContext();
-    }
-
-    public static QName getElement(TransformationContext context) {
-        if (context == null) {
-            return SDODataBinding.ROOT_ELEMENT;
-        }
-        DataType<?> dataType = context.getTargetDataType();
-        Object logical = dataType.getLogical();
-        QName elementName = null;
-        if (logical instanceof XMLType) {
-            XMLType xmlType = (XMLType)logical;
-            QName element = xmlType.getElementName();
-            if (element != null) {
-                elementName = element;
-            }
-        }
-        if (elementName == null) {
-            // Try source type
-            dataType = context.getSourceDataType();
-            logical = dataType.getLogical();
-            if (logical instanceof XMLType) {
-                XMLType xmlType = (XMLType)logical;
-                QName element = xmlType.getElementName();
-                if (element != null) {
-                    elementName = element;
-                }
-            }
-        }
-        if (elementName != null) {
-            return elementName;
-        } else {
-            return SDODataBinding.ROOT_ELEMENT;
-        }
-    }
-
-    public static String generateSchema(HelperContext context, Class<?>[] classes) {
-        TypeHelper typeHelper = context.getTypeHelper();
-        List<Type> types = new ArrayList<Type>();
-        for (Class<?> cls : classes) {
-            Type type = typeHelper.getType(cls);
-            if (type != null) {
-                types.add(type);
-            }
-        }
-        return generateSchema(context, types);
-    }
-
-    public static String generateSchema(HelperContext context, List<Type> types) {
-        // FIXME: SDO throws IllegalArgumentException for types generated from existing XSDs
-        return context.getXSDHelper().generate(types);
-    }
-}
diff --git a/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java b/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
deleted file mode 100644
index 5a5e35cbbd..0000000000
--- a/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.databinding.sdo;
-
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.databinding.SimpleTypeMapper;
-import org.apache.tuscany.sca.databinding.WrapperHandler;
-import org.apache.tuscany.sca.databinding.XMLTypeHelper;
-import org.apache.tuscany.sca.databinding.impl.BaseDataBinding;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-import org.apache.tuscany.sdo.api.SDOUtil;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.Type;
-import commonj.sdo.helper.CopyHelper;
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.XMLDocument;
-
-/**
- * SDO Databinding
- * 
- * @version $Rev$ $Date$
- */
-public class SDODataBinding extends BaseDataBinding {
-    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;
-    private XMLTypeHelper xmlTypeHelper;
-
-    public SDODataBinding() {
-        super(NAME, ALIASES, DataObject.class);
-        wrapperHandler = new SDOWrapperHandler();
-        xmlTypeHelper = new SDOTypeHelper();
-    }
-
-    @Override
-    public boolean introspect(DataType dataType, final Operation operation) {
-        final Class javaType = dataType.getPhysical();
-        // Allow privileged access to read system properties. Requires PropertyPermission
-        // java.specification.version read in security policy.
-        final HelperContext context = AccessController.doPrivileged(new PrivilegedAction<HelperContext>() {
-            public HelperContext run() {
-                return SDOContextHelper.getHelperContext(operation);
-            }
-        });
-
-        Type type = context.getTypeHelper().getType(javaType);
-        if (type == null) {
-            // FIXME: Need a better to test dynamic SDO
-            if (DataObject.class.isAssignableFrom(javaType)) {
-                // Dynamic SDO
-                dataType.setDataBinding(getName());
-                if (dataType.getLogical() == null) {
-                    dataType.setLogical(XMLType.UNKNOWN);
-                }
-                return true;
-            }
-            return false;
-        } 
-        if (type.isDataType()) {
-            // FIXME: Ignore simple types?
-            return false;
-        }
-
-        // Found a SDO type, replace the default context with a private one
-        AccessController.doPrivileged(new PrivilegedAction<Object>() {
-            public Object run() {
-                if (context == SDOContextHelper.getDefaultHelperContext()) {
-                    HelperContext newContext = SDOUtil.createHelperContext();
-                    SDOContextHelper.register(newContext, javaType);
-                    if (operation != null) {
-                        operation.getInputType().setMetaData(HelperContext.class, newContext);
-                    }
-                }
-                return null;
-            }
-        });
-
-        String namespace = type.getURI();
-        String name = context.getXSDHelper().getLocalName(type);
-        QName xmlType = new QName(namespace, name);
-        dataType.setDataBinding(getName());
-        QName elementName = null;
-        Object logical = dataType.getLogical();
-        if (logical instanceof XMLType) {
-            elementName = ((XMLType)logical).getElementName();
-        }
-        dataType.setLogical(new XMLType(elementName, xmlType));
-
-        return true;
-    }
-
-    @Override
-    public WrapperHandler getWrapperHandler() {
-        return wrapperHandler;
-    }
-
-    @Override
-    public SimpleTypeMapper getSimpleTypeMapper() {
-        return new SDOSimpleTypeMapper();
-    }
-
-    @Override
-    public XMLTypeHelper getXMLTypeHelper() {
-        // return new SDOTypeHelper();
-        return xmlTypeHelper;
-    }
-
-    @Override
-    public Object copy(Object arg, DataType dataType, Operation operation) {
-        HelperContext context = SDOContextHelper.getHelperContext(operation);
-        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, dataType, operation);
-        }
-    }
-
-}
diff --git a/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java b/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java
deleted file mode 100644
index c83ec53b01..0000000000
--- a/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.databinding.sdo;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.databinding.SimpleTypeMapper;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sdo.api.SDOUtil;
-
-import commonj.sdo.Type;
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.TypeHelper;
-
-/**
- * SDO Java/XML mapping for simple XSD types
- *
- * @version $Rev$ $Date$
- */
-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, false);
-            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, true);
-            TypeHelper typeHelper = helperContext.getTypeHelper();
-            type = typeHelper.getType(typeName.getNamespaceURI(), typeName.getLocalPart());
-        }
-        return SDOUtil.convertToString(type, obj);
-    }
-
-}
diff --git a/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java b/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java
deleted file mode 100644
index c1978883df..0000000000
--- a/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.databinding.sdo;
-
-import java.beans.Introspector;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.databinding.XMLTypeHelper;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.Interface;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.util.JavaXMLMapper;
-import org.apache.tuscany.sca.interfacedef.util.TypeInfo;
-import org.apache.tuscany.sca.interfacedef.util.WrapperInfo;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-import org.apache.tuscany.sca.xsd.XSDFactory;
-import org.apache.tuscany.sca.xsd.XSDefinition;
-import org.osoa.sca.ServiceRuntimeException;
-import org.w3c.dom.DOMImplementation;
-import org.w3c.dom.Document;
-import org.w3c.dom.bootstrap.DOMImplementationRegistry;
-import org.w3c.dom.ls.DOMImplementationLS;
-import org.w3c.dom.ls.LSInput;
-import org.w3c.dom.ls.LSParser;
-
-import commonj.sdo.Type;
-import commonj.sdo.helper.TypeHelper;
-import commonj.sdo.helper.XSDHelper;
-
-public class SDOTypeHelper implements XMLTypeHelper {
-    private static final String SCHEMA_NS = "http://www.w3.org/2001/XMLSchema";
-
-    private TypeHelper typeHelper;
-    private XSDHelper xsdHelper;
-    // private Map<String, List<Type>> xsdTypesMap = new HashMap<String, List<Type>>();
-    // private Map<String, List<Type>> typesMap = new HashMap<String, List<Type>>();
-
-    public SDOTypeHelper() {
-        super();
-        typeHelper = SDOContextHelper.getDefaultHelperContext().getTypeHelper();
-        xsdHelper = SDOContextHelper.getDefaultHelperContext().getXSDHelper();
-    }
-
-    public TypeInfo getTypeInfo(Class javaType, Object logical) {
-        QName xmlType = JavaXMLMapper.getXMLType(javaType);
-        if (xmlType != null) {
-            return new TypeInfo(xmlType, true, null);
-        } else {
-            // introspect(javaType, xsdTypesMap, typesMap);
-            if (logical instanceof XMLType) {
-                xmlType = ((XMLType)logical).getTypeName();
-            }
-            if (xmlType == null) {
-                xmlType =
-                    new QName(JavaXMLMapper.getNamespace(javaType), Introspector.decapitalize(javaType.getSimpleName()));
-            }
-            return new TypeInfo(xmlType, false, null);
-        }
-    }
-
-    private void introspect(Class javaType, Map<String, List<Type>> xsdTypesMap, Map<String, List<Type>> typesMap) {
-        Type type = typeHelper.getType(javaType);
-        if (type == null) {
-            return;
-        }
-        if (xsdHelper.isXSD(type)) {
-            addToMap(xsdTypesMap, type);
-        } else {
-            addToMap(typesMap, type);
-        }
-    }
-
-    private void addToMap(Map<String, List<Type>> map, Type type) {
-        List<Type> types = map.get(type.getURI());
-        if (types == null) {
-            types = new ArrayList<Type>();
-            map.put(type.getURI(), types);
-        }
-        if (!types.contains(type)) {
-            types.add(type);
-        }
-    }
-
-    /*
-    public List<XSDefinition> getSchemaDefinitions(XSDFactory factory, ModelResolver resolver) {
-        List<XSDefinition> definitions = new ArrayList<XSDefinition>();
-        generateSDOSchemas(definitions, factory, typesMap);
-        addResolvedXSDs(definitions, factory, resolver, xsdTypesMap);
-        return definitions;
-    }
-    */
-
-    private void generateSDOSchemas(List<XSDefinition> definitions, XSDFactory factory, Map<String, List<Type>> map) {
-        for (Map.Entry<String, List<Type>> entry : map.entrySet()) {
-            List<Type> types = entry.getValue();
-            String ns = entry.getKey();
-            generateSchema(definitions, factory, types, ns);
-        }
-    }
-
-    private void generateSchema(List<XSDefinition> definitions, XSDFactory factory, List<Type> types, String ns) {
-        String schema = xsdHelper.generate(types);
-        DOMImplementationRegistry registry = null;
-        try {
-            registry = DOMImplementationRegistry.newInstance();
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-        DOMImplementation impl = registry.getDOMImplementation("XML 3.0");
-        DOMImplementationLS ls = (DOMImplementationLS)impl.getFeature("LS", "3.0");
-        LSParser parser = ls.createLSParser(DOMImplementationLS.MODE_SYNCHRONOUS, SCHEMA_NS);
-        LSInput input = ls.createLSInput();
-        input.setCharacterStream(new StringReader(schema));
-        Document document = parser.parse(input);
-        XSDefinition definition = factory.createXSDefinition();
-        definition.setUnresolved(true);
-        definition.setDocument(document);
-        definition.setNamespace(ns);
-        definitions.add(definition);
-    }
-
-    private void addResolvedXSDs(List<XSDefinition> definitions,
-                                 XSDFactory factory,
-                                 ModelResolver resolver,
-                                 Map<String, List<Type>> map) {
-        for (Map.Entry<String, List<Type>> entry : map.entrySet()) {
-            XSDefinition definition = factory.createXSDefinition();
-            definition.setUnresolved(true);
-            definition.setNamespace(entry.getKey());
-            //FIXME: set location URI
-            XSDefinition resolved = resolver.resolveModel(XSDefinition.class, definition);
-            if (resolved.getSchema() == null) {
-                //FIXME: create a checked exception and propagate it back up to the activator
-                throw new RuntimeException("No XSD found for namespace " + entry.getKey());
-            }
-            // make sure all the required types are defined in the resolved schema
-            for (Type type : entry.getValue()) {
-                String name = xsdHelper.getLocalName(type);
-                QName typeName = null;
-                if (name.endsWith("_._type")) {
-                    // FIXME: Anonymous tyype
-                    name = name.substring(0, name.length() - "_._type".length());
-                    typeName = new QName(type.getURI(), name);
-                    if (resolved.getXmlSchemaElement(typeName) == null) {
-                        //FIXME: create a checked exception and propagate it back up to the activator
-                        throw new RuntimeException("No XSD found for " + typeName.toString());
-                    }
-                } else {
-                    typeName = new QName(type.getURI(), name);
-                    if (resolved.getXmlSchemaType(typeName) == null) {
-                        //FIXME: create a checked exception and propagate it back up to the activator
-                        throw new RuntimeException("No XSD found for " + typeName.toString());
-                    }
-                }
-
-            }
-            definitions.add(resolved);
-        }
-    }
-
-    private static List<DataType> getDataTypes(Interface intf) {
-        List<DataType> dataTypes = new ArrayList<DataType>();
-        for (Operation op : intf.getOperations()) {
-            WrapperInfo wrapper = op.getWrapper();
-            if (wrapper != null) {
-                DataType dt1 = wrapper.getInputWrapperType();
-                if (dt1 != null) {
-                    dataTypes.add(dt1);
-                }
-                DataType dt2 = wrapper.getOutputWrapperType();
-                if (dt2 != null) {
-                    dataTypes.add(dt2);
-                }
-            } else {
-                for (DataType dt1 : op.getInputType().getLogical()) {
-                    dataTypes.add(dt1);
-                }
-                DataType dt2 = op.getOutputType();
-                if (dt2 != null) {
-                    dataTypes.add(dt2);
-                }
-                for (DataType<DataType> dt3 : op.getFaultTypes()) {
-                    DataType dt4 = dt3.getLogical();
-                    if (dt4 != null) {
-                        dataTypes.add(dt4);
-                    }
-                }
-            }
-        }
-        return dataTypes;
-    }
-
-    public List<XSDefinition> getSchemaDefinitions(XSDFactory factory, ModelResolver resolver, Interface intf) {
-        return getSchemaDefinitions(factory, resolver, getDataTypes(intf));
-    }
-
-    public List<XSDefinition> getSchemaDefinitions(XSDFactory factory, ModelResolver resolver, List<DataType> dataTypes) {
-        Map<String, List<Type>> xsdTypesMap = new HashMap<String, List<Type>>();
-        Map<String, List<Type>> typesMap = new HashMap<String, List<Type>>();
-        for (DataType d : dataTypes) {
-            if (SDODataBinding.NAME.equals(d.getDataBinding())) {
-                introspect(d.getPhysical(), xsdTypesMap, typesMap);
-            }
-        }
-        List<XSDefinition> definitions = new ArrayList<XSDefinition>();
-        generateSDOSchemas(definitions, factory, typesMap);
-        addResolvedXSDs(definitions, factory, resolver, xsdTypesMap);
-        return definitions;
-    }
-
-}
diff --git a/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java b/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java
deleted file mode 100644
index 8a1cd666d8..0000000000
--- a/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.databinding.sdo;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.databinding.WrapperHandler;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
-import org.apache.tuscany.sca.interfacedef.util.ElementInfo;
-import org.apache.tuscany.sca.interfacedef.util.TypeInfo;
-import org.apache.tuscany.sca.interfacedef.util.WrapperInfo;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-
-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.XSDHelper;
-
-/**
- * SDO Wrapper Handler
- *
- * @version $Rev$ $Date$
- */
-public class SDOWrapperHandler implements WrapperHandler<Object> {
-
-    public Object create(Operation operation, boolean input) {
-        WrapperInfo wrapperInfo = operation.getWrapper();
-        ElementInfo element = input ? wrapperInfo.getInputWrapperElement() : wrapperInfo.getOutputWrapperElement();
-        // Class<?> wrapperClass = input ? wrapperInfo.getInputWrapperClass() : wrapperInfo.getOutputWrapperClass();
-        HelperContext helperContext = SDOContextHelper.getHelperContext(operation);
-        Type sdoType = getSDOType(helperContext, element);
-        if (sdoType != null) {
-            DataFactory dataFactory = helperContext.getDataFactory();
-            return dataFactory.create(sdoType);
-        }
-        return null;
-    }
-
-    public void setChildren(Object wrapper, Object[] childObjects, Operation operation, boolean input) {
-        List<ElementInfo> childElements =
-            input ? operation.getWrapper().getInputChildElements() : operation.getWrapper().getOutputChildElements();
-        for (int i = 0; i < childElements.size(); i++) {
-            setChild(wrapper, i, childElements.get(i), childObjects[i]);
-        }
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.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;
-        String name = childElement.getQName().getLocalPart();
-        if (childElement.isMany()) {
-            // FIXME: If we look up by name, we need to make sure the WrapperInfo has the correct element names
-            wrapperDO.getList(i).addAll((Collection)value);
-        } else {
-            wrapperDO.set(i, value);
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    public List getChildren(Object wrapper, Operation operation, boolean input) {
-        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;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.databinding.WrapperHandler#getWrapperType(Operation, boolean)
-     */
-    public DataType getWrapperType(Operation operation, boolean input) {
-        WrapperInfo wrapper = operation.getWrapper();
-        ElementInfo element = input ? wrapper.getInputWrapperElement() : wrapper.getOutputWrapperElement();
-        HelperContext helperContext = SDOContextHelper.getHelperContext(operation);
-        Type sdoType = getSDOType(helperContext, element);
-        if (sdoType != null) {
-            // Check if child elements matches
-            Class physical = sdoType.getInstanceClass();
-            DataType<XMLType> wrapperType =
-                new DataTypeImpl<XMLType>(SDODataBinding.NAME, physical, new XMLType(element));
-            return wrapperType;
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * @param helperContext
-     * @param element
-     * @return
-     */
-    private Type getSDOType(HelperContext helperContext, ElementInfo element) {
-        XSDHelper xsdHelper = helperContext.getXSDHelper();
-        Type sdoType = null;
-        Property prop =
-            xsdHelper.getGlobalProperty(element.getQName().getNamespaceURI(), element.getQName().getLocalPart(), true);
-        if (prop != null) {
-            sdoType = prop.getType();
-        } else {
-            TypeInfo type = element.getType();
-            QName typeName = type != null ? type.getQName() : null;
-            if (typeName != null) {
-                sdoType = helperContext.getTypeHelper().getType(typeName.getNamespaceURI(), typeName.getLocalPart());
-            }
-        }
-        return sdoType;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.databinding.WrapperHandler#isInstance(java.lang.Object, Operation, boolean)
-     */
-    public boolean isInstance(Object wrapper, Operation operation, boolean input) {
-        WrapperInfo wrapperInfo = operation.getWrapper();
-        ElementInfo element = input ? wrapperInfo.getInputWrapperElement() : wrapperInfo.getOutputWrapperElement();
-        //        List<ElementInfo> childElements =
-        //            input ? wrapperInfo.getInputChildElements() : wrapperInfo.getOutputChildElements();
-        HelperContext helperContext = SDOContextHelper.getHelperContext(operation);
-        Type sdoType = getSDOType(helperContext, element);
-        if (sdoType != null) {
-            return sdoType.isInstance(wrapper);
-        }
-        return false;
-    }
-}
diff --git a/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java b/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java
deleted file mode 100644
index 7ac423f8d8..0000000000
--- a/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.sca.databinding.sdo;
-
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.XMLHelper;
-
-public class String2DataObject extends BaseTransformer<String, DataObject> implements
-    PullTransformer<String, DataObject> {
-
-    public DataObject transform(String source, TransformationContext context) {
-        if (source == null) {
-            return null;
-        }
-        try {
-            HelperContext helperContext = SDOContextHelper.getHelperContext(context, false);
-            XMLHelper xmlHelper = helperContext.getXMLHelper();
-            return xmlHelper.load(source).getRootObject();
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<String> getSourceType() {
-        return String.class;
-    }
-
-    @Override
-    protected Class<DataObject> getTargetType() {
-        return DataObject.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 50;
-    }
-
-}
diff --git a/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java b/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java
deleted file mode 100644
index 4e5aa1d5fd..0000000000
--- a/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.sca.databinding.sdo;
-
-import java.io.StringWriter;
-
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.XMLDocument;
-import commonj.sdo.helper.XMLHelper;
-
-public class XMLDocument2String extends BaseTransformer<XMLDocument, String> implements
-    PullTransformer<XMLDocument, String> {
-
-    public String transform(XMLDocument source, TransformationContext context) {
-        if (source == null) {
-            return null;
-        }
-        try {
-            HelperContext helperContext = SDOContextHelper.getHelperContext(context, true);
-            XMLHelper xmlHelper = helperContext.getXMLHelper();
-            StringWriter writer = new StringWriter();
-            xmlHelper.save(source, writer, null);
-            return writer.toString();
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<XMLDocument> getSourceType() {
-        return XMLDocument.class;
-    }
-
-    @Override
-    protected Class<String> getTargetType() {
-        return String.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 40;
-    }
-
-}
diff --git a/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java b/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
deleted file mode 100644
index e70fa08477..0000000000
--- a/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.sca.databinding.sdo;
-
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.apache.tuscany.sdo.api.SDOUtil;
-import org.apache.tuscany.sdo.api.XMLStreamHelper;
-
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.XMLDocument;
-
-public class XMLDocument2XMLStreamReader extends BaseTransformer<XMLDocument, XMLStreamReader> implements
-    PullTransformer<XMLDocument, XMLStreamReader> {
-    /**
-     * @param source
-     * @param context
-     * @return
-     */
-    public XMLStreamReader transform(XMLDocument source, TransformationContext context) {
-        if (source == null) {
-            return null;
-        }
-        try {
-            HelperContext helperContext = SDOContextHelper.getHelperContext(context, true);
-            XMLStreamHelper streamHelper = SDOUtil.createXMLStreamHelper(helperContext);
-            return streamHelper.createXMLStreamReader(source);
-        } catch (XMLStreamException e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<XMLDocument> getSourceType() {
-        return XMLDocument.class;
-    }
-
-    @Override
-    protected Class<XMLStreamReader> getTargetType() {
-        return XMLStreamReader.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 10;
-    }
-
-}
diff --git a/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java b/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
deleted file mode 100644
index baf3e2e90a..0000000000
--- a/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.sca.databinding.sdo;
-
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.apache.tuscany.sdo.api.SDOUtil;
-import org.apache.tuscany.sdo.api.XMLStreamHelper;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.helper.HelperContext;
-
-public class XMLStreamReader2DataObject extends BaseTransformer<XMLStreamReader, DataObject> implements
-    PullTransformer<XMLStreamReader, DataObject> {
-
-    public DataObject transform(XMLStreamReader source, TransformationContext context) {
-        if (source == null) {
-            return null;
-        }
-        try {
-            HelperContext helperContext = SDOContextHelper.getHelperContext(context, false);
-            XMLStreamHelper streamHelper = SDOUtil.createXMLStreamHelper(helperContext);
-            // The XMLStreamHelper requires that the reader is positioned at
-            // START_ELEMENT
-            while (source.getEventType() != XMLStreamConstants.START_ELEMENT && source.hasNext()) {
-                source.next();
-            }
-            DataObject target = streamHelper.loadObject(source);
-            source.close();
-            return target;
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<DataObject> getTargetType() {
-        return DataObject.class;
-    }
-
-    @Override
-    protected Class<XMLStreamReader> getSourceType() {
-        return XMLStreamReader.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 15;
-    }
-
-}
diff --git a/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java b/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
deleted file mode 100644
index ac452910f6..0000000000
--- a/branches/sca-java-20080910/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.sca.databinding.sdo;
-
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.apache.tuscany.sdo.api.SDOUtil;
-import org.apache.tuscany.sdo.api.XMLStreamHelper;
-
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.XMLDocument;
-
-public class XMLStreamReader2XMLDocument extends BaseTransformer<XMLStreamReader, XMLDocument> implements
-    PullTransformer<XMLStreamReader, XMLDocument> {
-
-    public XMLDocument transform(XMLStreamReader source, TransformationContext context) {
-        if (source == null) {
-            return null;
-        }
-        try {
-            HelperContext helperContext = SDOContextHelper.getHelperContext(context, false);
-            XMLStreamHelper streamHelper = SDOUtil.createXMLStreamHelper(helperContext);
-            XMLDocument target = streamHelper.load(source);
-            source.close();
-            return target;
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<XMLDocument> getTargetType() {
-        return XMLDocument.class;
-    }
-
-    @Override
-    protected Class<XMLStreamReader> getSourceType() {
-        return XMLStreamReader.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 15;
-    }
-
-}
diff --git a/branches/sca-java-20080910/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/branches/sca-java-20080910/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index ffe8b895b8..0000000000
--- a/branches/sca-java-20080910/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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. 
-
-org.apache.tuscany.sca.databinding.sdo.ImportSDOProcessor;qname=http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0#import.sdo,model=org.apache.tuscany.sca.databinding.sdo.ImportSDO
diff --git a/branches/sca-java-20080910/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/branches/sca-java-20080910/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
deleted file mode 100644
index afd00b552c..0000000000
--- a/branches/sca-java-20080910/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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.
-
-# implementation classes for the databindings
-org.apache.tuscany.sca.databinding.sdo.SDODataBinding;type=commonj.sdo.DataObject,name=sdo
\ No newline at end of file
diff --git a/branches/sca-java-20080910/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/branches/sca-java-20080910/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
deleted file mode 100644
index b1916fd32a..0000000000
--- a/branches/sca-java-20080910/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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.
-
-# Implementation classes for the transformers
-org.apache.tuscany.sca.databinding.sdo.DataObject2String;source=commonj.sdo.DataObject,target=java.lang.String,weight=510
-org.apache.tuscany.sca.databinding.sdo.DataObject2XMLStreamReader;source=commonj.sdo.DataObject,target=javax.xml.stream.XMLStreamReader,weight=490
-org.apache.tuscany.sca.databinding.sdo.XMLDocument2String;source=commonj.sdo.helper.XMLDocument,target=java.lang.String,weight=510
-org.apache.tuscany.sca.databinding.sdo.String2DataObject;source=java.lang.String,target=commonj.sdo.DataObject,weight=500
-org.apache.tuscany.sca.databinding.sdo.XMLDocument2XMLStreamReader;source=commonj.sdo.helper.XMLDocument,target=javax.xml.stream.XMLStreamReader,weight=490
-org.apache.tuscany.sca.databinding.sdo.XMLStreamReader2DataObject;source=javax.xml.stream.XMLStreamReader,target=commonj.sdo.DataObject,weight=490
-org.apache.tuscany.sca.databinding.sdo.XMLStreamReader2XMLDocument;source=javax.xml.stream.XMLStreamReader,target=commonj.sdo.helper.XMLDocument,weight=490
-org.apache.tuscany.sca.databinding.sdo.DataObject2Node;source=commonj.sdo.DataObject,target=org.w3c.dom.Node,weight=500
-org.apache.tuscany.sca.databinding.sdo.Node2DataObject;source=org.w3c.dom.Node,target=commonj.sdo.DataObject,weight=500
diff --git a/branches/sca-java-20080910/modules/databinding-sdo/src/main/resources/databinding-sdo-validation-messages.properties b/branches/sca-java-20080910/modules/databinding-sdo/src/main/resources/databinding-sdo-validation-messages.properties
deleted file mode 100644
index f53f08f377..0000000000
--- a/branches/sca-java-20080910/modules/databinding-sdo/src/main/resources/databinding-sdo-validation-messages.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-#
-#    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.
-#
-#
-FailToResolveClass = Fail to resolve class: {0}
-FailToResolveLocation = Fail to resolve location: {0}
-ContributionResolveException = ContributionResolveException occured due to:
diff --git a/branches/sca-java-20080910/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java b/branches/sca-java-20080910/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java
deleted file mode 100644
index 5a0208b290..0000000000
--- a/branches/sca-java-20080910/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * 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
- *
- * @version $Rev$ $Date$
- */
-public class InvalidSymbolFault_Exception extends Exception {
-    private static final long serialVersionUID = 8602157311925253920L;
-    
-    /**
-     * 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-20080910/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java b/branches/sca-java-20080910/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java
deleted file mode 100644
index 4bc41a5541..0000000000
--- a/branches/sca-java-20080910/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.databinding.sdo;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-import com.example.ipo.sdo.PurchaseOrderType;
-import commonj.sdo.DataObject;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class DataObject2NodeTestCase extends SDOTransformerTestCaseBase {
-    @Override
-    protected DataType<?> getSourceDataType() {
-        return new DataTypeImpl<XMLType>(binding, PurchaseOrderType.class, new XMLType(ORDER_QNAME, null));
-    }
-
-    @Override
-    protected DataType<?> getTargetDataType() {
-        return new DataTypeImpl<Class<String>>(String.class, String.class);
-    }
-
-    public final void testTransform() {
-        Node node = new DataObject2Node().transform(dataObject, context);
-        Assert.assertNotNull(node);
-        Element element = (Element) node;
-        Assert.assertEquals(ORDER_QNAME.getNamespaceURI(), element.getNamespaceURI());
-        Assert.assertEquals(ORDER_QNAME.getLocalPart(), element.getLocalName());
-        DataObject po = new Node2DataObject().transform(node, reversedContext);
-        Assert.assertTrue(po instanceof PurchaseOrderType);
-        PurchaseOrderType orderType = (PurchaseOrderType)po;
-        Assert.assertEquals("San Jose", orderType.getBillTo().getCity());
-    }
-
-}
diff --git a/branches/sca-java-20080910/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java b/branches/sca-java-20080910/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java
deleted file mode 100644
index 44d11cd586..0000000000
--- a/branches/sca-java-20080910/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.databinding.sdo;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-
-import com.example.ipo.sdo.PurchaseOrderType;
-import commonj.sdo.DataObject;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class DataObject2StringTestCase extends SDOTransformerTestCaseBase {
-    @Override
-    protected DataType<?> getSourceDataType() {
-        return new DataTypeImpl<XMLType>(binding, PurchaseOrderType.class, new XMLType(ORDER_QNAME, null));
-    }
-
-    @Override
-    protected DataType<?> getTargetDataType() {
-        return new DataTypeImpl<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 DataTypeImpl<XMLType>(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-20080910/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java b/branches/sca-java-20080910/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
deleted file mode 100644
index 6a82a7fb18..0000000000
--- a/branches/sca-java-20080910/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.databinding.sdo;
-
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.databinding.xml.Node2String;
-import org.apache.tuscany.sca.databinding.xml.XMLStreamReader2Node;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-
-import com.example.ipo.sdo.PurchaseOrderType;
-import commonj.sdo.DataObject;
-import commonj.sdo.helper.EqualityHelper;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class DataObject2XMLStreamReaderTestCase extends SDOTransformerTestCaseBase {
-
-    @Override
-    protected DataType<?> getSourceDataType() {
-        return new DataTypeImpl<XMLType>(binding, PurchaseOrderType.class, new XMLType(ORDER_QNAME, null));
-    }
-
-    @Override
-    protected DataType<?> getTargetDataType() {
-        return new DataTypeImpl<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;
-            }
-        }
-        DataObject d = new XMLStreamReader2DataObject().transform(reader, reversedContext);
-        assertNotNull(d);
-        assertTrue(EqualityHelper.INSTANCE.equal(dataObject, d));
-    }
-    
-    public final void testTransform1() throws XMLStreamException {
-        XMLStreamReader reader = new DataObject2XMLStreamReader().transform(dataObject, context);
-        XMLStreamReader2Node t2 = new XMLStreamReader2Node();
-        org.w3c.dom.Node node = t2.transform(reader, context);
-        assertNotNull(node);
-        Node2String t3 = new Node2String();
-        String xml = t3.transform(node, context);
-        assertTrue(xml.contains("xmlns:xsi"));
-    }
-
-}
diff --git a/branches/sca-java-20080910/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java b/branches/sca-java-20080910/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
deleted file mode 100644
index fa765f9bf4..0000000000
--- a/branches/sca-java-20080910/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.sca.databinding.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.sca.contribution.DefaultModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.ClassReference;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-
-import com.example.ipo.sdo.SdoFactory;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ImportSDOProcessorTestCase extends TestCase {
-    private static boolean inited;
-
-    private ImportSDOProcessor loader;
-    private XMLInputFactory xmlFactory;
-
-    public void testMinimal() throws Exception {
-        String xml = "<import.sdo xmlns='http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0'/>";
-        XMLStreamReader reader = getReader(xml);
-        assertTrue(loader.read(reader) instanceof ImportSDO);
-    }
-
-    public void testLocation() throws Exception {
-        String xml = "<import.sdo xmlns='http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0' location='ipo.xsd'/>";
-        XMLStreamReader reader = getReader(xml);
-        assertTrue(loader.read(reader) instanceof ImportSDO);
-    }
-
-    public void testFactory() throws Exception {
-        String xml = "<import.sdo xmlns='http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0' " + "factory='"
-                     + MockFactory.class.getName()
-                     + "'/>";
-        XMLStreamReader reader = getReader(xml);
-        assertFalse(inited);
-        ImportSDO importSDO = loader.read(reader);
-        assertNotNull(importSDO);
-        ModelResolver resolver = new TestModelResolver();
-        resolver.addModel(new ClassReference(MockFactory.class));
-        loader.resolve(importSDO, resolver);
-        assertTrue(inited);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        loader = new ImportSDOProcessor(new DefaultModelFactoryExtensionPoint(), null);
-        xmlFactory = XMLInputFactory.newInstance();
-    }
-
-    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 {
-            ImportSDOProcessorTestCase.inited = true;
-        }
-    }
-}
diff --git a/branches/sca-java-20080910/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelperTestCase.java b/branches/sca-java-20080910/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelperTestCase.java
deleted file mode 100644
index e0d1c9bf12..0000000000
--- a/branches/sca-java-20080910/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelperTestCase.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.databinding.sdo;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sdo.api.SDOUtil;
-import org.junit.Test;
-
-import commonj.sdo.Type;
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.TypeHelper;
-import commonj.sdo.helper.XSDHelper;
-
-/**
- * @version $Rev$ $Date$
- */
-public class SDOContextHelperTestCase {
-    @Test
-    public void testGenerateSchema() throws IOException {
-        HelperContext context = SDOUtil.createHelperContext();
-        URL url = getClass().getResource("/ipo.xsd");
-        Assert.assertNotNull(url);
-        InputStream is = url.openStream();
-        XSDHelper xsdHelper = context.getXSDHelper();
-        xsdHelper.define(is, url.toExternalForm());
-        TypeHelper typeHelper = context.getTypeHelper();
-        Type type = typeHelper.getType("http://www.example.com/IPO", "PurchaseOrderType");
-        Assert.assertNotNull(type);
-        /*
-        SDOContextHelper.generateSchema(context, Arrays.asList(type));
-        */
-    }
-}
diff --git a/branches/sca-java-20080910/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java b/branches/sca-java-20080910/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java
deleted file mode 100644
index 3c21b56c9f..0000000000
--- a/branches/sca-java-20080910/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.databinding.sdo;
-
-import javax.xml.namespace.QName;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-
-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;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-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()
-     */
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        binding = new SDODataBinding();
-        context = HelperProvider.getDefaultContext();
-        SdoFactory.INSTANCE.register(context);
-    }
-
-    public final void testIntrospect() {
-        Operation op = null;
-        DataType dataType = new DataTypeImpl<Class>(DataObject.class, null);
-        boolean yes = binding.introspect(dataType, op);
-        assertTrue(yes);
-        assertTrue(dataType.getDataBinding().equals(binding.getName()));
-        assertTrue(dataType.getPhysical() == DataObject.class && dataType.getLogical() == XMLType.UNKNOWN);
-        dataType = new DataTypeImpl<Class>(PurchaseOrderType.class, null);
-        yes = binding.introspect(dataType, op);
-        assertTrue(yes);
-        assertEquals(PurchaseOrderType.class, dataType.getPhysical());
-        assertEquals(new QName("http://www.example.com/IPO", "PurchaseOrderType"), ((XMLType)dataType.getLogical())
-            .getTypeName());
-        dataType = new DataTypeImpl<Class>(USAddress.class, null);
-        yes = binding.introspect(dataType, op);
-        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, null, null);
-        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, null, null);
-        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, null, null);
-        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-20080910/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java b/branches/sca-java-20080910/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java
deleted file mode 100644
index 2aaae3c6d8..0000000000
--- a/branches/sca-java-20080910/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.databinding.sdo;
-
-import javax.xml.namespace.QName;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.impl.TransformationContextImpl;
-import org.apache.tuscany.sca.interfacedef.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
- *
- * @version $Rev$ $Date$
- */
-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()
-     */
-    @Override
-    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-20080910/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java b/branches/sca-java-20080910/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java
deleted file mode 100644
index 11d8495de8..0000000000
--- a/branches/sca-java-20080910/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.databinding.sdo;
-
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.impl.OperationImpl;
-import org.apache.tuscany.sca.interfacedef.util.ElementInfo;
-import org.apache.tuscany.sca.interfacedef.util.WrapperInfo;
-import org.apache.tuscany.sdo.api.SDOUtil;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.XMLDocument;
-import commonj.sdo.helper.XMLHelper;
-import commonj.sdo.helper.XSDHelper;
-import commonj.sdo.impl.HelperProvider;
-
-/**
- * @version $Rev$ $Date$
- */
-public class SDOWrapperHandlerTestCase extends TestCase {
-    private HelperContext context;
-    private SDOWrapperHandler handler;
-
-    @Override
-    public void setUp() throws Exception {
-        context = SDOUtil.createHelperContext();
-        handler = new SDOWrapperHandler();
-    }
-
-    public void testWrapperAnyType() throws Exception {
-        XMLHelper xmlHelper = context.getXMLHelper();
-        XMLDocument document = xmlHelper.load(getClass().getResourceAsStream("/wrapper.xml"));
-        Operation op = new OperationImpl();
-        List children = handler.getChildren(document, op, true);
-        assertEquals(5, children.size());
-    }
-
-    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"));
-        Operation op = new OperationImpl();
-        List children = handler.getChildren(document, op, true);
-        assertEquals(5, children.size());
-    }
-    
-    public void testCreate() {
-        HelperContext context = HelperProvider.getDefaultContext();
-        XSDHelper xsdHelper = context.getXSDHelper();
-        xsdHelper.define(getClass().getResourceAsStream("/wrapper.xsd"), null);
-        ElementInfo element = new ElementInfo(new QName("http://www.example.com/wrapper", "op"), null);
-        Operation op = new OperationImpl();
-        WrapperInfo wrapperInfo = new WrapperInfo(SDODataBinding.NAME, element, null, null, null);
-        op.setWrapper(wrapperInfo);
-        DataObject wrapper = (DataObject) handler.create(op, true);
-        assertNotNull(wrapper);
-    }
-
-}
diff --git a/branches/sca-java-20080910/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java b/branches/sca-java-20080910/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java
deleted file mode 100644
index ce04f5be3f..0000000000
--- a/branches/sca-java-20080910/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.databinding.sdo;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-
-
-/**
- * A default implementation of an artifact resolver, based on a map.
- *
- * @version $Rev$ $Date$
- */
-public class TestModelResolver implements ModelResolver {
-    private static final long serialVersionUID = -7826976465762296634L;
-    
-    private Map<Object, Object> map = new HashMap<Object, Object>();
-    
-    public TestModelResolver() {
-    }
-
-    public <T> T resolveModel(Class<T> modelClass, T unresolved) {
-        Object resolved = map.get(unresolved);
-        if (resolved != null) {
-            
-            // Return the resolved object
-            return modelClass.cast(resolved);
-            
-        } else {
-            
-            // Return the unresolved object
-            return unresolved;
-        }
-    }
-    
-    public void addModel(Object resolved) {
-        map.put(resolved, resolved);
-    }
-    
-    public Object removeModel(Object resolved) {
-        return map.remove(resolved);
-    }
-    
-}
diff --git a/branches/sca-java-20080910/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java b/branches/sca-java-20080910/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
deleted file mode 100644
index 114c568c38..0000000000
--- a/branches/sca-java-20080910/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.databinding.sdo;
-
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-
-import com.example.ipo.sdo.PurchaseOrderType;
-import commonj.sdo.helper.XMLDocument;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class XMLDocument2XMLStreamReaderTestCase extends SDOTransformerTestCaseBase {
-
-    @Override
-    protected DataType<?> getSourceDataType() {
-        return new DataTypeImpl<XMLType>(XMLDocument.class.getName(), XMLDocument.class, new XMLType(ORDER_QNAME, null));
-    }
-
-    @Override
-    protected DataType<?> getTargetDataType() {
-        return new DataTypeImpl<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-20080910/modules/databinding-sdo/src/test/resources/ipo.xsd b/branches/sca-java-20080910/modules/databinding-sdo/src/test/resources/ipo.xsd
deleted file mode 100755
index 241ec15d36..0000000000
--- a/branches/sca-java-20080910/modules/databinding-sdo/src/test/resources/ipo.xsd
+++ /dev/null
@@ -1,136 +0,0 @@
-<!--
- * 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/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-20080910/modules/databinding-sdo/src/test/resources/model/sca-core.xsd b/branches/sca-java-20080910/modules/databinding-sdo/src/test/resources/model/sca-core.xsd
deleted file mode 100755
index 56c6977254..0000000000
--- a/branches/sca-java-20080910/modules/databinding-sdo/src/test/resources/model/sca-core.xsd
+++ /dev/null
@@ -1,233 +0,0 @@
-<?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-20080910/modules/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd b/branches/sca-java-20080910/modules/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd
deleted file mode 100755
index bbaf58f00c..0000000000
--- a/branches/sca-java-20080910/modules/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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-20080910/modules/databinding-sdo/src/test/resources/stock.xsd b/branches/sca-java-20080910/modules/databinding-sdo/src/test/resources/stock.xsd
deleted file mode 100644
index a0a6717371..0000000000
--- a/branches/sca-java-20080910/modules/databinding-sdo/src/test/resources/stock.xsd
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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-20080910/modules/databinding-sdo/src/test/resources/wrapper.xml b/branches/sca-java-20080910/modules/databinding-sdo/src/test/resources/wrapper.xml
deleted file mode 100644
index 2526629409..0000000000
--- a/branches/sca-java-20080910/modules/databinding-sdo/src/test/resources/wrapper.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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.    
--->
-<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-20080910/modules/databinding-sdo/src/test/resources/wrapper.xsd b/branches/sca-java-20080910/modules/databinding-sdo/src/test/resources/wrapper.xsd
deleted file mode 100644
index ea4dc5f7f3..0000000000
--- a/branches/sca-java-20080910/modules/databinding-sdo/src/test/resources/wrapper.xsd
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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