Remove old beta1 branch

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

15 files changed, 0 insertions, 1208 deletions

diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java b/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java
deleted file mode 100644
index 014a0f5223..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.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.axiom;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.tuscany.sca.databinding.BaseDataBinding;
-import org.apache.tuscany.sca.databinding.WrapperHandler;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.Operation;
-
-/**
- * DataBinding for AXIOM
- *
- * @version $Rev$ $Date$
- */
-public class AxiomDataBinding extends BaseDataBinding {
-    
-    public static final String NAME = OMElement.class.getName();
-
-    public AxiomDataBinding() {
-        super(NAME, OMElement.class);
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.databinding.impl.BaseDataBinding#getWrapperHandler()
-     */
-    @Override
-    public WrapperHandler getWrapperHandler() {
-        return new OMElementWrapperHandler();
-    }
-
-    @Override
-    public Object copy(Object source,
-                       DataType sourceDataType,
-                       DataType targetDataType,
-                       Operation sourceOperation,
-                       Operation targetOperation) {
-        if ( OMElement.class.isAssignableFrom(source.getClass()) ) {
-            try {
-                OMElement sourceElement = (OMElement)source;
-                return sourceElement.cloneOMElement();
-            } catch ( Exception e ) {
-                throw new IllegalArgumentException(e);
-            }
-        }
-        return super.copy(source, sourceDataType, targetDataType, sourceOperation, targetOperation);
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java b/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java
deleted file mode 100644
index cd820ab4b4..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java
+++ /dev/null
@@ -1,142 +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.axiom;
-
-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.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.impl.builder.StAXBuilder;
-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() {
-    }
-
-    /**
-     * See http://issues.apache.org/jira/browse/WSCOMMONS-240
-     * @param om
-     */
-    public static void completeAndClose(OMElement om) {
-        // Get the builder associated with the om element
-        OMXMLParserWrapper builder = om.getBuilder();
-        if (builder != null) {
-            if (builder instanceof StAXBuilder) {
-                ((StAXBuilder)builder).releaseParserOnClose(true);
-            }
-            OMElement document = builder.getDocumentElement();
-            if (document != null) {
-                document.build();
-            }
-        }
-        if (builder instanceof StAXBuilder) {
-            ((StAXBuilder)builder).close();
-        }
-    }
-
-    /**
-     * This method will close the builder immediately.  Any subsequent Axiom objects won't 
-     * be built or accessible.
-     */
-    public static void closeImmediately(OMElement om) {
-        // Get the builder associated with the om element
-        OMXMLParserWrapper builder = om.getBuilder();
-        if (builder != null) {
-            if (builder instanceof StAXBuilder) {
-                ((StAXBuilder)builder).releaseParserOnClose(true);
-                ((StAXBuilder)builder).close();
-            }
-            // builder.close();
-        }
-    }
-
-    /**
-     * @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 exception 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;
-
-        // 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/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Exception2OMElement.java b/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Exception2OMElement.java
deleted file mode 100644
index f44297edb7..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Exception2OMElement.java
+++ /dev/null
@@ -1,95 +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.axiom;
-
-import javax.xml.namespace.QName;
-
-import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMAttribute;
-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.databinding.javabeans.Java2XMLMapperException;
-import org.apache.tuscany.sca.databinding.javabeans.JavaBean2XMLTransformer;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class Exception2OMElement extends JavaBean2XMLTransformer<OMElement> {
-
-    public static final String GETCAUSE = "getCause";
-    public static final String GETLOCALIZEDMESSAGE = "getLocalizedMessage";
-    public static final String GETSTACKTRACE = "getStackTrace";
-    public static final String GETCLASS = "getClass";
-
-    private OMFactory factory;
-
-    public Exception2OMElement() {
-        super();
-        factory = OMAbstractFactory.getOMFactory();
-    }
-
-    @Override
-    public OMElement transform(Object source, TransformationContext context) {
-        OMElement element = super.transform(source, context);
-        AxiomHelper.adjustElementName(context, element);
-        return element;
-    }
-
-    @Override
-    protected boolean isMappedGetter(String methodName) {
-        if (GETCAUSE.equals(methodName)
-            || GETLOCALIZEDMESSAGE.equals(methodName)
-            || GETSTACKTRACE.equals(methodName)
-            || GETCLASS.equals(methodName)) {
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    @Override
-    public void appendChild(OMElement parentElement, OMElement childElement) throws Java2XMLMapperException {
-        parentElement.addChild(childElement);
-    }
-
-    @Override
-    public OMElement createElement(QName qName) throws Java2XMLMapperException {
-        return factory.createOMElement(qName);
-    }
-
-    @Override
-    public void appendText(OMElement parentElement, String textData) throws Java2XMLMapperException {
-        if (textData == null) {
-            OMNamespace xsi = factory.createOMNamespace("http://www.w3.org/2001/XMLSchema-instance", "xsi");
-            OMAttribute nil = factory.createOMAttribute("nil", xsi, "true");
-            parentElement.addAttribute(nil);
-        } else {
-            factory.createOMText(parentElement, textData);
-        }
-    }
-
-    @Override
-    public Class getTargetType() {
-        return OMElement.class;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.java b/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.java
deleted file mode 100644
index cede1c4689..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.java
+++ /dev/null
@@ -1,77 +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.axiom;
-
-import java.io.ByteArrayOutputStream;
-import java.io.Externalizable;
-import java.io.ObjectOutputStream;
-
-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.axiom.om.OMNamespace;
-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.BaseTransformer;
-import org.apache.tuscany.sca.databinding.impl.XSDDataTypeConverter.Base64Binary;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class Externalizable2OMElement extends BaseTransformer<Externalizable, OMElement> implements
-    PullTransformer<Externalizable, OMElement> {
-
-    @Override
-    protected Class<Externalizable> getSourceType() {
-        return  Externalizable.class;
-    }
-
-    @Override
-    protected Class<OMElement> getTargetType() {
-        return OMElement.class;
-    }
-
-    public OMElement transform(Externalizable source, TransformationContext context) {
-        OMElement element = null;
-
-        try {
-            ByteArrayOutputStream bos = new ByteArrayOutputStream();
-            ObjectOutputStream out = new ObjectOutputStream(bos);
-            out.writeObject(source);
-            out.close();
-            OMFactory factory = OMAbstractFactory.getOMFactory();
-            OMNamespace ns = AxiomHelper.createOMNamespace(factory, new QName("http://callable"));
-            element = factory.createOMElement("reference",ns);
-            element.setText(Base64Binary.encode(bos.toByteArray()));
-            return element;
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-	
-    @Override
-    public int getWeight() {
-        return 10;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Exception.java b/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Exception.java
deleted file mode 100644
index 947cd99a19..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Exception.java
+++ /dev/null
@@ -1,79 +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.axiom;
-
-import java.util.Iterator;
-
-import javax.xml.namespace.QName;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMNode;
-import org.apache.axiom.om.OMText;
-import org.apache.tuscany.sca.databinding.javabeans.XML2JavaBeanTransformer;
-import org.apache.tuscany.sca.databinding.javabeans.XML2JavaMapperException;
-
-/**
- * Transformer to convert data from an OMElement to a Java Exception
- *
- * @version $Rev$ $Date$
- */
-public class OMElement2Exception extends XML2JavaBeanTransformer<OMElement> {
-
-    @Override
-    public OMElement getRootElement(OMElement element) throws XML2JavaMapperException {
-        return element;
-    }
-
-    @Override
-    public Iterator<OMElement> getChildElements(OMElement parent) throws XML2JavaMapperException {
-        return parent.getChildElements();
-    }
-
-    @Override
-    public String getElementName(OMElement element) throws XML2JavaMapperException {
-        return element.getLocalName();
-    }
-
-    @Override
-    public String getText(OMElement element) throws XML2JavaMapperException {
-        return element.getText();
-    }
-
-    @Override
-    public boolean isTextElement(OMElement element) throws XML2JavaMapperException {
-        return false;
-    }
-
-    @Override
-    public boolean isTextOnly(OMElement element) throws XML2JavaMapperException {
-        OMNode firstChild = element.getFirstOMChild();
-        return firstChild instanceof OMText && firstChild.getNextOMSibling() == null;
-    }
-
-    @Override
-    public OMElement getFirstChildWithName(OMElement element, QName name) throws XML2JavaMapperException {
-        return element.getFirstChildWithName(name);
-    }
-
-    @Override
-    public Class getSourceType() {
-        return OMElement.class;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.java b/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.java
deleted file mode 100644
index f4bbea81cc..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.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.axiom;
-
-import java.io.ByteArrayInputStream;
-import java.io.Externalizable;
-import java.io.ObjectInputStream;
-
-import org.apache.axiom.om.OMElement;
-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.BaseTransformer;
-import org.apache.tuscany.sca.databinding.impl.XSDDataTypeConverter.Base64Binary;
-
-/**
- * Transformer to convert data from an OMElement to XML String
- *
- * @version $Rev$ $Date$
- */
-public class OMElement2Externalizable extends BaseTransformer<OMElement, Externalizable> implements PullTransformer<OMElement, Externalizable> {
-    // private XmlOptions options;
-    
-    public Externalizable transform(OMElement source, TransformationContext context) {
-        try {
-            String value = source.getText();
-            ByteArrayInputStream bis = new ByteArrayInputStream(Base64Binary.decode(value));
-            ObjectInputStream ois = new ObjectInputStream(bis);
-            Object obj = ois.readObject();
-            ois.close();
-            Externalizable aReference = (Externalizable) obj;
-            return aReference;
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<OMElement> getSourceType() {
-        return OMElement.class;
-    }
-
-    @Override
-    protected Class<Externalizable> getTargetType() {
-        return Externalizable.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 10;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java b/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java
deleted file mode 100644
index ea40e61746..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java
+++ /dev/null
@@ -1,50 +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.axiom;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.tuscany.sca.databinding.impl.SimpleType2JavaTransformer;
-
-/**
- * Transformer to convert data from a simple java Object to OMElement.
- *
- * @version $Rev$ $Date$
- */
-public class OMElement2Object extends SimpleType2JavaTransformer<OMElement> {
-
-    /**
-     * @see org.apache.tuscany.sca.databinding.impl.SimpleType2JavaTransformer#close(java.lang.Object)
-     */
-    @Override
-    protected void close(OMElement source) {
-        if (source != null) {
-            AxiomHelper.completeAndClose(source);
-        }
-    }
-
-    @Override
-    protected String getText(OMElement source) {
-        return source.getText();
-    }
-
-    @Override
-    public Class getSourceType() {
-        return OMElement.class;
-    }
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java b/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java
deleted file mode 100644
index 0fc2cfa8a3..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.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.axiom;
-
-import java.io.StringWriter;
-
-import javax.xml.stream.XMLStreamException;
-
-import org.apache.axiom.om.OMElement;
-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.BaseTransformer;
-
-/**
- * Transformer to convert data from an OMElement to XML String
- *
- * @version $Rev$ $Date$
- */
-public class OMElement2String extends BaseTransformer<OMElement, String> implements PullTransformer<OMElement, String> {
-    // private XmlOptions options;
-    
-    public String transform(OMElement source, TransformationContext context) {
-        try {
-            StringWriter writer = new StringWriter();
-            source.serialize(writer);
-            return writer.toString();
-        } catch (XMLStreamException e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<OMElement> getSourceType() {
-        return OMElement.class;
-    }
-
-    @Override
-    protected Class<String> getTargetType() {
-        return String.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 40;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java b/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java
deleted file mode 100644
index e0da9ad428..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.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.axiom;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.BaseTransformer;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class OMElement2XMLStreamReader extends BaseTransformer<OMElement, XMLStreamReader> implements
-    PullTransformer<OMElement, XMLStreamReader> {
-    // private XmlOptions options;
-
-    public static final QName QNAME_NIL = new QName("http://www.w3.org/2001/XMLSchema-instance", "nil");
-
-    public XMLStreamReader transform(OMElement source, TransformationContext context) {
-        if (source == null) {
-            return null;
-        } else {
-            if ("true".equals(source.getAttributeValue(QNAME_NIL))) {
-                return null;
-            } else {
-                return source.getXMLStreamReader();
-            }
-        }
-    }
-
-    @Override
-    protected Class<OMElement> getSourceType() {
-        return OMElement.class;
-    }
-
-    @Override
-    protected Class<XMLStreamReader> getTargetType() {
-        return XMLStreamReader.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 10;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java b/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java
deleted file mode 100644
index 9084f09dc0..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java
+++ /dev/null
@@ -1,251 +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.axiom;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.XMLConstants;
-import javax.xml.namespace.QName;
-
-import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMAttribute;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMNamespace;
-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;
-
-/**
- * OMElement wrapper handler implementation
- *
- * @version $Rev$ $Date$
- */
-public class OMElementWrapperHandler implements WrapperHandler<OMElement> {
-
-    private OMFactory factory;
-
-    public OMElementWrapperHandler() {
-        super();
-        this.factory = OMAbstractFactory.getOMFactory();
-    }
-
-    public OMElement create(Operation operation, boolean input) {
-        WrapperInfo wrapperInfo = operation.getWrapper();
-        ElementInfo element = input ? wrapperInfo.getInputWrapperElement() : wrapperInfo.getOutputWrapperElement();
-        // Class<?> wrapperClass = input ? wrapperInfo.getInputWrapperClass() : wrapperInfo.getOutputWrapperClass();
-        OMElement wrapper = AxiomHelper.createOMElement(factory, element.getQName());
-        return wrapper;
-    }
-
-    public void setChildren(OMElement 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]);
-        }
-
-    }
-
-    public void setChild(OMElement wrapper, int i, ElementInfo childElement, Object value) {
-        if (childElement.isMany()) {
-            Object[] elements = (Object[])value;
-            if (value != null) {
-                for (Object e : elements) {
-                    addChild(wrapper, childElement, (OMElement)e);
-                }
-            }
-        } else {
-            OMElement element = (OMElement)value;
-            addChild(wrapper, childElement, element);
-        }
-    }
-
-    private void addChild(OMElement wrapper, ElementInfo childElement, OMElement element) {
-        if (element == null) {
-            OMElement e = wrapper.getOMFactory().createOMElement(childElement.getQName(), wrapper);
-            attachXSINil(e);
-            return;
-        }
-        QName elementName = childElement.getQName();
-        // Make it a bit tolerating of element QName 
-        if (!elementName.equals(element.getQName())) {
-            OMNamespace namespace = factory.createOMNamespace(elementName.getNamespaceURI(), elementName.getPrefix());
-            element.setNamespace(namespace);
-            element.setLocalName(childElement.getQName().getLocalPart());
-        }
-        wrapper.addChild(element);
-    }
-
-    public List getChildren(OMElement wrapper, Operation operation, boolean input) {
-        List<ElementInfo> childElements = input? operation.getWrapper().getInputChildElements():
-            operation.getWrapper().getOutputChildElements();
-
-        List<Object> elements = new ArrayList<Object>();
-        int i = 0;
-        for (ElementInfo e : childElements) {
-            elements.add(getChild(wrapper, e, i));
-            i++;
-        }
-        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();
-        DataType<XMLType> wrapperType =
-            new DataTypeImpl<XMLType>(AxiomDataBinding.NAME, OMElement.class, new XMLType(element));
-        return wrapperType;
-    }
-
-    public boolean isInstance(Object wrapperObj, Operation operation, boolean input) {
-        WrapperInfo wrapperInfo = operation.getWrapper();
-        ElementInfo element = input ? wrapperInfo.getInputWrapperElement() : wrapperInfo.getOutputWrapperElement();
-        //        List<ElementInfo> childElements =
-        //            input ? wrapperInfo.getInputChildElements() : wrapperInfo.getOutputChildElements();
-        OMElement wrapper = (OMElement)wrapperObj;
-        if (!element.getQName().equals(wrapper.getQName())) {
-            return false;
-        }
-        return true;
-        /*
-        Set<QName> names = new HashSet<QName>();
-        for (ElementInfo e : childElements) {
-            names.add(e.getQName());
-        }
-        for (Iterator i = wrapper.getChildElements(); i.hasNext();) {
-            OMElement child = (OMElement)i.next();
-            if (!names.contains(child.getQName())) {
-                return false;
-            }
-        }
-        return true;
-        */
-    }
-
-    private static final QName XSI_TYPE_QNAME = new QName("http://www.w3.org/2001/XMLSchema-instance", "type", "xsi");
-
-    private List<List<OMElement>> getElements(OMElement wrapper) {
-        List<List<OMElement>> elements = new ArrayList<List<OMElement>>();
-        List<OMElement> current = new ArrayList<OMElement>();
-        elements.add(current);
-        boolean first = true;
-        QName last = null;
-
-        for (Iterator i = wrapper.getChildElements(); i.hasNext();) {
-            OMElement element = (OMElement)i.next();
-            if (first || element.getQName().equals(last)) {
-                current.add(element);
-                last = element.getQName();
-            } else {
-                current = new ArrayList<OMElement>();
-                elements.add(current);
-                current.add(element);
-                last = element.getQName();
-            }
-            first = false;
-        }
-        return elements;
-    }
-
-    public Object getChild(OMElement wrapper, ElementInfo childElement, int index) {
-        Iterator children = wrapper.getChildrenWithName(childElement.getQName());
-        if (!children.hasNext()) {
-            // No name match, try by index
-            List<List<OMElement>> list = getElements(wrapper);
-            List<OMElement> elements = list.get(index);
-            if (!childElement.isMany()) {
-                return elements.isEmpty() ? null : attachXSIType(childElement, elements.get(0));
-            } else {
-                Object[] array = elements.toArray();
-                for (Object item : array) {
-                    attachXSIType(childElement, (OMElement)item);
-                }
-                return array;
-            }
-        }
-        if (!childElement.isMany()) {
-            if (children.hasNext()) {
-                OMElement child = (OMElement)children.next();
-                attachXSIType(childElement, child);
-                return child;
-            } else {
-                return null;
-            }
-        } else {
-            List<OMElement> elements = new ArrayList<OMElement>();
-            for (; children.hasNext();) {
-                OMElement child = (OMElement)children.next();
-                attachXSIType(childElement, child);
-                elements.add(child);
-            }
-            return elements.toArray();
-        }
-    }
-
-    /**
-     * Create xis:type if required 
-     * @param childElement
-     * @param element
-     * @return
-     */
-    private OMElement attachXSIType(ElementInfo childElement, OMElement element) {
-        TypeInfo type = childElement.getType();
-        if (type != null && type.getQName() != null) {
-            OMAttribute attr = element.getAttribute(XSI_TYPE_QNAME);
-            if (attr == null) {
-                String typeNS = type.getQName().getNamespaceURI();
-                if (XMLConstants.W3C_XML_SCHEMA_NS_URI.equals(typeNS)) {
-                    return element;
-                }
-                OMNamespace ns = element.getOMFactory().createOMNamespace(typeNS, "_typens_");
-                element.declareNamespace(ns);
-                OMNamespace xsiNS =
-                    element.getOMFactory().createOMNamespace(XSI_TYPE_QNAME.getNamespaceURI(),
-                                                             XSI_TYPE_QNAME.getPrefix());
-                element.declareNamespace(xsiNS);
-                attr =
-                    element.getOMFactory().createOMAttribute("type",
-                                                             xsiNS,
-                                                             "_typens_:" + type.getQName().getLocalPart());
-                element.addAttribute(attr);
-            }
-        }
-        return element;
-    }
-
-    private void attachXSINil(OMElement element) {
-        OMNamespace xsiNS =
-            element.getOMFactory().createOMNamespace(XSI_TYPE_QNAME.getNamespaceURI(), XSI_TYPE_QNAME.getPrefix());
-        element.declareNamespace(xsiNS);
-        OMAttribute attr = element.getOMFactory().createOMAttribute("nil", xsiNS, "true");
-        element.addAttribute(attr);
-    }
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java b/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java
deleted file mode 100644
index 88d6b462c1..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.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.axiom;
-
-import javax.xml.namespace.QName;
-
-import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMAttribute;
-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.databinding.impl.Java2SimpleTypeTransformer;
-
-/**
- * Transformer to convert data from an simple OMElement to Java Object
- *
- * @version $Rev$ $Date$
- */
-public class Object2OMElement extends Java2SimpleTypeTransformer<OMElement> {
-
-    private OMFactory factory;
-
-    public Object2OMElement() {
-        super();
-        factory = OMAbstractFactory.getOMFactory();
-    }
-
-    @Override
-    protected OMElement createElement(QName element, String text, TransformationContext context) {
-        OMElement omElement = AxiomHelper.createOMElement(factory, element);
-        if (text == null) {
-            OMNamespace xsi = factory.createOMNamespace("http://www.w3.org/2001/XMLSchema-instance", "xsi");
-            OMAttribute nil = factory.createOMAttribute("nil", xsi, "true");
-            omElement.addAttribute(nil);
-        } else {
-            factory.createOMText(omElement, text);
-        }
-        return omElement;
-    }
-
-    @Override
-    public Class getTargetType() {
-        return OMElement.class;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java b/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java
deleted file mode 100644
index 4881eef105..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.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.axiom;
-
-import java.io.ByteArrayInputStream;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-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.BaseTransformer;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class String2OMElement extends BaseTransformer<String, OMElement> implements
-    PullTransformer<String, OMElement> {
-
-    @SuppressWarnings("unchecked")
-    public OMElement transform(String source, TransformationContext context) {
-        try {
-            StAXOMBuilder builder = new StAXOMBuilder(new ByteArrayInputStream(source.getBytes()));
-            OMElement element = builder.getDocumentElement();
-            AxiomHelper.adjustElementName(context, element);
-            return element;
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<OMElement> getTargetType() {
-        return OMElement.class;
-    }
-
-    @Override
-    protected Class<String> getSourceType() {
-        return String.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 40;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java b/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java
deleted file mode 100644
index 173a9ab384..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.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 org.apache.tuscany.sca.databinding.axiom;
-
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-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.BaseTransformer;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class XMLStreamReader2OMElement extends BaseTransformer<XMLStreamReader, OMElement> implements
-    PullTransformer<XMLStreamReader, OMElement> {
-
-    public XMLStreamReader2OMElement() {
-        super();
-    }
-
-    public OMElement transform(XMLStreamReader source, TransformationContext context) {
-        if (source == null) {
-            return null;
-        }
-        try {
-            StAXOMBuilder builder = new StAXOMBuilder(source);
-            OMElement element = builder.getDocumentElement();
-            AxiomHelper.adjustElementName(context, element);
-            return element;
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<OMElement> getTargetType() {
-        return OMElement.class;
-    }
-
-    @Override
-    protected Class<XMLStreamReader> getSourceType() {
-        return XMLStreamReader.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 10;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
deleted file mode 100644
index f2b874e0e8..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ /dev/null
@@ -1,21 +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.axiom.AxiomDataBinding;name=org.apache.axiom.om.OMElement
-
-

diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
deleted file mode 100644
index 70318b3930..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ /dev/null
@@ -1,31 +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.axiom.CallableReference2OMElement;source=org.oasisopen.sca.CallableReference,target=org.apache.axiom.om.OMElement,weight=10

-# org.apache.tuscany.sca.databinding.axiom.OMElement2CallableReference;source=org.apache.axiom.om.OMElement,target=org.oasisopen.sca.CallableReference,weight=10

-org.apache.tuscany.sca.databinding.axiom.Externalizable2OMElement;source=java.io.Externalizable,target=org.apache.axiom.om.OMElement,weight=10

-org.apache.tuscany.sca.databinding.axiom.OMElement2Externalizable;source=org.apache.axiom.om.OMElement,target=java.io.Externalizable,weight=10

-org.apache.tuscany.sca.databinding.axiom.Exception2OMElement;source=java:exception,target=org.apache.axiom.om.OMElement,weight=10

-org.apache.tuscany.sca.databinding.axiom.OMElement2Exception;source=org.apache.axiom.om.OMElement,target=java:exception,weight=10

-# org.apache.tuscany.sca.databinding.axiom.Object2OMElement;source=java:simpleType,target=org.apache.axiom.om.OMElement,weight=80000

-# org.apache.tuscany.sca.databinding.axiom.OMElement2Object;source=org.apache.axiom.om.OMElement,target=java:simpleType,weight=80000

-org.apache.tuscany.sca.databinding.axiom.OMElement2String;source=org.apache.axiom.om.OMElement,target=java.lang.String,weight=80

-org.apache.tuscany.sca.databinding.axiom.OMElement2XMLStreamReader;source=org.apache.axiom.om.OMElement,target=javax.xml.stream.XMLStreamReader,weight=60

-org.apache.tuscany.sca.databinding.axiom.String2OMElement;source=java.lang.String,target=org.apache.axiom.om.OMElement,weight=80

-org.apache.tuscany.sca.databinding.axiom.XMLStreamReader2OMElement;source=javax.xml.stream.XMLStreamReader,target=org.apache.axiom.om.OMElement,weight=60

-