279 files changed, 0 insertions, 0 deletions

diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/LICENSE b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/LICENSE
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/LICENSE
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/META-INF/MANIFEST.MF
index 81274e19be..81274e19be 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/NOTICE b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/NOTICE
index d69e595698..d69e595698 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/NOTICE
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/NOTICE
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/pom.xml b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/pom.xml
index 9bd36e8e5b..9bd36e8e5b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java
index 014a0f5223..014a0f5223 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java
index cd820ab4b4..cd820ab4b4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Exception2OMElement.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Exception2OMElement.java
index f44297edb7..f44297edb7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Exception2OMElement.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Exception2OMElement.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.java
index cede1c4689..cede1c4689 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Exception.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Exception.java
index 947cd99a19..947cd99a19 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Exception.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Exception.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.java
index f4bbea81cc..f4bbea81cc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java
index ea40e61746..ea40e61746 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java
index 0fc2cfa8a3..0fc2cfa8a3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java
index 4c7be59466..4c7be59466 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java
index 0c657756a0..0c657756a0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java
index 88d6b462c1..88d6b462c1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java
index af315b3c11..af315b3c11 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java
index 173a9ab384..173a9ab384 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index f2b874e0e8..f2b874e0e8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index 70318b3930..70318b3930 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java
index 951a0483cb..951a0483cb 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandlerTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandlerTestCase.java
index 2270947c29..2270947c29 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandlerTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandlerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/src/test/resources/ipo.xml b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/src/test/resources/ipo.xml
index df901d183d..df901d183d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/src/test/resources/ipo.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/src/test/resources/ipo.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/src/test/resources/ipo.xsd b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/src/test/resources/ipo.xsd
index af1e73172d..af1e73172d 100755
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/src/test/resources/ipo.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/src/test/resources/ipo.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/src/test/resources/order.wsdl b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/src/test/resources/order.wsdl
index 913d9e4928..913d9e4928 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-axiom/src/test/resources/order.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-axiom/src/test/resources/order.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb-axiom/LICENSE b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb-axiom/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb-axiom/LICENSE
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb-axiom/LICENSE
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb-axiom/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb-axiom/META-INF/MANIFEST.MF
index 334906b75b..334906b75b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb-axiom/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb-axiom/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb-axiom/NOTICE b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb-axiom/NOTICE
index f6ce2542c3..f6ce2542c3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb-axiom/NOTICE
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb-axiom/NOTICE
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb-axiom/pom.xml b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb-axiom/pom.xml
index 5ca5339f25..5ca5339f25 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb-axiom/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb-axiom/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/AxiomHelper.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/AxiomHelper.java
index 93277e77bf..93277e77bf 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/AxiomHelper.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/AxiomHelper.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXB2OMElement.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXB2OMElement.java
index c90a1c6d5a..c90a1c6d5a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXB2OMElement.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXB2OMElement.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBDataSource.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBDataSource.java
index 0dacce996f..0dacce996f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBDataSource.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBDataSource.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java
index f7de7f4425..f7de7f4425 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBCustomBuilder.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBCustomBuilder.java
index f30a6c1cb8..f30a6c1cb8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBCustomBuilder.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBCustomBuilder.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDSContext.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDSContext.java
index f6bd33864f..f6bd33864f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDSContext.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDSContext.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDataSourceExt.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDataSourceExt.java
index 5a5afc13cb..5a5afc13cb 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDataSourceExt.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDataSourceExt.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/SourceDataSource.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/SourceDataSource.java
index 0a12654524..0a12654524 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/SourceDataSource.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/SourceDataSource.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/XMLStreamWriterWithOS.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/XMLStreamWriterWithOS.java
index 44e34c3647..44e34c3647 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/XMLStreamWriterWithOS.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/XMLStreamWriterWithOS.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/XMLStringDataSource.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/XMLStringDataSource.java
index e8e3193e24..e8e3193e24 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/XMLStringDataSource.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/XMLStringDataSource.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index d1799abaff..d1799abaff 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/JAXB2OMTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/JAXB2OMTestCase.java
index df2b6dc4e3..df2b6dc4e3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/JAXB2OMTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/JAXB2OMTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/OMElement2JAXBTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/OMElement2JAXBTestCase.java
index abfcf358d2..abfcf358d2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/OMElement2JAXBTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/OMElement2JAXBTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb-axiom/src/test/resources/ipo.xsd b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb-axiom/src/test/resources/ipo.xsd
index 241ec15d36..241ec15d36 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb-axiom/src/test/resources/ipo.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb-axiom/src/test/resources/ipo.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/LICENSE b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/LICENSE
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/LICENSE
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/META-INF/MANIFEST.MF
index b0fb20a6de..b0fb20a6de 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/NOTICE b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/NOTICE
index d69e595698..d69e595698 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/NOTICE
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/NOTICE
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/pom.xml b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/pom.xml
index 5854fb3d8f..5854fb3d8f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/AnyTypeXmlAdapter.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/AnyTypeXmlAdapter.java
index 57922e1c89..57922e1c89 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/AnyTypeXmlAdapter.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/AnyTypeXmlAdapter.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DOMElementXmlAdapter.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DOMElementXmlAdapter.java
index 91cb39b0f2..91cb39b0f2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DOMElementXmlAdapter.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DOMElementXmlAdapter.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DataConverter.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DataConverter.java
index 35adffe23b..35adffe23b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DataConverter.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DataConverter.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DefaultXMLAdapterExtensionPoint.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DefaultXMLAdapterExtensionPoint.java
index 062da48206..062da48206 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DefaultXMLAdapterExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DefaultXMLAdapterExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java
index 3d25af5b25..3d25af5b25 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2SAX.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2SAX.java
index a0b6ff8237..a0b6ff8237 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2SAX.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2SAX.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2String.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2String.java
index 7ecca3a042..7ecca3a042 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2String.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2String.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java
index 025b4f7c73..025b4f7c73 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java
index f369b491e7..f369b491e7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
index 9088066443..9088066443 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBPropertyDescriptor.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBPropertyDescriptor.java
index 217345caba..217345caba 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBPropertyDescriptor.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBPropertyDescriptor.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java
index 84529752de..84529752de 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperException.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperException.java
index 7473a8e56e..7473a8e56e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java
index a1f4c12c8f..a1f4c12c8f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHelper.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHelper.java
index 5f90aa4d7a..5f90aa4d7a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHelper.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHelper.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java
index 5070d0636c..5070d0636c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java
index b063d9524f..b063d9524f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/String2JAXB.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/String2JAXB.java
index 9d0accefcc..9d0accefcc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/String2JAXB.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/String2JAXB.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLAdapterExtensionPoint.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLAdapterExtensionPoint.java
index 5fa98b5ed1..5fa98b5ed1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLAdapterExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLAdapterExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLRootElementUtil.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLRootElementUtil.java
index d177d53eda..d177d53eda 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLRootElementUtil.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLRootElementUtil.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java
index 9c3760b119..9c3760b119 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/package.html b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/package.html
index 3dd869384a..3dd869384a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/package.html
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/package.html
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index 1447ed4e7f..1447ed4e7f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index 673e75d50c..673e75d50c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint
index b8d185b468..b8d185b468 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/test/java/com/example/stock/StockQuoteOffer.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/test/java/com/example/stock/StockQuoteOffer.java
index 5c5c892f33..5c5c892f33 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/test/java/com/example/stock/StockQuoteOffer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/test/java/com/example/stock/StockQuoteOffer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCacheTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCacheTestCase.java
index 9dd5892f7c..9dd5892f7c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCacheTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCacheTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBindingTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBindingTestCase.java
index ec414641c6..ec414641c6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBindingTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBindingTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java
index f5cff68969..f5cff68969 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java
index 6e2a540ada..6e2a540ada 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandlerTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandlerTestCase.java
index 6037212e5a..6037212e5a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandlerTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandlerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyBean.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyBean.java
index 9bdfb108fe..9bdfb108fe 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyBean.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyBean.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterface.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterface.java
index b8e9ee7f7d..b8e9ee7f7d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterface.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterface.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterfaceImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterfaceImpl.java
index 5c511e6ccb..5c511e6ccb 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterfaceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterfaceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyJaxbBean.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyJaxbBean.java
index 3c3992524a..3c3992524a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyJaxbBean.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyJaxbBean.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MySubBean.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MySubBean.java
index 62dfa6f73c..62dfa6f73c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MySubBean.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MySubBean.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java
index 98aefed546..98aefed546 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/test/resources/ipo.xsd b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/test/resources/ipo.xsd
index 04e8cb44f3..04e8cb44f3 100755
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-jaxb/src/test/resources/ipo.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-jaxb/src/test/resources/ipo.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/LICENSE b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/LICENSE
index d645695673..d645695673 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/LICENSE
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/LICENSE
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/META-INF/MANIFEST.MF
index 940ecccd8a..940ecccd8a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/NOTICE b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/NOTICE
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/NOTICE
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/pom.xml b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/pom.xml
index 75026a59b7..75026a59b7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java
index 5cf48645b8..5cf48645b8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java
index 4577e7260e..4577e7260e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java
index 4989f59143..4989f59143 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java
index 1557c90bce..1557c90bce 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java
index 028690a789..028690a789 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java
index 0c0683b16c..0c0683b16c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java
index 9ec3bd7e19..9ec3bd7e19 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java
index 7d89927f51..7d89927f51 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java
index 76ccc69c55..76ccc69c55 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java
index c7c9adc882..c7c9adc882 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java
index adc38772be..adc38772be 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java
index 5b0312056e..5b0312056e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/InputStream2JSON.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/InputStream2JSON.java
index 57b9d55b44..57b9d55b44 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/InputStream2JSON.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/InputStream2JSON.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JSON2Object.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JSON2Object.java
index c7ae9d636d..c7ae9d636d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JSON2Object.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JSON2Object.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JSON2OutputStream.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JSON2OutputStream.java
index cb76f74baa..cb76f74baa 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JSON2OutputStream.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JSON2OutputStream.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JacksonHelper.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JacksonHelper.java
index 895c9e70ce..895c9e70ce 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JacksonHelper.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JacksonHelper.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/Object2JSON.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/Object2JSON.java
index 38b826b202..38b826b202 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/Object2JSON.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/Object2JSON.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index aec4184afa..aec4184afa 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index f4464b7997..f4464b7997 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
index f880719ff7..f880719ff7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java
index 1aa6cf3dab..1aa6cf3dab 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java
index 9ec9f21d7e..9ec9f21d7e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java
index 60b293c1d4..60b293c1d4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java
index d32e0763c7..d32e0763c7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java
index 3a2b95a4e2..3a2b95a4e2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java
index fd0557d0a2..fd0557d0a2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/jackson/JacksonTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/jackson/JacksonTestCase.java
index 5254ca7742..5254ca7742 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/jackson/JacksonTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/jackson/JacksonTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/jackson/Object2JSONTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/jackson/Object2JSONTestCase.java
index b401e7012d..b401e7012d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/jackson/Object2JSONTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/jackson/Object2JSONTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/test/resources/ipo.xsd b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/test/resources/ipo.xsd
index 5a493e1746..5a493e1746 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-json/src/test/resources/ipo.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-json/src/test/resources/ipo.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo-axiom/LICENSE b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo-axiom/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo-axiom/LICENSE
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo-axiom/LICENSE
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo-axiom/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo-axiom/META-INF/MANIFEST.MF
index 26558b129c..26558b129c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo-axiom/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo-axiom/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo-axiom/NOTICE b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo-axiom/NOTICE
index f6ce2542c3..f6ce2542c3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo-axiom/NOTICE
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo-axiom/NOTICE
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo-axiom/pom.xml b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo-axiom/pom.xml
index 5e5e7e2575..5e5e7e2575 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo-axiom/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo-axiom/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java
index 02f43000b4..02f43000b4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java
index d306290245..d306290245 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java
index dc3c2610a4..dc3c2610a4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java
index 3a2391b41a..3a2391b41a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index c870ec2406..c870ec2406 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java
index 57dd056526..57dd056526 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java
index 901217a58e..901217a58e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java
index 5015a1b697..5015a1b697 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd
index 241ec15d36..241ec15d36 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo-axiom/src/test/resources/stock.xsd b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo-axiom/src/test/resources/stock.xsd
index a0a6717371..a0a6717371 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo-axiom/src/test/resources/stock.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo-axiom/src/test/resources/stock.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/LICENSE b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/LICENSE
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/LICENSE
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/META-INF/MANIFEST.MF
index c4703c2065..c4703c2065 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/NOTICE b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/NOTICE
index d69e595698..d69e595698 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/NOTICE
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/NOTICE
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/pom.xml b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/pom.xml
index 85cab1b0a1..85cab1b0a1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java
index 80f4602fac..80f4602fac 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java
index eaaf153dd5..eaaf153dd5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
index 7d66810ca0..7d66810ca0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java
index d59698cdb3..d59698cdb3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java
index 117d61ff26..117d61ff26 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java
index a7fc9aeb5c..a7fc9aeb5c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java
index 23063317e7..23063317e7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
index 0003e7d46f..0003e7d46f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java
index 7e26990b32..7e26990b32 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java
index 381249d9bb..381249d9bb 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypes.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypes.java
index 1ef689185a..1ef689185a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypes.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypes.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java
index 58c69858b7..58c69858b7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java
index a48e357960..a48e357960 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java
index d73f714384..d73f714384 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
index 2f41fb1957..2f41fb1957 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
index fbc13e6fed..fbc13e6fed 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
index 658fe115a5..658fe115a5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/xml/SDOTypesModelResolver.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/xml/SDOTypesModelResolver.java
index 020a8edd7d..020a8edd7d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/xml/SDOTypesModelResolver.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/xml/SDOTypesModelResolver.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/xml/SDOTypesProcessor.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/xml/SDOTypesProcessor.java
index b851d38dae..b851d38dae 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/xml/SDOTypesProcessor.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/xml/SDOTypesProcessor.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 27fa6e85ad..27fa6e85ad 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index 6252de51c2..6252de51c2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index 5ae557cc74..5ae557cc74 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index b1916fd32a..b1916fd32a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/resources/databinding-sdo-validation-messages.properties b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/resources/databinding-sdo-validation-messages.properties
index f53f08f377..f53f08f377 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/main/resources/databinding-sdo-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/main/resources/databinding-sdo-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java
index 5a0208b290..5a0208b290 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java
index 012af9ed1c..012af9ed1c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java
index 44d11cd586..44d11cd586 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
index c2a9f46059..c2a9f46059 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
index 1fcae3cb73..1fcae3cb73 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelperTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelperTestCase.java
index e0d1c9bf12..e0d1c9bf12 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelperTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelperTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java
index 400b424a97..400b424a97 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java
index 4d415f2895..4d415f2895 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java
index 2326d1b93b..2326d1b93b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java
index 3f742b49a3..3f742b49a3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
index 2beadc5b61..2beadc5b61 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/test/resources/ipo.xsd b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/test/resources/ipo.xsd
index 241ec15d36..241ec15d36 100755
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/test/resources/ipo.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/test/resources/ipo.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/test/resources/stock.xsd b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/test/resources/stock.xsd
index a0a6717371..a0a6717371 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/test/resources/stock.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/test/resources/stock.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/test/resources/wrapper.xml b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/test/resources/wrapper.xml
index 2526629409..2526629409 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/test/resources/wrapper.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/test/resources/wrapper.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/test/resources/wrapper.xsd b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/test/resources/wrapper.xsd
index ea4dc5f7f3..ea4dc5f7f3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding-sdo/src/test/resources/wrapper.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding-sdo/src/test/resources/wrapper.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/LICENSE b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/LICENSE
index 616bec99ed..616bec99ed 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/LICENSE
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/LICENSE
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/META-INF/MANIFEST.MF
index 8fed859030..8fed859030 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/NOTICE b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/NOTICE
index d69e595698..d69e595698 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/NOTICE
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/NOTICE
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/pom.xml b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/pom.xml
index 765325f459..765325f459 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/pom.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/pom.xml
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/BaseDataBinding.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/BaseDataBinding.java
index aa019ebdcf..aa019ebdcf 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/BaseDataBinding.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/BaseDataBinding.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/BaseTransformer.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/BaseTransformer.java
index f5b92de2fb..f5b92de2fb 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/BaseTransformer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/BaseTransformer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java
index 46806c77f1..46806c77f1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingContext.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingContext.java
index c77d0ad0f6..c77d0ad0f6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingContext.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingContext.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java
index ff3afd8181..ff3afd8181 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java
index 505a810276..505a810276 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java
index 1aac6d48be..1aac6d48be 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
index 22b6e8646e..22b6e8646e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
index 39889b1e97..39889b1e97 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java
index ceb2f59e80..ceb2f59e80 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java
index b65d392393..b65d392393 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java
index 600a6477f6..600a6477f6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java
index 6f2795fb51..6f2795fb51 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java
index 64740b8e08..64740b8e08 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java
index f32465d63a..f32465d63a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java
index 2aa0ad7c15..2aa0ad7c15 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java
index ee7efe4860..ee7efe4860 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java
index 4d32b41d4c..4d32b41d4c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/XMLTypeHelper.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/XMLTypeHelper.java
index 19e1f7e13f..19e1f7e13f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/XMLTypeHelper.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/XMLTypeHelper.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java
index 4405077e29..4405077e29 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.java
index 650e909c61..650e909c61 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java
index 2c14d4c380..2c14d4c380 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java
index a551671452..a551671452 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java
index d4d0312bc0..d4d0312bc0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
index 1c7220fa67..1c7220fa67 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java
index f6e8e53459..f6e8e53459 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
index 20c6c2b9e2..20c6c2b9e2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java
index a1a89005b3..a1a89005b3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java
index a7849498b4..a7849498b4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java
index 16eb4b42ed..16eb4b42ed 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java
index e8b1ac3c01..e8b1ac3c01 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java
index 0664902feb..0664902feb 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java
index fbca9b0444..fbca9b0444 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java
index 5dc13bd60b..5dc13bd60b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java
index f582499b70..f582499b70 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java
index 43bda3d769..43bda3d769 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java
index 28d716e4f7..28d716e4f7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java
index 5e5774f338..5e5774f338 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.java
index 6886462ac8..6886462ac8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
index a1bb7e6235..a1bb7e6235 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java
index 6881ec6038..6881ec6038 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java
index ae06d68e67..ae06d68e67 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/DataTypeHelper.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/DataTypeHelper.java
index 847fcf226c..847fcf226c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/DataTypeHelper.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/DataTypeHelper.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java
index ed59911a0b..ed59911a0b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
index b21a531c53..b21a531c53 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java
index abeeae47a6..abeeae47a6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java
index 0bb0513011..0bb0513011 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java
index b0b5d336f0..b0b5d336f0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java
index c9183c4cbf..c9183c4cbf 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java
index f762122350..f762122350 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java
index 25ed70dda5..25ed70dda5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java
index d5bf7e76b5..d5bf7e76b5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SourceTransformer.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SourceTransformer.java
index cb33d3548a..cb33d3548a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SourceTransformer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SourceTransformer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java
index fb3023345c..fb3023345c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java
index 6c1d241ce9..6c1d241ce9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java
index 2e0612b9b7..2e0612b9b7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java
index 1866f3864a..1866f3864a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java
index 396038ec08..396038ec08 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java
index 9bc5f99304..9bc5f99304 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java
index 0bb13bb3ea..0bb13bb3ea 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2NodeTransformer.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2NodeTransformer.java
index d2fb8305e8..d2fb8305e8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2NodeTransformer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2NodeTransformer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java
index dd69e3ea66..dd69e3ea66 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2StringTransformer.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2StringTransformer.java
index 0c3db2a477..0c3db2a477 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2StringTransformer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2StringTransformer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
index f8ae31b96c..f8ae31b96c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java
index 38f8327ae4..38f8327ae4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java
index cfcbce2e12..cfcbce2e12 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java
index 461adbe938..461adbe938 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SourceTransformer.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SourceTransformer.java
index 31093b8587..31093b8587 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SourceTransformer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SourceTransformer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java
index 156e15d8c5..156e15d8c5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java
index 0544631a73..0544631a73 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java
index f7c895db1e..f7c895db1e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java
index a7b179b93c..a7b179b93c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java
index 11dc23e4b6..11dc23e4b6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java
index 64c93d74a0..64c93d74a0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
index b360b5b9a8..b360b5b9a8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index ef8a825d68..ef8a825d68 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint
index 4cad1181b7..4cad1181b7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.Mediator b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.Mediator
index c91908e630..c91908e630 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.Mediator
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.Mediator
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index 9f609be7e2..9f609be7e2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
index 6c04591a1f..6c04591a1f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.SimpleTypeMapper b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.SimpleTypeMapper
index f905a9aa7b..f905a9aa7b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.SimpleTypeMapper
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.SimpleTypeMapper
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint
index 07762a14b8..07762a14b8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java
index defa62a49e..defa62a49e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java.fixme b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java.fixme
index 562c22354c..562c22354c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java.fixme
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java.fixme
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java.fixme b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java.fixme
index 243ac71201..243ac71201 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java.fixme
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java.fixme
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java
index a337dc113c..a337dc113c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java
index c5d6dbbcc1..c5d6dbbcc1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java
index 9ab2b51c95..9ab2b51c95 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java
index 953e539dd1..953e539dd1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/XMLDocumentStreamReaderTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/XMLDocumentStreamReaderTestCase.java
index e240592adf..e240592adf 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/XMLDocumentStreamReaderTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/XMLDocumentStreamReaderTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java
index 95f21ff4c9..95f21ff4c9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java
index 27d111374a..27d111374a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandlerTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandlerTestCase.java
index b587393ce0..b587393ce0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandlerTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandlerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java
index da18a4f89c..da18a4f89c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java
index 8919453731..8919453731 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java
index 75c43dbf79..75c43dbf79 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java
index 5027f64f01..5027f64f01 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java
index 6fd8ce2e8b..6fd8ce2e8b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd
index 92a576fb98..92a576fb98 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl
index f011ca9f32..f011ca9f32 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml
index 0ba8ade1e0..0ba8ade1e0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml