Moving 1.x branches

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

17 files changed, 0 insertions, 1304 deletions

diff --git a/branches/sca-java-0.99/modules/databinding-saxon/LICENSE.txt b/branches/sca-java-0.99/modules/databinding-saxon/LICENSE.txt
deleted file mode 100644
index d645695673..0000000000
--- a/branches/sca-java-0.99/modules/databinding-saxon/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
diff --git a/branches/sca-java-0.99/modules/databinding-saxon/NOTICE.txt b/branches/sca-java-0.99/modules/databinding-saxon/NOTICE.txt
deleted file mode 100644
index d83ebbe236..0000000000
--- a/branches/sca-java-0.99/modules/databinding-saxon/NOTICE.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2006 The Apache Software Foundation
-
-Apache Tuscany is an effort undergoing incubation at The Apache Software
-Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is
-required of all newly accepted projects until a further review indicates that
-the infrastructure, communications, and decision making process have stabilized
-in a manner consistent with other successful ASF projects. While incubation
-status is not necessarily a reflection of the completeness or stability of the
-code, it does indicate that the project has yet to be fully endorsed by the ASF.
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/branches/sca-java-0.99/modules/databinding-saxon/mvn-install-saxon.sh b/branches/sca-java-0.99/modules/databinding-saxon/mvn-install-saxon.sh
deleted file mode 100755
index 523b0c58be..0000000000
--- a/branches/sca-java-0.99/modules/databinding-saxon/mvn-install-saxon.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-#  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.
-
-# Download Saxon B 8.9, unzip, and install into local Maven repos
-
-cd /tmp
-wget http://prdownloads.sourceforge.net/saxon/saxonb8-9j.zip
-
-unzip saxonb8-9j.zip
-
-mvn install:install-file -DgroupId=net.sf.saxon -DartifactId=saxon -Dversion=8.9 -Dpackaging=jar -Dfile=/tmp/saxon8.jar
-mvn install:install-file -DgroupId=net.sf.saxon -DartifactId=saxon-dom -Dversion=8.9 -Dpackaging=jar -Dfile=/tmp/saxon8-dom.jar
-
-#mvn install:install-file -DgroupId=net.sf.saxon -DartifactId=saxon-ant -Dversion=8.9 -Dpackaging=jar -Dfile=/tmp/saxon8-ant.jar
-#mvn install:install-file -DgroupId=net.sf.saxon -DartifactId=saxon-dom4j -Dversion=8.9 -Dpackaging=jar -Dfile=/tmp/saxon8-dom4j.jar
-#mvn install:install-file -DgroupId=net.sf.saxon -DartifactId=saxon-jdom -Dversion=8.9 -Dpackaging=jar -Dfile=/tmp/saxon8-jdom.jar
-#mvn install:install-file -DgroupId=net.sf.saxon -DartifactId=saxon-sql -Dversion=8.9 -Dpackaging=jar -Dfile=/tmp/saxon8-sql.jar
-#mvn install:install-file -DgroupId=net.sf.saxon -DartifactId=saxon-xom -Dversion=8.9 -Dpackaging=jar -Dfile=/tmp/saxon8-xom.jar
-#mvn install:install-file -DgroupId=net.sf.saxon -DartifactId=saxon-xpath -Dversion=8.9 -Dpackaging=jar -Dfile=/tmp/saxon8-xpath.jar
-#mvn install:install-file -DgroupId=net.sf.saxon -DartifactId=saxon-xqj -Dversion=8.9 -Dpackaging=jar -Dfile=/tmp/saxon8-xqj.jar
-
diff --git a/branches/sca-java-0.99/modules/databinding-saxon/pom.xml b/branches/sca-java-0.99/modules/databinding-saxon/pom.xml
deleted file mode 100644
index 655ab48b6d..0000000000
--- a/branches/sca-java-0.99/modules/databinding-saxon/pom.xml
+++ /dev/null
@@ -1,77 +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.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>0.99-incubating-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-databinding-saxon</artifactId>
-    <name>Apache Tuscany Data Binding for Saxon</name>
-    <description>Tuscany Saxon Data Binding</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>0.99-incubating-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding</artifactId>
-            <version>0.99-incubating-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>net.sf.saxon</groupId>
-            <artifactId>saxon</artifactId>
-            <version>8.9</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>net.sf.saxon</groupId>
-            <artifactId>saxon-dom</artifactId>
-            <version>8.9</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-lib</artifactId>
-            <version>1.0-incubating</version>
-        </dependency>                    
-
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-impl</artifactId>
-            <version>1.0-incubating</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.1</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java b/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java
deleted file mode 100644
index 06f07790f5..0000000000
--- a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java
+++ /dev/null
@@ -1,119 +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.saxon;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.TransformerFactoryConfigurationError;
-import javax.xml.transform.dom.DOMResult;
-import javax.xml.transform.stream.StreamSource;
-
-import net.sf.saxon.om.NodeInfo;
-
-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.XMLHelper;
-import commonj.sdo.impl.HelperProvider;
-
-/**
- * Transforms SDO DataObject-s to NodeInfo objects needed by Saxon parser
- * @version $Rev$ $Date$
- * For root element when serializing the DataObject the name of its 
- * implemented interface is used with its first letter made lowercase.
- * Also any namespaces that are defined are deleted, because otherwise
- * the SaxonB parser does not work
- */
-public class DataObject2NodeInfoTransformer extends
-		BaseTransformer<DataObject, NodeInfo> implements
-		PullTransformer<DataObject, NodeInfo> {
-	
-	private Node2NodeInfoTransformer node2NodeInfoTransformer;
-	
-	public DataObject2NodeInfoTransformer(Node2NodeInfoTransformer node2NodeInfoTransformer) {
-		this.node2NodeInfoTransformer = node2NodeInfoTransformer;
-	}
-
-	public NodeInfo transform(DataObject source, TransformationContext context) {
-		XMLHelper helper = HelperProvider.INSTANCE.xmlHelper();
-		String name = null;
-		if(source.getClass().getInterfaces().length > 0) {
-			name = source.getClass().getInterfaces()[0].getSimpleName();
-		} else {
-			name = source.getClass().getName();
-		}
-		
-		if(name.length() > 0) {
-			name = Character.toLowerCase(name.charAt(0)) + name.substring(1, name.length());
-		}
-		
-		DOMResult domResult = new DOMResult();
-		
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		try {
-			helper.save(source, null, name, baos);
-			baos.flush();
-			baos.close();
-		} catch (IOException e) {
-			throw new TransformationException(e);
-		}
-		
-		ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-		Source src = new StreamSource(bais);
-		
-		try {
-			Transformer transformer = TransformerFactory.newInstance().newTransformer();
-			transformer.transform(src, domResult);
-		} catch (TransformerConfigurationException e) {
-			throw new TransformationException(e);
-		} catch (TransformerFactoryConfigurationError e) {
-			throw new TransformationException(e);
-		} catch (TransformerException e) {
-			throw new TransformationException(e);
-		}
-		
-		return node2NodeInfoTransformer.transform(domResult.getNode(), context);
-	}
-
-	@Override
-	protected Class getSourceType() {
-		return DataObject.class;
-	}
-
-	@Override
-	protected Class getTargetType() {
-		return NodeInfo.class;
-	}
-
-	@Override
-	public int getWeight() {
-		return 10;
-	}
-
-}
diff --git a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java b/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java
deleted file mode 100644
index 0de9d67ccf..0000000000
--- a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.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.saxon;
-
-import javax.xml.transform.dom.DOMSource;
-
-import net.sf.saxon.Configuration;
-import net.sf.saxon.om.DocumentInfo;
-import net.sf.saxon.om.NodeInfo;
-import net.sf.saxon.trans.XPathException;
-
-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.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-/**
- * Transforms DOM Node-s to NodeInfo objects needed by Saxon parser
- * @version $Rev$ $Date$
- * Any namespaces that are defined are deleted, because otherwise
- * the SaxonB parser does not work
- */
-public class Node2NodeInfoTransformer extends BaseTransformer<Node, NodeInfo>
-		implements PullTransformer<Node, NodeInfo> {
-
-	public NodeInfo transform(Node source, TransformationContext context) {
-		if(source instanceof Document) {
-			Configuration configuration = SaxonDataBindingHelper.CURR_EXECUTING_CONFIG;
-			if(configuration == null) {
-				configuration = new Configuration();
-			}
-			Document doc = (Document)source;
-			Document cloneDoc = (Document)doc.cloneNode(false);
-			SaxonDataBindingHelper.setNamespacesAndPrefixesReq(doc, cloneDoc, cloneDoc, "", null);
-			DocumentInfo docInfo = null;
-			try {
-				docInfo = configuration.buildDocument(new DOMSource(cloneDoc));
-			} catch (XPathException e) {
-				throw new TransformationException(e);
-			}
-			return docInfo;
-		}
-		return null;
-	}
-
-	@Override
-	protected Class getSourceType() {
-		return Node.class;
-	}
-
-	@Override
-	protected Class getTargetType() {
-		return NodeInfo.class;
-	}
-
-	@Override
-	public int getWeight() {
-		return 10;
-	}
-
-}
diff --git a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2DataObjectTransformer.java b/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2DataObjectTransformer.java
deleted file mode 100644
index 520cc1d79d..0000000000
--- a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2DataObjectTransformer.java
+++ /dev/null
@@ -1,149 +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.saxon;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.TransformerFactoryConfigurationError;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import net.sf.saxon.om.NodeInfo;
-
-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.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-import org.apache.tuscany.sdo.helper.TypeHelperImpl;
-import org.apache.tuscany.sdo.impl.FactoryBase;
-import org.w3c.dom.Document;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.Type;
-import commonj.sdo.helper.XMLHelper;
-import commonj.sdo.impl.HelperProvider;
-
-/**
- * Transforms NodeInfo objects to SDO DataObject-s
- * @version $Rev$ $Date$
- * Before constructing the data object, resulting XML is populated
- * with correct namespaces (which are taken from the logical target data type)
- * These namespaces are crucial for constructing the right instance of
- * the DataObject (i.e. if there is a SDO factory, an instance from this factory will
- * be used, not the generic any data object)
- */
-public class NodeInfo2DataObjectTransformer extends
-		BaseTransformer<NodeInfo, DataObject> implements
-		PullTransformer<NodeInfo, DataObject> {
-	
-	private NodeInfo2NodeTransformer nodeInfo2NodeTransformer;
-	public NodeInfo2DataObjectTransformer(NodeInfo2NodeTransformer nodeInfo2NodeTransformer) {
-		this.nodeInfo2NodeTransformer = nodeInfo2NodeTransformer;
-	}
-
-	@Override
-	protected Class getSourceType() {
-		return NodeInfo.class;
-	}
-
-	@Override
-	protected Class getTargetType() {
-		return DataObject.class;
-	}
-
-	@Override
-	public int getWeight() {
-		return 10 + nodeInfo2NodeTransformer.getWeight();
-	}
-
-	public DataObject transform(NodeInfo source, TransformationContext context) {
-		Document doc = (Document)nodeInfo2NodeTransformer.transform(source, context);
-		
-		Document cloneDoc = cloneDocumentWithRightNamespaces(doc, context);
-
-		return produceResult(cloneDoc);
-	}
-	
-	private Document cloneDocumentWithRightNamespaces(Document doc, TransformationContext context) {
-		
-		DataType targetDataType = context.getTargetDataType();
-		String namespace = null;
-		Object logical = targetDataType.getLogical();
-		if(logical instanceof XMLType) {
-			namespace = ((XMLType)logical).getTypeName().getNamespaceURI();
-		} else {
-			Type type = HelperProvider.INSTANCE.typeHelper().getType(targetDataType.getClass());
-			
-			if(type == null) {
-				return doc;
-			}
-			namespace = type.getURI();
-		}
-		
-		if(namespace == null) {
-			return doc;
-		}
-		
-		FactoryBase factory = (FactoryBase)((TypeHelperImpl)HelperProvider.INSTANCE.typeHelper()).getExtendedMetaData().getPackage(namespace);
-		if(factory == null) {
-			return doc;
-		}
-		String prefix = factory.getNsPrefix();
-		
-		Document cloneDoc = (Document)doc.cloneNode(false);
-		
-		SaxonDataBindingHelper.setNamespacesAndPrefixesReq(doc, cloneDoc, cloneDoc, namespace, prefix);
-		
-		return cloneDoc;
-	}
-
-	private DataObject produceResult(Document doc) {
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		StreamResult streamResult = new StreamResult(baos);
-		try {
-			Transformer transformer = TransformerFactory.newInstance().newTransformer();
-			transformer.transform(new DOMSource(doc), streamResult);
-		} catch (TransformerConfigurationException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (TransformerFactoryConfigurationError e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (TransformerException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		try {
-			baos.flush();
-			baos.close();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		DataObject resultingObject = XMLHelper.INSTANCE.load(new String(baos.toByteArray())).getRootObject();
-		
-		return resultingObject;
-	}
-}
diff --git a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java b/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java
deleted file mode 100644
index 743848c61e..0000000000
--- a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.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.saxon;
-
-import java.util.Properties;
-
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.dom.DOMResult;
-
-import net.sf.saxon.om.NodeInfo;
-import net.sf.saxon.query.QueryResult;
-
-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.w3c.dom.Node;
-
-/**
- * Transforms NodeInfo objects to SDO DataObject-s
- * @version $Rev$ $Date$
- */
-public class NodeInfo2NodeTransformer extends BaseTransformer<NodeInfo, Node> implements
-	PullTransformer<NodeInfo, Node> {
-
-	public Node transform(NodeInfo source, TransformationContext context) {
-		DOMResult destination = new DOMResult();
-		try {
-	        Properties props = new Properties();
-	        props.setProperty(OutputKeys.METHOD, "xml");
-	        props.setProperty(OutputKeys.INDENT, "yes");
-			QueryResult.serialize(source, destination, props);
-		} catch (Exception e) {
-			throw new TransformationException(e);
-		}
-		return destination.getNode();
-	}
-
-	@Override
-	protected Class getSourceType() {
-		return NodeInfo.class;
-	}
-
-	@Override
-	protected Class getTargetType() {
-		return Node.class;
-	}
-
-	@Override
-	public int getWeight() {
-		return 10;
-	}
-
-}
diff --git a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java b/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java
deleted file mode 100644
index 76f30b188b..0000000000
--- a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java
+++ /dev/null
@@ -1,54 +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.saxon;
-
-import net.sf.saxon.value.ObjectValue;
-import net.sf.saxon.value.Value;
-
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-
-/**
- * Transforms generic java objects to Value objects needed by Saxon parser
- * @version $Rev$ $Date$
- */
-public class Object2ValueTransformer extends BaseTransformer<Object, Value>
-		implements PullTransformer<Object, Value> {
-	
-	@Override
-	protected Class getSourceType() {
-		return Object.class;
-	}
-
-	@Override
-	protected Class getTargetType() {
-		return Value.class;
-	}
-
-	@Override
-	public int getWeight() {
-		return 10000;
-	}
-
-	public Value transform(Object source, TransformationContext context) {
-		return new ObjectValue(source);
-	}
-
-}
diff --git a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonDataBindingHelper.java b/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonDataBindingHelper.java
deleted file mode 100644
index eac40c9b99..0000000000
--- a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonDataBindingHelper.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.saxon;
-
-import net.sf.saxon.Configuration;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.CharacterData;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.ProcessingInstruction;
-
-/**
- * Provides helper functionality for saxon data bindings
- * @version $Rev$ $Date$
- */
-public class SaxonDataBindingHelper {
-	/**
-	 * This variable is meaningfull only in the context of XQoery expression
-	 * execution. It is used by the DataObject2NodeInfoTransformer and
-	 * Node2NodeInfoTransformer to create the correct NodeInfo objects
-	 * in the Output2Output transformations. 
-	 * For Input2Input transformations it is meaningless:
-	 *    - if it is null - it is ignored by the transformers as they create new
-	 *      configuration objects
-	 *    - if it is not null - it is reused
-	 * However the XQueryInvoker transforms all NodeInfo-s to NodeInfo-s with
-	 * its current configuration, so there is no effect for Input2Input transformations
-	 */
-	public static Configuration CURR_EXECUTING_CONFIG = null;
-	
-	/**
-	 * Converts a given document to a document with specific namespace and prefix
-	 */
-	public static void setNamespacesAndPrefixesReq(Node node, Node copyNode, Document copyOwnerDocument, String namespace, String prefix) {
-		NodeList childNodes = node.getChildNodes();
-		for(int i=0; i<childNodes.getLength(); i++) {
-			Node childNode = childNodes.item(i);
-			Node clonning = null;
-			if(childNode.getNodeType() == Node.ELEMENT_NODE || childNode.getNodeType() == Node.ATTRIBUTE_NODE) {
-				if(childNode.getNodeType() == Node.ELEMENT_NODE) {
-					clonning = copyOwnerDocument.createElementNS(namespace, childNode.getLocalName());
-					NamedNodeMap attributes = ((Element)childNode).getAttributes();
-					for(int j=0; j<attributes.getLength(); j++) {
-						Attr attribute = (Attr)attributes.item(j);
-						Attr cloneAttribute = copyOwnerDocument.createAttributeNS(namespace, attribute.getLocalName());
-						cloneAttribute.setValue(attribute.getValue());
-						((Element)clonning).setAttributeNode(cloneAttribute);
-						cloneAttribute.setPrefix(prefix);
-					}
-				} else {
-					clonning = copyOwnerDocument.createAttributeNS(namespace, childNode.getLocalName());
-				}
-				//clonning.setTextContent(childNode.getTextContent());
-				clonning.setNodeValue(childNode.getNodeValue());
-				clonning.setPrefix(prefix);
-			} else if(!(copyNode instanceof Document)) {
-				if(childNode.getNodeType() == Node.CDATA_SECTION_NODE) {
-					clonning = copyOwnerDocument.createCDATASection(((CharacterData)childNode).getData());
-				} else if(childNode.getNodeType() == Node.COMMENT_NODE) {
-					clonning = copyOwnerDocument.createComment(((CharacterData)childNode).getData());
-				} else if(childNode.getNodeType() == Node.TEXT_NODE) {
-					clonning = copyOwnerDocument.createTextNode(((CharacterData)childNode).getData());
-				} else if(childNode.getNodeType() == Node.ENTITY_REFERENCE_NODE) {
-					clonning = copyOwnerDocument.createEntityReference(childNode.getNodeName());
-				} else if(childNode.getNodeType() == Node.PROCESSING_INSTRUCTION_NODE) {
-					clonning = copyOwnerDocument.createProcessingInstruction(((ProcessingInstruction)childNode).getTarget(), ((ProcessingInstruction)childNode).getData());
-				}
-			}
-			if(clonning!=null) {
-				copyNode.appendChild(clonning);
-			}
-			setNamespacesAndPrefixesReq(childNode, clonning, copyOwnerDocument, namespace, prefix);
-		}
-	}
-}
diff --git a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java b/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java
deleted file mode 100644
index 97c7530241..0000000000
--- a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java
+++ /dev/null
@@ -1,54 +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.saxon;
-
-
-import java.lang.annotation.Annotation;
-
-import net.sf.saxon.om.NodeInfo;
-
-import org.apache.tuscany.sca.databinding.impl.BaseDataBinding;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-
-/**
- * Represents data binding for parameters of type NodeInfo
- * @version $Rev$ $Date$
- * The NodeInfo type is the type accepted by the Saxon XQuery processor for
- * all XML - based content (i.e. not strings and simple types)
- */
-public class SaxonNodeDataBinding extends BaseDataBinding {
-
-    public static final String NAME = NodeInfo.class.getName();
-    public static final String[] ALIASES = new String[] {"saxon_node"};
-    
-    public SaxonNodeDataBinding() {
-    	super(NAME, NodeInfo.class);
-    }
-    
-    @Override
-    public boolean introspect(DataType type, Annotation[] annotations) {
-        if (super.introspect(type, annotations)) {
-            type.setLogical(XMLType.UNKNOWN);
-            return true;
-        } else {
-            return false;
-        }
-    }
-}
diff --git a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java b/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java
deleted file mode 100644
index 106979cf4f..0000000000
--- a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java
+++ /dev/null
@@ -1,52 +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.saxon;
-
-import java.lang.annotation.Annotation;
-
-import net.sf.saxon.value.Value;
-
-import org.apache.tuscany.sca.databinding.impl.BaseDataBinding;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-
-/**
- * Represents data binding for parameters of type Value
- * @version $Rev$ $Date$
- * The Value type is the type accepted by the Saxon XQuery processor for
- * all simple types and strings
- */
-public class SaxonValueDataBinding extends BaseDataBinding {
-	public static final String NAME = Value.class.getName();
-    public static final String[] ALIASES = new String[] {"saxon_value"};
-    
-    public SaxonValueDataBinding() {
-    	super(NAME, Value.class);
-    }
-    
-    @Override
-    public boolean introspect(DataType type, Annotation[] annotations) {
-        if (super.introspect(type, annotations)) {
-            type.setLogical(XMLType.UNKNOWN);
-            return true;
-        } else {
-            return false;
-        }
-    }
-}
diff --git a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java b/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java
deleted file mode 100644
index e8af18a566..0000000000
--- a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java
+++ /dev/null
@@ -1,88 +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.saxon;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-import net.sf.saxon.value.DecimalValue;
-import net.sf.saxon.value.DoubleValue;
-import net.sf.saxon.value.FloatValue;
-import net.sf.saxon.value.IntegerValue;
-import net.sf.saxon.value.ObjectValue;
-import net.sf.saxon.value.StringValue;
-import net.sf.saxon.value.Value;
-
-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.javabeans.SimpleJavaDataBinding;
-
-/**
- * Transforms simple types and strings to Value objects needed by Saxon parser
- * @version $Rev$ $Date$
- */
-public class SimpleType2ValueTransformer extends BaseTransformer<Object, Value>
-		implements PullTransformer<Object, Value> {
-	
-	@Override
-	public String getSourceDataBinding() {
-		return SimpleJavaDataBinding.NAME;
-	}
-	
-	@Override
-	protected Class getSourceType() {
-		return Object.class;
-	}
-
-	@Override
-	protected Class getTargetType() {
-		return Value.class;
-	}
-
-	@Override
-	public int getWeight() {
-		return 10000;
-	}
-
-	public Value transform(Object source, TransformationContext context) {
-		Value result = null;
-		if(source instanceof Integer) {
-			result = IntegerValue.makeIntegerValue(BigInteger.valueOf(((Integer)source)));
-		} else if(source instanceof Long) {
-			result = IntegerValue.makeIntegerValue(BigInteger.valueOf(((Long)source)));
-		} else if(source instanceof Short) {
-			result = IntegerValue.makeIntegerValue(BigInteger.valueOf(((Short)source)));
-		} else if(source instanceof Byte) {
-			result = IntegerValue.makeIntegerValue(BigInteger.valueOf(((Byte)source)));
-		} else if(source instanceof Double) {
-			result = new DoubleValue((Double)source);
-		} else if(source instanceof Float) {
-			result = new FloatValue((Float)source);
-		} else if(source instanceof BigDecimal) {
-			result = new DecimalValue((BigDecimal)source);
-		} else if(source instanceof String) {
-			result = new StringValue(((String)source));
-		} else {
-			result = new ObjectValue(source);
-		}
-		
-		return result;
-	}
-}
diff --git a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java b/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java
deleted file mode 100644
index 8d9127a692..0000000000
--- a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.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.saxon;
-
-import net.sf.saxon.trans.XPathException;
-import net.sf.saxon.value.Value;
-
-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;
-
-/**
- * Transforms Value objects to generic java objects
- * @version $Rev$ $Date$
- */
-public class Value2ObjectTransformer extends BaseTransformer<Value, Object>
-		implements PullTransformer<Value, Object> {
-
-	public Object transform(Value source, TransformationContext context) {
-		Object object;
-		try {
-			object = Value.convert(source.asItem());
-		} catch (XPathException e) {
-			throw new TransformationException(e);
-		}
-		return object;
-	}
-
-	@Override
-	protected Class getSourceType() {
-		return Value.class;
-	}
-
-	@Override
-	protected Class getTargetType() {
-		return Object.class;
-	}
-
-	@Override
-	public int getWeight() {
-		return 10000;
-	}
-
-}
diff --git a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java b/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java
deleted file mode 100644
index 7d69e7f31a..0000000000
--- a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.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.saxon;
-
-import net.sf.saxon.trans.XPathException;
-import net.sf.saxon.value.Value;
-
-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.javabeans.SimpleJavaDataBinding;
-
-/**
- * Transforms Value objects to simple types
- * @version $Rev$ $Date$
- */
-public class Value2SimpleTypeTransformer extends BaseTransformer<Value, Object>
-		implements PullTransformer<Value, Object> {
-	public Object transform(Value source, TransformationContext context) {
-		Object object;
-		try {
-			object = Value.convert(source.asItem());
-		} catch (XPathException e) {
-			throw new TransformationException(e);
-		}
-		return object;
-	}
-	
-	@Override
-	public String getTargetDataBinding() {
-		return SimpleJavaDataBinding.NAME;
-	}
-
-	@Override
-	protected Class getSourceType() {
-		return Value.class;
-	}
-
-	@Override
-	protected Class getTargetType() {
-		return Object.class;
-	}
-
-	@Override
-	public int getWeight() {
-		return 10000;
-	}
-}
diff --git a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/module/SaxonDataBindingModuleActivator.java b/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/module/SaxonDataBindingModuleActivator.java
deleted file mode 100644
index ac7bdd6a17..0000000000
--- a/branches/sca-java-0.99/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/module/SaxonDataBindingModuleActivator.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.saxon.module;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ModuleActivator;
-import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
-import org.apache.tuscany.sca.databinding.TransformerExtensionPoint;
-import org.apache.tuscany.sca.databinding.saxon.DataObject2NodeInfoTransformer;
-import org.apache.tuscany.sca.databinding.saxon.Node2NodeInfoTransformer;
-import org.apache.tuscany.sca.databinding.saxon.NodeInfo2DataObjectTransformer;
-import org.apache.tuscany.sca.databinding.saxon.NodeInfo2NodeTransformer;
-import org.apache.tuscany.sca.databinding.saxon.Object2ValueTransformer;
-import org.apache.tuscany.sca.databinding.saxon.SaxonNodeDataBinding;
-import org.apache.tuscany.sca.databinding.saxon.SaxonValueDataBinding;
-import org.apache.tuscany.sca.databinding.saxon.SimpleType2ValueTransformer;
-import org.apache.tuscany.sca.databinding.saxon.Value2ObjectTransformer;
-import org.apache.tuscany.sca.databinding.saxon.Value2SimpleTypeTransformer;
-
-/**
- * This class activates the value and node info data bindings as well as several transformers
- * @version $Rev$ $Date$
- */
-public class SaxonDataBindingModuleActivator implements ModuleActivator {
-
-	public Object[] getExtensionPoints() {
-		return null;
-	}
-
-	public void start(ExtensionPointRegistry registry) {
-        
-        DataBindingExtensionPoint dataBindings = registry.getExtensionPoint(DataBindingExtensionPoint.class);
-        dataBindings.addDataBinding(new SaxonNodeDataBinding());
-        dataBindings.addDataBinding(new SaxonValueDataBinding());
-        
-        TransformerExtensionPoint transformers = registry.getExtensionPoint(TransformerExtensionPoint.class);
-        Node2NodeInfoTransformer node2NodeInfoTransformer = new Node2NodeInfoTransformer();
-        transformers.addTransformer(node2NodeInfoTransformer);
-        NodeInfo2NodeTransformer nodeInfo2NodeTransformer = new NodeInfo2NodeTransformer();
-        transformers.addTransformer(nodeInfo2NodeTransformer);
-        transformers.addTransformer(new Object2ValueTransformer());
-        transformers.addTransformer(new Value2ObjectTransformer());
-        transformers.addTransformer(new SimpleType2ValueTransformer());
-        transformers.addTransformer(new Value2SimpleTypeTransformer());
-        transformers.addTransformer(new NodeInfo2DataObjectTransformer(nodeInfo2NodeTransformer));
-        transformers.addTransformer(new DataObject2NodeInfoTransformer(node2NodeInfoTransformer));
-	}
-
-	public void stop(ExtensionPointRegistry registry) {
-		// TODO Auto-generated method stub
-
-	}
-
-}
diff --git a/branches/sca-java-0.99/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/branches/sca-java-0.99/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
deleted file mode 100644
index a06e29e8a4..0000000000
--- a/branches/sca-java-0.99/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ /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.

-# Implementation class for the ExtensionActivator for Spring module

-org.apache.tuscany.sca.databinding.saxon.module.SaxonDataBindingModuleActivator
\ No newline at end of file