Moving 1.x branches

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

5 files changed, 0 insertions, 767 deletions

diff --git a/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java b/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java
deleted file mode 100644
index 1c5351bc70..0000000000
--- a/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java
+++ /dev/null
@@ -1,104 +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.sdo2om;
-
-import javax.xml.namespace.QName;
-
-import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMDataSource;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMNamespace;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-
-/**
- * Helper for AXIOM
- * 
- * @version $Rev$ $Date$
- */
-public class AxiomHelper {
-
-    private static final String DEFAULT_PREFIX = "_ns_";
-
-    private AxiomHelper() {
-    }
-
-    /**
-     * @param context
-     * @param element
-     */
-    public static void adjustElementName(TransformationContext context, OMElement element) {
-        if (context != null) {
-            DataType dataType = context.getTargetDataType();
-            Object logical = dataType == null ? null : dataType.getLogical();
-            if (!(logical instanceof XMLType)) {
-                return;
-            }
-            XMLType xmlType = (XMLType)logical;
-            if (xmlType.isElement() && !xmlType.getElementName().equals(element.getQName())) {
-                // FIXME:: Throw expection or switch to the new Element?
-                OMFactory factory = OMAbstractFactory.getOMFactory();
-                QName name = xmlType.getElementName();
-                OMNamespace namespace = factory.createOMNamespace(name.getNamespaceURI(), name.getPrefix());
-                element.setNamespace(namespace);
-                element.setLocalName(name.getLocalPart());
-            }
-        }
-    }
-
-    public static OMElement createOMElement(OMFactory factory, QName element) {
-        String localName = element.getLocalPart();
-        OMNamespace ns = createOMNamespace(factory, element);
-
-        return factory.createOMElement(localName, ns);
-
-    }
-
-    public static OMElement createOMElement(OMFactory factory, QName element, OMDataSource dataSource) {
-        String localName = element.getLocalPart();
-        OMNamespace ns = createOMNamespace(factory, element);
-
-        return factory.createOMElement(dataSource, localName, ns);
-
-    }
-
-    /**
-     * @param factory
-     * @param name
-     * @return
-     */
-    public static OMNamespace createOMNamespace(OMFactory factory, QName name) {
-        String namespaceURI = name.getNamespaceURI();
-        String prefix = name.getPrefix();
-
-        OMNamespace ns = null;
-        if (namespaceURI.length() != 0) {
-            // Qualified Element: we need an OMNamespace         
-            if (prefix.length() == 0) {
-                // The prefix does not appear to be specified, let's create one
-                prefix = DEFAULT_PREFIX;
-            }
-            ns = factory.createOMNamespace(namespaceURI, prefix);
-        }
-        return ns;
-    }
-}
diff --git a/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java b/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java
deleted file mode 100644
index ef6b5b0bf2..0000000000
--- a/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java
+++ /dev/null
@@ -1,86 +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.sdo2om;
-
-import static org.apache.tuscany.sca.databinding.sdo.SDODataBinding.ROOT_ELEMENT;
-
-import javax.xml.namespace.QName;
-
-import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMFactory;
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.apache.tuscany.sca.databinding.sdo.SDOContextHelper;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.XMLDocument;
-
-/**
- * SDO DataObject --> AXIOM OMElement transformer
- * 
- * @version $Rev$ $Date$
- */
-public class DataObject2OMElement extends BaseTransformer<DataObject, OMElement> implements
-    PullTransformer<DataObject, OMElement> {
-
-    public OMElement transform(DataObject source, TransformationContext context) {
-        HelperContext helperContext = SDOContextHelper.getHelperContext(context);
-        OMFactory factory = OMAbstractFactory.getOMFactory();
-
-        QName name  = ROOT_ELEMENT;
-        if (context != null) {
-            DataType dataType = context.getTargetDataType();
-            Object logical = dataType == null ? null : dataType.getLogical();
-            if (logical instanceof XMLType) {
-                XMLType xmlType = (XMLType)logical;
-                if (xmlType.isElement()) {
-                    name = xmlType.getElementName();
-                }
-            }
-        }
-
-        XMLDocument document = helperContext.getXMLHelper().createDocument(source,
-                                                                           name.getNamespaceURI(),
-                                                                           name.getLocalPart());
-        SDODataSource dataSource = new SDODataSource(document, helperContext);
-        OMElement element = AxiomHelper.createOMElement(factory, name, dataSource);
-        return element;
-    }
-
-    @Override
-    public Class getSourceType() {
-        return DataObject.class;
-    }
-
-    @Override
-    public Class getTargetType() {
-        return OMElement.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 10;
-    }
-
-}
diff --git a/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObjectSerializer.java b/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObjectSerializer.java
deleted file mode 100644
index 36b775b123..0000000000
--- a/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObjectSerializer.java
+++ /dev/null
@@ -1,427 +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.sdo2om;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.NamespaceContext;
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sdo.impl.AttributeImpl;
-import org.apache.tuscany.sdo.impl.ReferenceImpl;
-import org.apache.tuscany.sdo.api.SDOUtil;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.Property;
-import commonj.sdo.Sequence;
-import commonj.sdo.Type;
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.XMLDocument;
-import commonj.sdo.helper.XSDHelper;
-
-public class DataObjectSerializer {
-    private static final String ELEMENT_TEXT = "Text Element";
-
-    // static final String ELEMENT_TEXT = "Element Text";
-    private static final QName XSI_TYPE_QNAME = new QName("http://www.w3.org/2001/XMLSchema-instance", "type", "xsi");
-
-    private Map<String, String> declaredNamespaceMap = new HashMap<String, String>();
-
-    private NameSpaceContextImpl namespaceContext = new NameSpaceContextImpl();
-
-    private DataObject rootDataObject;
-
-    private String rootElementName;
-
-    private String rootElementURI;
-
-    private XMLStreamWriter xmlWriter;
-
-    private XSDHelper xsdHelper;
-
-    public DataObjectSerializer(DataObject rootObject,
-                                XMLStreamWriter xmlWriter,
-                                HelperContext helperCtx,
-                                TransformationContext context) {
-        this.xmlWriter = xmlWriter;
-        this.rootDataObject = rootObject;
-        this.xsdHelper = helperCtx.getXSDHelper();
-        this.rootElementName = xsdHelper.getLocalName(rootObject.getType());
-        this.rootElementURI = rootDataObject.getType().getURI();
-
-        if (context != null) {
-            DataType dataType = context.getTargetDataType();
-            Object targetQName = dataType == null ? null : dataType.getLogical();
-            if (targetQName instanceof QName) {
-                QName name = (QName)targetQName;
-                this.rootElementName = name.getLocalPart();
-                this.rootElementURI = name.getNamespaceURI();
-            }
-        }
-
-    }
-
-    // private void serializeNamespace(String prefix, String URI,
-    // XMLStreamWriter writer) throws XMLStreamException {
-    // String prefix1 = writer.getPrefix(URI);
-    // if (prefix1 == null) {
-    // writer.writeNamespace(prefix, URI);
-    // writer.setPrefix(prefix, URI);
-    // }
-    // }
-
-    public DataObjectSerializer(XMLDocument sourceDocument, XMLStreamWriter xmlWriter, HelperContext helperCtx) {
-        this.xmlWriter = xmlWriter;
-        this.rootDataObject = sourceDocument.getRootObject();
-        this.rootElementName = sourceDocument.getRootElementName();
-        this.rootElementURI = sourceDocument.getRootElementURI();
-        this.xsdHelper = helperCtx.getXSDHelper();
-    }
-
-    protected class NameSpaceContextImpl implements NamespaceContext {
-        private int counter;
-
-        private Map<String, String> prefixToNamespaceMapping = new HashMap<String, String>();
-
-        public NameSpaceContextImpl() {
-            prefixToNamespaceMapping.put("xml", "http://www.w3.org/XML/1998/namespace");
-            prefixToNamespaceMapping.put("xmlns", "http://www.w3.org/2000/xmlns/");
-            prefixToNamespaceMapping.put("xsi", "http://www.w3.org/2001/XMLSchema-instance");
-        }
-
-        public synchronized QName createQName(String nsURI, String name) {
-            String prefix = nsURI != null ? (String)getPrefix(nsURI) : null;
-            if (prefix == null && nsURI != null && !nsURI.equals("")) {
-                prefix = "p" + (counter++);
-            }
-            if (prefix == null) {
-                prefix = "";
-            }
-            if (nsURI != null) {
-                prefixToNamespaceMapping.put(prefix, nsURI);
-                declaredNamespaceMap.put(prefix, nsURI);
-            }
-            return new QName(nsURI, name, prefix);
-        }
-
-        public String getNamespaceURI(String prefix) {
-            if (prefix == null) {
-                throw new IllegalArgumentException("Prefix is null");
-            }
-
-            String ns = prefixToNamespaceMapping.get(prefix);
-            if (ns != null) {
-                return ns;
-            } else {
-                return null;
-            }
-        }
-
-        public String getPrefix(String nsURI) {
-            if (nsURI == null) {
-                throw new IllegalArgumentException("Namespace is null");
-            }
-            for (Iterator i = prefixToNamespaceMapping.entrySet().iterator(); i.hasNext();) {
-                Map.Entry entry = (Map.Entry)i.next();
-                if (entry.getValue().equals(nsURI)) {
-                    return (String)entry.getKey();
-                }
-            }
-            return null;
-        }
-
-        public Iterator getPrefixes(String nsURI) {
-            List prefixList = new ArrayList();
-            for (Iterator i = prefixToNamespaceMapping.entrySet().iterator(); i.hasNext();) {
-                Map.Entry entry = (Map.Entry)i.next();
-                if (entry.getValue().equals(nsURI)) {
-                    prefixList.add(entry.getKey());
-                }
-            }
-            return prefixList.iterator();
-        }
-
-        public void registerMapping(String prefix, String nsURI) {
-            prefixToNamespaceMapping.put(prefix, nsURI);
-        }
-
-        public void removeMapping(String prefix) {
-            prefixToNamespaceMapping.remove(prefix);
-        }
-    }
-
-    protected static class NameValuePair implements Map.Entry {
-        private Object key;
-
-        private Object value;
-
-        public NameValuePair(Object key, Object value) {
-            this.key = key;
-            this.value = value;
-        }
-
-        public Object getKey() {
-            return key;
-        }
-
-        public Object getValue() {
-            return value;
-        }
-
-        public Object setValue(Object value) {
-            Object v = this.value;
-            this.value = value;
-            return v;
-        }
-
-    }
-
-    private static boolean isTransient(Property property, Object type) {
-        // HACK: We need some SDOUtil extension to understand a property is
-        // derived
-        EStructuralFeature feature = (EStructuralFeature)property;
-        if (ExtendedMetaData.INSTANCE.getGroup(feature) != null) {
-            return false;
-        }
-        feature = ExtendedMetaData.INSTANCE.getAffiliation((EClass)type, feature);
-        if (feature != null && feature != property) {
-            return false;
-        }
-        if (property instanceof ReferenceImpl) {
-            ReferenceImpl r = (ReferenceImpl)property;
-            if (r.isTransient()) {
-                return true;
-            }
-            EReference opposite = r.getEOpposite();
-            if (opposite != null && opposite.isContainment()) {
-                return true;
-            }
-        } else if (property instanceof AttributeImpl) {
-            AttributeImpl a = (AttributeImpl)property;
-            if (a.isTransient()) {
-                return true;
-            }
-            EDataType d = (EDataType)a.getEType();
-            if (!d.isSerializable()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private void addListValue(List<NameValuePair> propertyList,
-                              List<DataObject> children,
-                              Property property,
-                              List objList) throws XMLStreamException {
-        if (objList != null) {
-            for (int j = 0; j < objList.size(); j++) {
-                Object object = objList.get(j);
-                addSingleValue(propertyList, children, property, object);
-            }
-        }
-    }
-
-    private void addProperty(List<NameValuePair> propertyList,
-                             List<DataObject> children,
-                             Property property,
-                             Object value,
-                             DataObject dataObject) throws XMLStreamException {
-
-        if (property.isMany() && property.getContainingType().isOpen() && value instanceof Sequence) {
-            addSequenceValue(propertyList, children, (Sequence)value);
-        } else if (SDOUtil.isMany(property, dataObject) && value instanceof List) {
-            addListValue(propertyList, children, property, (List)value);
-        } else {
-            // Complex Type
-            addSingleValue(propertyList, children, property, value);
-        }
-    }
-
-    private void addSequenceValue(List<NameValuePair> elements, List<DataObject> children, Sequence seq)
-        throws XMLStreamException {
-        if (seq != null && seq.size() > 0) {
-            for (int j = 0; j < seq.size(); j++) {
-                Object o = seq.getValue(j);
-                Property p = seq.getProperty(j);
-                addSingleValue(elements, children, p, o);
-            }
-        }
-    }
-
-    private void addSingleValue(List<NameValuePair> propertyList,
-                                List<DataObject> children,
-                                Property property,
-                                Object value) throws XMLStreamException {
-        String uri = xsdHelper.getNamespaceURI(property);
-        String name = xsdHelper.getLocalName(property);
-        QName qname = namespaceContext.createQName(uri, name);
-        Type propertyType = property.getType();
-
-        if (property.getName().equals("value") && uri == null && name.equals(":0")) {
-            propertyList.add(new NameValuePair(ELEMENT_TEXT, value.toString()));
-        } else if (value == null) {
-            NameValuePair entry = new NameValuePair(qname, null);
-            propertyList.add(entry);
-        } else if (propertyType.isDataType()) {
-            NameValuePair entry = new NameValuePair(qname, SDOUtil.convertToString(propertyType, value));
-            propertyList.add(entry);
-        } else {
-            children.add((DataObject)value);
-        }
-    }
-
-    private void registerNamespace(String prefix, String uri) {
-        if (!uri.equals(namespaceContext.getNamespaceURI(prefix))) {
-            namespaceContext.registerMapping(prefix, uri);
-            declaredNamespaceMap.put(prefix, uri);
-        }
-    }
-
-    public void serialize() throws XMLStreamException {
-        xmlWriter.setNamespaceContext(namespaceContext);
-        writeDataObject(rootDataObject, rootElementName, rootElementURI);
-        xmlWriter.flush();
-    }
-
-    private void writeDataObject(DataObject obj, String elementName, String elementURI) throws XMLStreamException {
-        List<NameValuePair> elementList = new ArrayList<NameValuePair>();
-        List<DataObject> children = new ArrayList<DataObject>();
-        List<NameValuePair> attributes = new ArrayList<NameValuePair>();
-
-        String typeName;
-        QName realTypeName = null;
-
-        if (elementName != null) {
-            realTypeName = namespaceContext.createQName(elementURI, elementName);
-            String typeQName = realTypeName.getPrefix() + ":" + realTypeName.getLocalPart();
-            declaredNamespaceMap.put(realTypeName.getPrefix(), realTypeName.getNamespaceURI());
-            attributes.add(new NameValuePair(XSI_TYPE_QNAME, typeQName));
-            registerNamespace(XSI_TYPE_QNAME.getPrefix(), XSI_TYPE_QNAME.getNamespaceURI());
-        } else {
-
-            typeName = xsdHelper.getLocalName(obj.getContainmentProperty());
-            realTypeName = namespaceContext.createQName(obj.getType().getURI(), typeName);
-            registerNamespace(realTypeName.getPrefix(), realTypeName.getNamespaceURI());
-        }
-
-        registerNamespace(realTypeName.getPrefix(), realTypeName.getNamespaceURI());
-
-        if (obj.getType().isSequenced()) {
-            Sequence sequence = obj.getSequence();
-            for (int i = 0; i < sequence.size(); i++) {
-                Property property = sequence.getProperty(i);
-                Object value = sequence.getValue(i);
-                if (property == null) {
-                    elementList.add(new NameValuePair(ELEMENT_TEXT, value));
-                } else {
-                    addProperty(elementList, children, property, value, obj);
-                }
-            }
-
-            // Attributes are not in the sequence
-            List properties = obj.getInstanceProperties();
-            for (Iterator i = properties.iterator(); i.hasNext();) {
-                Property property = (Property)i.next();
-                if (xsdHelper.isAttribute(property) && obj.isSet(property) && !isTransient(property, obj.getType())) {
-                    Object value = obj.get(property);
-                    QName name =
-                        namespaceContext.createQName(xsdHelper.getNamespaceURI(property), xsdHelper
-                            .getLocalName(property));
-                    attributes.add(new NameValuePair(name, SDOUtil.convertToString(property.getType(), value)));
-                }
-            }
-        } else {
-            Iterator i = obj.getInstanceProperties().iterator();
-            while (i.hasNext()) {
-                Property p = (Property)i.next();
-                if (obj.isSet(p) && !isTransient(p, obj.getType())) {
-                    Object value = obj.get(p);
-                    if (xsdHelper.isAttribute(p)) {
-                        QName name =
-                            namespaceContext.createQName(xsdHelper.getNamespaceURI(p), xsdHelper.getLocalName(p));
-                        attributes.add(new NameValuePair(name, SDOUtil.convertToString(p.getType(), value)));
-                    } else {
-                        addProperty(elementList, children, p, value, obj);
-                    }
-                }
-            }
-        }
-
-        String prefix = realTypeName.getPrefix();
-        String nameSpaceName = realTypeName.getNamespaceURI();
-
-        if (nameSpaceName != null) {
-            String writerPrefix = xmlWriter.getPrefix(nameSpaceName);
-            if (writerPrefix != null) {
-                xmlWriter.writeStartElement(nameSpaceName, realTypeName.getLocalPart());
-            } else {
-                if (prefix != null) {
-                    xmlWriter.writeStartElement(prefix, realTypeName.getLocalPart(), nameSpaceName);
-                    xmlWriter.writeNamespace(prefix, nameSpaceName);
-                    xmlWriter.setPrefix(prefix, nameSpaceName);
-                } else {
-                    xmlWriter.writeStartElement(nameSpaceName, realTypeName.getLocalPart());
-                    xmlWriter.writeDefaultNamespace(nameSpaceName);
-                    xmlWriter.setDefaultNamespace(nameSpaceName);
-                }
-            }
-        } else {
-            xmlWriter.writeStartElement(realTypeName.getLocalPart());
-        }
-
-        for (NameValuePair pair : attributes) {
-            QName name = (QName)pair.getKey();
-            assert namespaceContext.getPrefix(name.getPrefix()).equals(name.getNamespaceURI());
-            xmlWriter.writeAttribute(name.getPrefix(), name.getNamespaceURI(), name.getLocalPart(), (String)pair
-                .getValue());
-        }
-
-        for (NameValuePair pair : elementList) {
-            if (ELEMENT_TEXT.equals(pair.getKey().toString())) {
-                xmlWriter.writeCharacters((String)pair.getValue());
-            } else {
-                QName name = (QName)pair.getKey();
-                xmlWriter.writeStartElement(name.getPrefix(), name.getLocalPart(), name.getNamespaceURI());
-                xmlWriter.writeCharacters((String)pair.getValue());
-                xmlWriter.writeEndElement();
-            }
-        }
-
-        for (DataObject child : children) {
-            writeDataObject(child, null, null);
-        }
-        xmlWriter.writeEndElement();
-
-    }
-
-}
diff --git a/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java b/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java
deleted file mode 100644
index f461a80029..0000000000
--- a/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java
+++ /dev/null
@@ -1,85 +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.sdo2om;
-
-import static org.apache.tuscany.sca.databinding.sdo.SDODataBinding.ROOT_ELEMENT;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.Writer;
-
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.axiom.om.OMDataSource;
-import org.apache.axiom.om.OMOutputFormat;
-import org.apache.axiom.om.impl.serialize.StreamingOMSerializer;
-import org.apache.tuscany.sdo.api.XMLStreamHelper;
-import org.apache.tuscany.sdo.api.SDOUtil;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.XMLDocument;
-
-public class SDODataSource implements OMDataSource {
-    private HelperContext helperContext;
-    private XMLDocument sourceDocument;
-
-    public SDODataSource(XMLDocument source, HelperContext helperContext) {
-        this.sourceDocument = source;
-        this.helperContext = helperContext;
-    }
-
-    public SDODataSource(DataObject obj, HelperContext helperContext) {
-        this.helperContext = helperContext;
-        this.sourceDocument =
-            helperContext.getXMLHelper().createDocument(obj,
-                                                        ROOT_ELEMENT.getNamespaceURI(),
-                                                        ROOT_ELEMENT.getLocalPart());
-    }
-
-    public XMLStreamReader getReader() throws XMLStreamException {
-        XMLStreamHelper streamHelper = SDOUtil.createXMLStreamHelper(helperContext);
-        return streamHelper.createXMLStreamReader(sourceDocument);
-    }
-
-    public void serialize(XMLStreamWriter xmlWriter) throws XMLStreamException {
-        StreamingOMSerializer serializer = new StreamingOMSerializer();
-        serializer.serialize(getReader(), xmlWriter);
-    }
-
-    public void serialize(OutputStream output, OMOutputFormat format) throws XMLStreamException {
-        try {
-            helperContext.getXMLHelper().save(sourceDocument, output, null);
-        } catch (Exception e) {
-            throw new XMLStreamException(e);
-        }
-    }
-
-    public void serialize(Writer writer, OMOutputFormat format) throws XMLStreamException {
-        try {
-            helperContext.getXMLHelper().save(sourceDocument, writer, null);
-        } catch (IOException e) {
-            throw new XMLStreamException(e);
-        }
-    }
-
-}
diff --git a/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java b/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java
deleted file mode 100644
index 1f3384efd8..0000000000
--- a/branches/sca-java-0.99/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.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.sdo2om;
-
-import javax.xml.namespace.QName;
-
-import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMFactory;
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.apache.tuscany.sca.databinding.sdo.SDOContextHelper;
-
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.XMLDocument;
-
-/**
- * SDO XMLDocument --> AXIOM OMElement transformer
- * @version $Rev$ $Date$
- */
-public class XMLDocument2OMElement extends BaseTransformer<XMLDocument, OMElement> implements
-    PullTransformer<XMLDocument, OMElement> {
-
-    public OMElement transform(XMLDocument source, TransformationContext context) {
-        HelperContext helperContext = SDOContextHelper.getHelperContext(context);
-        SDODataSource dataSource = new SDODataSource(source, helperContext);
-        OMFactory factory = OMAbstractFactory.getOMFactory();
-        QName name = new QName(source.getRootElementURI(), source.getRootElementName());
-        OMElement element = AxiomHelper.createOMElement(factory, name, dataSource);
-        return element;
-    }
-
-    @Override
-    public Class getSourceType() {
-        return XMLDocument.class;
-    }
-
-    @Override
-    public Class getTargetType() {
-        return OMElement.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 10;
-    }
-
-}