347 files changed, 0 insertions, 0 deletions

diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/LICENSE b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/LICENSE
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/LICENSE
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/NOTICE b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/NOTICE
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/NOTICE
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/pom.xml b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/pom.xml
index bf3bafd0e7..bf3bafd0e7 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/pom.xml
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/pom.xml
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java
index 142229f4f6..142229f4f6 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java
index cd820ab4b4..cd820ab4b4 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Exception2OMElement.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Exception2OMElement.java
index 429a6dbe5d..429a6dbe5d 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Exception2OMElement.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Exception2OMElement.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.java
index e23d89327c..e23d89327c 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Exception.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Exception.java
index 3dc73c89cb..3dc73c89cb 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Exception.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Exception.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.java
index ef7359fbcd..ef7359fbcd 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java
index ea40e61746..ea40e61746 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java
index b2c004324c..b2c004324c 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java
index 01e7003b20..01e7003b20 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java
index be8d1a2ead..be8d1a2ead 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java
index 88d6b462c1..88d6b462c1 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java
index 9eccd52d74..9eccd52d74 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java
index 761185c297..761185c297 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index 183270f9b4..183270f9b4 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index a1f18f9638..a1f18f9638 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java
index 7453cb787a..7453cb787a 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/src/test/resources/ipo.xml b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/src/test/resources/ipo.xml
index df901d183d..df901d183d 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/src/test/resources/ipo.xml
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/src/test/resources/ipo.xml
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/src/test/resources/ipo.xsd b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/src/test/resources/ipo.xsd
index af1e73172d..af1e73172d 100755
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/src/test/resources/ipo.xsd
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/src/test/resources/order.wsdl b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/src/test/resources/order.wsdl
index a5ead60382..a5ead60382 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-axiom/src/test/resources/order.wsdl
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-axiom/src/test/resources/order.wsdl
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-fastinfoset/LICENSE b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-fastinfoset/LICENSE
index d645695673..d645695673 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-fastinfoset/LICENSE
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-fastinfoset/LICENSE
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-fastinfoset/NOTICE b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-fastinfoset/NOTICE
index d83ebbe236..d83ebbe236 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-fastinfoset/NOTICE
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-fastinfoset/NOTICE
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-fastinfoset/pom.xml b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-fastinfoset/pom.xml
index e29530b81f..e29530b81f 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-fastinfoset/pom.xml
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-fastinfoset/pom.xml
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2Node.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2Node.java
index 2e0aa629f3..2e0aa629f3 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2Node.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2Node.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2SAX.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2SAX.java
index 77f6b77636..77f6b77636 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2SAX.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2SAX.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2XMLStreamReader.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2XMLStreamReader.java
index 73d549f4f8..73d549f4f8 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2XMLStreamReader.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2XMLStreamReader.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/Node2FastInfoset.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/Node2FastInfoset.java
index 1c12a5dcad..1c12a5dcad 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/Node2FastInfoset.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/Node2FastInfoset.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLInputStream2FastInfoset.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLInputStream2FastInfoset.java
index b0d56b3bb6..b0d56b3bb6 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLInputStream2FastInfoset.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLInputStream2FastInfoset.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLStreamReader2FastInfoset.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLStreamReader2FastInfoset.java
index d18206600c..d18206600c 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLStreamReader2FastInfoset.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLStreamReader2FastInfoset.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index ea47ee7191..ea47ee7191 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
index 1610b4f54d..1610b4f54d 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-fastinfoset/src/test/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfosetTransformerTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-fastinfoset/src/test/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfosetTransformerTestCase.java
index bb8adf39be..bb8adf39be 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-fastinfoset/src/test/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfosetTransformerTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-fastinfoset/src/test/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfosetTransformerTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-fastinfoset/src/test/resources/ipo.xsd b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-fastinfoset/src/test/resources/ipo.xsd
index 5a493e1746..5a493e1746 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-fastinfoset/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-fastinfoset/src/test/resources/ipo.xsd
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb-axiom/LICENSE b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb-axiom/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb-axiom/LICENSE
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb-axiom/LICENSE
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb-axiom/NOTICE b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb-axiom/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb-axiom/NOTICE
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb-axiom/NOTICE
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb-axiom/pom.xml b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb-axiom/pom.xml
index 0916cb54fc..0916cb54fc 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb-axiom/pom.xml
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb-axiom/pom.xml
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/AxiomHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/AxiomHelper.java
index 93277e77bf..93277e77bf 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/AxiomHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/AxiomHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXB2OMElement.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXB2OMElement.java
index c4726ad8fa..c4726ad8fa 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXB2OMElement.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXB2OMElement.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBCustomBuilder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBCustomBuilder.java
index 4876396495..4876396495 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBCustomBuilder.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBCustomBuilder.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBDataSource.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBDataSource.java
index 27c46cdb21..27c46cdb21 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBDataSource.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBDataSource.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java
index 848f6d1a85..848f6d1a85 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index b48e629927..b48e629927 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/JAXB2OMTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/JAXB2OMTestCase.java
index 543a76594f..543a76594f 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/JAXB2OMTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/JAXB2OMTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/OMElement2JAXBTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/OMElement2JAXBTestCase.java
index 3c00307941..3c00307941 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/OMElement2JAXBTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/OMElement2JAXBTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb-axiom/src/test/resources/ipo.xsd b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb-axiom/src/test/resources/ipo.xsd
index 241ec15d36..241ec15d36 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb-axiom/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb-axiom/src/test/resources/ipo.xsd
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/LICENSE b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/LICENSE
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/LICENSE
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/NOTICE b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/NOTICE
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/NOTICE
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/pom.xml b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/pom.xml
index a0556f2bb5..a0556f2bb5 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/pom.xml
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/pom.xml
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/AnyTypeXmlAdapter.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/AnyTypeXmlAdapter.java
index 57922e1c89..57922e1c89 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/AnyTypeXmlAdapter.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/AnyTypeXmlAdapter.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DOMElementXmlAdapter.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DOMElementXmlAdapter.java
index 91cb39b0f2..91cb39b0f2 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DOMElementXmlAdapter.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DOMElementXmlAdapter.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DataConverter.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DataConverter.java
index 003b4fb992..003b4fb992 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DataConverter.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DataConverter.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DefaultXMLAdapterExtensionPoint.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DefaultXMLAdapterExtensionPoint.java
index 062da48206..062da48206 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DefaultXMLAdapterExtensionPoint.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DefaultXMLAdapterExtensionPoint.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java
index 3e262c7d12..3e262c7d12 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2SAX.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2SAX.java
index eee5c77285..eee5c77285 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2SAX.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2SAX.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2String.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2String.java
index 29951a5e16..29951a5e16 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2String.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2String.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java
index c685f5cc19..c685f5cc19 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java
index d129ae6256..d129ae6256 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
index 38efd288cb..38efd288cb 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBPropertyDescriptor.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBPropertyDescriptor.java
index 8805d72627..8805d72627 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBPropertyDescriptor.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBPropertyDescriptor.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java
index a60a882801..a60a882801 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperException.java
index f83c7f09d9..f83c7f09d9 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java
index 9cb781a3e1..9cb781a3e1 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHelper.java
index 5f90aa4d7a..5f90aa4d7a 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java
index e375a9b85e..e375a9b85e 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java
index 840edfd234..840edfd234 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/String2JAXB.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/String2JAXB.java
index 5559690de8..5559690de8 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/String2JAXB.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/String2JAXB.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLAdapterExtensionPoint.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLAdapterExtensionPoint.java
index 5fa98b5ed1..5fa98b5ed1 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLAdapterExtensionPoint.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLAdapterExtensionPoint.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLRootElementUtil.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLRootElementUtil.java
index d177d53eda..d177d53eda 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLRootElementUtil.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLRootElementUtil.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java
index af3fa3fb66..af3fa3fb66 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index 3f2978ad25..3f2978ad25 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index 4e062e4c22..4e062e4c22 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint
index d1f6d9f1e3..d1f6d9f1e3 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/test/java/com/example/stock/StockQuoteOffer.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/test/java/com/example/stock/StockQuoteOffer.java
index 5c5c892f33..5c5c892f33 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/test/java/com/example/stock/StockQuoteOffer.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/test/java/com/example/stock/StockQuoteOffer.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/BeanXMLStreamReaderImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/BeanXMLStreamReaderImpl.java
index 602bc66569..602bc66569 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/BeanXMLStreamReaderImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/BeanXMLStreamReaderImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2XMLStreamReader.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2XMLStreamReader.java
index e2151e23a1..e2151e23a1 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2XMLStreamReader.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2XMLStreamReader.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCacheTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCacheTestCase.java
index 761414e92b..761414e92b 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCacheTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCacheTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBindingTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBindingTestCase.java
index 5452175c54..5452175c54 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBindingTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBindingTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java
index 500422c9c7..500422c9c7 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java
index 53779a1af6..53779a1af6 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandlerTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandlerTestCase.java
index 501f5b21b7..501f5b21b7 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandlerTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandlerTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyBean.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyBean.java
index 9bdfb108fe..9bdfb108fe 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyBean.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyBean.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterface.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterface.java
index b8e9ee7f7d..b8e9ee7f7d 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterface.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterface.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterfaceImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterfaceImpl.java
index 5c511e6ccb..5c511e6ccb 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterfaceImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterfaceImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyJaxbBean.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyJaxbBean.java
index 3c3992524a..3c3992524a 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyJaxbBean.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyJaxbBean.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MySubBean.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MySubBean.java
index 62dfa6f73c..62dfa6f73c 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MySubBean.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MySubBean.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java
index fdfa87ff43..fdfa87ff43 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/test/resources/ipo.xsd b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/test/resources/ipo.xsd
index 241ec15d36..241ec15d36 100755
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-jaxb/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-jaxb/src/test/resources/ipo.xsd
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/LICENSE b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/LICENSE
index d645695673..d645695673 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/LICENSE
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/LICENSE
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/NOTICE b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/NOTICE
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/NOTICE
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/pom.xml b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/pom.xml
index 4fd8ad9682..4fd8ad9682 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/pom.xml
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/pom.xml
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java
index b1813c9eab..b1813c9eab 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java
index 4e08384f09..4e08384f09 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java
index b70f772696..b70f772696 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java
index 28cadc6666..28cadc6666 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java
index fb29710506..fb29710506 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java
index a928deef22..a928deef22 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java
index de023157bc..de023157bc 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java
index ff5968bccd..ff5968bccd 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java
index aa75afc9d4..aa75afc9d4 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java
index 1072b70029..1072b70029 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java
index adc38772be..adc38772be 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java
index 5b0312056e..5b0312056e 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index 400507296f..400507296f 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index b122533f6e..b122533f6e 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java
index 3c7f151ed7..3c7f151ed7 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java
index 3b36f5be74..3b36f5be74 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java
index 60b293c1d4..60b293c1d4 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java
index d32e0763c7..d32e0763c7 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java
index 3a2b95a4e2..3a2b95a4e2 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java
index 84995baadf..84995baadf 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/src/test/resources/ipo.xsd b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/src/test/resources/ipo.xsd
index 5a493e1746..5a493e1746 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-json/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-json/src/test/resources/ipo.xsd
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-saxon/LICENSE b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-saxon/LICENSE
index d645695673..d645695673 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-saxon/LICENSE
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-saxon/LICENSE
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-saxon/NOTICE b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-saxon/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-saxon/NOTICE
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-saxon/NOTICE
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-saxon/pom.xml b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-saxon/pom.xml
index 37af89c4cc..37af89c4cc 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-saxon/pom.xml
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-saxon/pom.xml
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java
index 25f8ee886f..25f8ee886f 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/ItemList2ObjectTransformer.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/ItemList2ObjectTransformer.java
index 7122217b8b..7122217b8b 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/ItemList2ObjectTransformer.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/ItemList2ObjectTransformer.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java
index fabadd34ea..fabadd34ea 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2DataObjectTransformer.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2DataObjectTransformer.java
index a5093f8cdf..a5093f8cdf 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2DataObjectTransformer.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2DataObjectTransformer.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2JavaArrayTransformer.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2JavaArrayTransformer.java
index 36ebac3aea..36ebac3aea 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2JavaArrayTransformer.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2JavaArrayTransformer.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java
index 1e5b816662..1e5b816662 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java
index 616bcca6c5..616bcca6c5 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonDataBindingHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonDataBindingHelper.java
index ecb20b24b5..ecb20b24b5 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonDataBindingHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonDataBindingHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java
index ccf842710d..ccf842710d 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java
index 2f51cf86ec..2f51cf86ec 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java
index 67d89a6e0b..67d89a6e0b 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2JavaArray.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2JavaArray.java
index 16d5f524bb..16d5f524bb 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2JavaArray.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2JavaArray.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java
index 7589f6789b..7589f6789b 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java
index 5da4effcfd..5da4effcfd 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/collection/ItemList.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/collection/ItemList.java
index 065121520b..065121520b 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/collection/ItemList.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/collection/ItemList.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index e15021b972..e15021b972 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index 4d927ce53d..4d927ce53d 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo-axiom/LICENSE b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo-axiom/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo-axiom/LICENSE
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo-axiom/LICENSE
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo-axiom/NOTICE b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo-axiom/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo-axiom/NOTICE
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo-axiom/NOTICE
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo-axiom/pom.xml b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo-axiom/pom.xml
index 129c5afc1a..129c5afc1a 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo-axiom/pom.xml
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo-axiom/pom.xml
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java
index 02f43000b4..02f43000b4 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java
index aa7f99724d..aa7f99724d 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java
index dc3c2610a4..dc3c2610a4 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java
index a55a9f37cb..a55a9f37cb 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index c870ec2406..c870ec2406 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java
index 57dd056526..57dd056526 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java
index f69ef598b8..f69ef598b8 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java
index 5015a1b697..5015a1b697 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo-axiom/src/test/resources/ipo.xsd b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo-axiom/src/test/resources/ipo.xsd
index 241ec15d36..241ec15d36 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo-axiom/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo-axiom/src/test/resources/ipo.xsd
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo-axiom/src/test/resources/stock.xsd b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo-axiom/src/test/resources/stock.xsd
index a0a6717371..a0a6717371 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo-axiom/src/test/resources/stock.xsd
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo-axiom/src/test/resources/stock.xsd
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/LICENSE b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/LICENSE
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/LICENSE
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/NOTICE b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/NOTICE
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/NOTICE
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/pom.xml b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/pom.xml
index 59dbd81ba1..59dbd81ba1 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/pom.xml
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/pom.xml
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java
index 503e54e530..503e54e530 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java
index 8ce8eae587..8ce8eae587 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
index 116ac4c553..116ac4c553 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java
index 30a3e1c3a9..30a3e1c3a9 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java
index e0844117f2..e0844117f2 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java
index 4a05492dd8..4a05492dd8 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java
index ada0c94a8d..ada0c94a8d 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
index 39e9ffc161..39e9ffc161 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java
index c83ec53b01..c83ec53b01 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java
index 93c71cce6c..93c71cce6c 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypes.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypes.java
index 73c9711c2a..73c9711c2a 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypes.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypes.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java
index 167be60640..167be60640 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java
index 7ac423f8d8..7ac423f8d8 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java
index 4e5aa1d5fd..4e5aa1d5fd 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
index e70fa08477..e70fa08477 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
index baf3e2e90a..baf3e2e90a 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
index ac452910f6..ac452910f6 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/xml/SDOTypesModelResolver.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/xml/SDOTypesModelResolver.java
index d585278572..d585278572 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/xml/SDOTypesModelResolver.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/xml/SDOTypesModelResolver.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/xml/SDOTypesProcessor.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/xml/SDOTypesProcessor.java
index 3d703afd14..3d703afd14 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/xml/SDOTypesProcessor.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/xml/SDOTypesProcessor.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 7ff9478431..7ff9478431 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index 6252de51c2..6252de51c2 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index 5ae557cc74..5ae557cc74 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index b1916fd32a..b1916fd32a 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/resources/databinding-sdo-validation-messages.properties b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/resources/databinding-sdo-validation-messages.properties
index f53f08f377..f53f08f377 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/main/resources/databinding-sdo-validation-messages.properties
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/main/resources/databinding-sdo-validation-messages.properties
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java
index 5a0208b290..5a0208b290 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java
index 4bc41a5541..4bc41a5541 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java
index 44d11cd586..44d11cd586 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
index 6a82a7fb18..6a82a7fb18 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
index fa765f9bf4..fa765f9bf4 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelperTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelperTestCase.java
index e0d1c9bf12..e0d1c9bf12 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelperTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelperTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java
index 3c21b56c9f..3c21b56c9f 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java
index 2aaae3c6d8..2aaae3c6d8 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java
index 805a1ab5ce..805a1ab5ce 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java
index ce04f5be3f..ce04f5be3f 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
index 114c568c38..114c568c38 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/test/resources/ipo.xsd b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/test/resources/ipo.xsd
index 241ec15d36..241ec15d36 100755
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/test/resources/ipo.xsd
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/test/resources/stock.xsd b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/test/resources/stock.xsd
index a0a6717371..a0a6717371 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/test/resources/stock.xsd
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/test/resources/stock.xsd
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/test/resources/wrapper.xml b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/test/resources/wrapper.xml
index 2526629409..2526629409 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/test/resources/wrapper.xml
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/test/resources/wrapper.xml
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/test/resources/wrapper.xsd b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/test/resources/wrapper.xsd
index ea4dc5f7f3..ea4dc5f7f3 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-sdo/src/test/resources/wrapper.xsd
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-sdo/src/test/resources/wrapper.xsd
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xmlbeans/LICENSE b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xmlbeans/LICENSE
index d645695673..d645695673 100755
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xmlbeans/LICENSE
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xmlbeans/LICENSE
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xmlbeans/NOTICE b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xmlbeans/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xmlbeans/NOTICE
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xmlbeans/NOTICE
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xmlbeans/pom.xml b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xmlbeans/pom.xml
index d8c8a65563..d8c8a65563 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xmlbeans/pom.xml
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xmlbeans/pom.xml
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/Node2XmlObject.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/Node2XmlObject.java
index e7b240b781..e7b240b781 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/Node2XmlObject.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/Node2XmlObject.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java
index 15616979c2..15616979c2 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansWrapperHandler.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansWrapperHandler.java
index ccf48174e6..ccf48174e6 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansWrapperHandler.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansWrapperHandler.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java
index ca84f961b1..ca84f961b1 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java
index c820d9d250..c820d9d250 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2XMLStreamReader.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2XMLStreamReader.java
index bbffb7d748..bbffb7d748 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2XMLStreamReader.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2XMLStreamReader.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index ac76c6ca9b..ac76c6ca9b 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index 4e419de051..4e419de051 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xmlbeans/src/test/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObjectTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xmlbeans/src/test/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObjectTestCase.java
index 7b98ddb021..7b98ddb021 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xmlbeans/src/test/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObjectTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xmlbeans/src/test/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObjectTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xmlbeans/src/test/resources/ipo.xsd b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xmlbeans/src/test/resources/ipo.xsd
index 5a493e1746..5a493e1746 100755
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xmlbeans/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xmlbeans/src/test/resources/ipo.xsd
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xmlbeans/src/test/resources/ipo.xsdconfig b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xmlbeans/src/test/resources/ipo.xsdconfig
index a397182672..a397182672 100755
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xmlbeans/src/test/resources/ipo.xsdconfig
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xmlbeans/src/test/resources/ipo.xsdconfig
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xstream/LICENSE b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xstream/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xstream/LICENSE
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xstream/LICENSE
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xstream/NOTICE b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xstream/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xstream/NOTICE
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xstream/NOTICE
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xstream/pom.xml b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xstream/pom.xml
index 5b2b662224..5b2b662224 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xstream/pom.xml
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xstream/pom.xml
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObject.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObject.java
index 4c57cfe06b..4c57cfe06b 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObject.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObject.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObjectImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObjectImpl.java
index d223a4db23..d223a4db23 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObjectImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObjectImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Node2XObject.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Node2XObject.java
index 2b7fa9d506..2b7fa9d506 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Node2XObject.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Node2XObject.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/OMElement2XObject.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/OMElement2XObject.java
index a465e92e65..a465e92e65 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/OMElement2XObject.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/OMElement2XObject.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Utils.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Utils.java
index d819975910..d819975910 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Utils.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Utils.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject.java
index 21112efcf5..21112efcf5 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2Node.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2Node.java
index 98e0e69f9b..98e0e69f9b 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2Node.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2Node.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2OMElement.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2OMElement.java
index ff4305491a..ff4305491a 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2OMElement.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2OMElement.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObjectDataBinding.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObjectDataBinding.java
index b319c7d557..b319c7d557 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObjectDataBinding.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObjectDataBinding.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index e2f467b8dd..e2f467b8dd 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index a733ad7b7d..a733ad7b7d 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xstream/src/test/resources/ipo.xml b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xstream/src/test/resources/ipo.xml
index 1699538d62..1699538d62 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xstream/src/test/resources/ipo.xml
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xstream/src/test/resources/ipo.xml
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xstream/src/test/resources/ipo.xsd b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xstream/src/test/resources/ipo.xsd
index aac7ded180..aac7ded180 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xstream/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xstream/src/test/resources/ipo.xsd
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xstream/src/test/resources/order.wsdl b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xstream/src/test/resources/order.wsdl
index 65da5b602a..65da5b602a 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding-xstream/src/test/resources/order.wsdl
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding-xstream/src/test/resources/order.wsdl
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/LICENSE b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/LICENSE
index 616bec99ed..616bec99ed 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/LICENSE
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/LICENSE
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/NOTICE b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/NOTICE
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/NOTICE
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/pom.xml b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/pom.xml
index 4d9de68a15..4d9de68a15 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/pom.xml
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/pom.xml
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java
index 7c4ed35eb3..7c4ed35eb3 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java
index 2ff5d866b4..2ff5d866b4 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java
index 505a810276..505a810276 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java
index 1aac6d48be..1aac6d48be 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
index e4dd96f68f..e4dd96f68f 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
index e99dc2e029..e99dc2e029 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java
index 8184d739a8..8184d739a8 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java
index 81264923eb..81264923eb 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java
index 600a6477f6..600a6477f6 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java
index 4e6d130aa9..4e6d130aa9 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java
index 9ffadd1eae..9ffadd1eae 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java
index 4f949f7dff..4f949f7dff 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java
index 2aa0ad7c15..2aa0ad7c15 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java
index ee7efe4860..ee7efe4860 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java
index a91410ed71..a91410ed71 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/XMLTypeHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/XMLTypeHelper.java
index e940f8675f..e940f8675f 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/XMLTypeHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/XMLTypeHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java
index 4405077e29..4405077e29 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.java
index 650e909c61..650e909c61 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java
index 6f3456fdf0..6f3456fdf0 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java
index 04c2f0e0c9..04c2f0e0c9 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java
index 94a2cdb0bb..94a2cdb0bb 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java
index 64b3d22c10..64b3d22c10 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java
index 01916dfb96..01916dfb96 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java
index cc7b40d06b..cc7b40d06b 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
index 70efd6a5c5..70efd6a5c5 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java
index 45896ca6a1..45896ca6a1 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
index 1fee253963..1fee253963 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java
index a1a89005b3..a1a89005b3 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java
index c91176fc2c..c91176fc2c 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java
index 32a2313f59..32a2313f59 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java
index afc6417284..afc6417284 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java
index fb747864e7..fb747864e7 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java
index 2f95c2a9c6..2f95c2a9c6 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java
index 9615f43572..9615f43572 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java
index 58f594751a..58f594751a 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java
index 4942fef0da..4942fef0da 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java
index b96b394bb8..b96b394bb8 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java
index 9ee3c1f7d5..9ee3c1f7d5 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.java
index 7ae64c6a27..7ae64c6a27 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
index 61a2189c72..61a2189c72 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java
index 06feeffabd..06feeffabd 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java
index a723fd445c..a723fd445c 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/DataTypeHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/DataTypeHelper.java
index ce3237a574..ce3237a574 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/DataTypeHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/DataTypeHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/LRUCache.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/LRUCache.java
index 34a82fd2d3..34a82fd2d3 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/LRUCache.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/LRUCache.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java
index 3423d3e3b0..3423d3e3b0 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
index e029604722..e029604722 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java
index 19a8fe32d3..19a8fe32d3 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXMLStreamReader.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXMLStreamReader.java
index 8c7a742cdd..8c7a742cdd 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXMLStreamReader.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXMLStreamReader.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXmlNodeImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXmlNodeImpl.java
index 507c141c33..507c141c33 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXmlNodeImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXmlNodeImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java
index 7f49a50e1e..7f49a50e1e 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java
index 5f583da283..5f583da283 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java
index 39116ba4a1..39116ba4a1 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java
index e40c3006fb..e40c3006fb 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java
index 3b7bd3088a..3b7bd3088a 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValueArrayStreamReader.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValueArrayStreamReader.java
index 5a31d9db91..5a31d9db91 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValueArrayStreamReader.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValueArrayStreamReader.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValuePairStreamReader.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValuePairStreamReader.java
index fdc3c4139b..fdc3c4139b 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValuePairStreamReader.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValuePairStreamReader.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NamedProperty.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NamedProperty.java
index 04d7d65a0d..04d7d65a0d 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NamedProperty.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NamedProperty.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NilElementStreamReader.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NilElementStreamReader.java
index abc4bf3785..abc4bf3785 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NilElementStreamReader.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NilElementStreamReader.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java
index 5500d0bcca..5500d0bcca 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java
index d5bf7e76b5..d5bf7e76b5 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SourceTransformer.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SourceTransformer.java
index 3c9022bc3c..3c9022bc3c 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SourceTransformer.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SourceTransformer.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java
index 1b54b1fd1e..1b54b1fd1e 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java
index c9631595dc..c9631595dc 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java
index 1e8d14a151..1e8d14a151 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java
index 70387fa862..70387fa862 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java
index 188ecaffa3..188ecaffa3 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java
index 38c61d64c8..38c61d64c8 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java
index cb9d538389..cb9d538389 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java
index d2625fba11..d2625fba11 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleXmlNodeImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleXmlNodeImpl.java
index e041f85214..e041f85214 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleXmlNodeImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleXmlNodeImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2NodeTransformer.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2NodeTransformer.java
index ee9aa1bb76..ee9aa1bb76 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2NodeTransformer.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2NodeTransformer.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java
index 8a2b6b39aa..8a2b6b39aa 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2StringTransformer.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2StringTransformer.java
index 2ed548ad76..2ed548ad76 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2StringTransformer.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2StringTransformer.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAX2SAXAdapter.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAX2SAXAdapter.java
index 6257681091..6257681091 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAX2SAXAdapter.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAX2SAXAdapter.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
index ed57992910..ed57992910 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXHelper.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXHelper.java
index 103ecbd7d1..103ecbd7d1 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXHelper.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXHelper.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java
index f8967e35b6..f8967e35b6 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java
index 062e10cc45..062e10cc45 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java
index c56dba1843..c56dba1843 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SourceTransformer.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SourceTransformer.java
index c2de202a9b..c2de202a9b 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SourceTransformer.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SourceTransformer.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java
index a7364006d0..a7364006d0 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/WrappingXMLStreamReader.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/WrappingXMLStreamReader.java
index d73e495798..d73e495798 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/WrappingXMLStreamReader.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/WrappingXMLStreamReader.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java
index 5ab7272d58..5ab7272d58 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java
index a7088eada3..a7088eada3 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReader.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReader.java
index a42d6acc9a..a42d6acc9a 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReader.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReader.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java
index f1084cf2a3..f1084cf2a3 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java
index f7c895db1e..f7c895db1e 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java
index e2d0416aec..e2d0416aec 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java
index 9b39f039b1..9b39f039b1 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java
index 6db731bc9f..6db731bc9f 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamSerializer.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamSerializer.java
index 920ebb511c..920ebb511c 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamSerializer.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamSerializer.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamable.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamable.java
index f32f93d098..f32f93d098 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamable.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamable.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
index 22b173dce5..22b173dce5 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNode.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNode.java
index 86ebd627f7..86ebd627f7 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNode.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNode.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNodeIterator.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNodeIterator.java
index 3dd125463e..3dd125463e 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNodeIterator.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNodeIterator.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderImpl.java
index f4bc357c7d..f4bc357c7d 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderImpl.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderImpl.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index afb00c91ee..afb00c91ee 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint
index 568e04f9de..568e04f9de 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.Mediator b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.Mediator
index e01e121aa5..e01e121aa5 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.Mediator
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.Mediator
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index 96115be404..96115be404 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
index e02cd5c934..e02cd5c934 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint
index 7d8642fb1e..7d8642fb1e 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java
index 8c710062ad..8c710062ad 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java
index f9e331fbf3..f9e331fbf3 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java
index 562c22354c..562c22354c 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java
index 243ac71201..243ac71201 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java
index 07ee0b0ca4..07ee0b0ca4 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java
index 15b9242340..15b9242340 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java
index 7c882c0285..7c882c0285 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java
index 053e4f2a59..053e4f2a59 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java
index 6cc8868397..6cc8868397 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java
index 31c3fd4f00..31c3fd4f00 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/XMLDocumentStreamReaderTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/XMLDocumentStreamReaderTestCase.java
index dd3d000798..dd3d000798 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/XMLDocumentStreamReaderTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/XMLDocumentStreamReaderTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java
index bdc9690285..bdc9690285 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java
index 9e9dabcea7..9e9dabcea7 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java
index f3b37c86db..f3b37c86db 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java
index 3a287a5bb7..3a287a5bb7 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java
index cc1f9375c8..cc1f9375c8 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java
index 5ae0616577..5ae0616577 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java
index 9ca490f2d8..9ca490f2d8 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java
index ff6f8c1406..ff6f8c1406 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderTestCase.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderTestCase.java
index 0463e7d9f5..0463e7d9f5 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderTestCase.java
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderTestCase.java
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd
index 92a576fb98..92a576fb98 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl
index 100890e10b..100890e10b 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml
index 0ba8ade1e0..0ba8ade1e0 100644
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml
+++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml