summaryrefslogtreecommitdiffstats
path: root/branches/pre-spec-changes/services
diff options
context:
space:
mode:
authorlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2009-11-11 23:11:56 +0000
committerlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2009-11-11 23:11:56 +0000
commit9bed5ae38c581999db465b42b504026a7097af95 (patch)
treea32b086a857a4556b8aec1aa9ed3a586efd9461e /branches/pre-spec-changes/services
parentece4fd35da7b7fc76264776f81705e6b5b52d3e0 (diff)
Moving 1.x branches
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835141 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/.ruleset (renamed from branches/pre-spec-changes/services/databinding/databinding-axiom/.ruleset)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/LICENSE.txt (renamed from branches/pre-spec-changes/services/databinding/databinding-axiom/LICENSE.txt)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/NOTICE.txt (renamed from branches/pre-spec-changes/services/databinding/databinding-axiom/NOTICE.txt)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/pom.xml (renamed from branches/pre-spec-changes/services/databinding/databinding-axiom/pom.xml)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/AxiomDataBinding.java (renamed from branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/AxiomDataBinding.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2Object.java (renamed from branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2Object.java)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2String.java (renamed from branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2String.java)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2XMLStreamReader.java (renamed from branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2XMLStreamReader.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElementWrapperHandler.java (renamed from branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElementWrapperHandler.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/Object2OMElement.java (renamed from branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/Object2OMElement.java)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/String2OMElement.java (renamed from branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/String2OMElement.java)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/XMLStreamReader2OMElement.java (renamed from branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/XMLStreamReader2OMElement.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/resources/META-INF/sca/databinding.axiom.scdl (renamed from branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/resources/META-INF/sca/databinding.axiom.scdl)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/resources/META-INF/sca/default.scdl (renamed from branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/resources/META-INF/sca/default.scdl)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/src/test/java/org/apache/tuscany/databinding/axiom/OMElementTestCase.java (renamed from branches/pre-spec-changes/services/databinding/databinding-axiom/src/test/java/org/apache/tuscany/databinding/axiom/OMElementTestCase.java)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/src/test/resources/ipo.xml (renamed from branches/pre-spec-changes/services/databinding/databinding-axiom/src/test/resources/ipo.xml)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/src/test/resources/ipo.xsd (renamed from branches/pre-spec-changes/services/databinding/databinding-axiom/src/test/resources/ipo.xsd)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/src/test/resources/order.wsdl (renamed from branches/pre-spec-changes/services/databinding/databinding-axiom/src/test/resources/order.wsdl)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-castor/.ruleset (renamed from branches/pre-spec-changes/services/databinding/databinding-castor/.ruleset)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-castor/LICENSE.txt (renamed from branches/pre-spec-changes/services/databinding/databinding-castor/LICENSE.txt)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-castor/NOTICE.txt (renamed from branches/pre-spec-changes/services/databinding/databinding-castor/NOTICE.txt)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-castor/pom.xml (renamed from branches/pre-spec-changes/services/databinding/databinding-castor/pom.xml)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-castor/src/main/java/org/apache/tuscany/databinding/castor/Castor2Node.java (renamed from branches/pre-spec-changes/services/databinding/databinding-castor/src/main/java/org/apache/tuscany/databinding/castor/Castor2Node.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-castor/src/main/java/org/apache/tuscany/databinding/castor/Castor2SAX.java (renamed from branches/pre-spec-changes/services/databinding/databinding-castor/src/main/java/org/apache/tuscany/databinding/castor/Castor2SAX.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-castor/src/main/java/org/apache/tuscany/databinding/castor/Castor2Writer.java (renamed from branches/pre-spec-changes/services/databinding/databinding-castor/src/main/java/org/apache/tuscany/databinding/castor/Castor2Writer.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-castor/src/main/java/org/apache/tuscany/databinding/castor/InputSource2Castor.java (renamed from branches/pre-spec-changes/services/databinding/databinding-castor/src/main/java/org/apache/tuscany/databinding/castor/InputSource2Castor.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-castor/src/main/java/org/apache/tuscany/databinding/castor/Node2Castor.java (renamed from branches/pre-spec-changes/services/databinding/databinding-castor/src/main/java/org/apache/tuscany/databinding/castor/Node2Castor.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-castor/src/main/java/org/apache/tuscany/databinding/castor/Reader2Castor.java (renamed from branches/pre-spec-changes/services/databinding/databinding-castor/src/main/java/org/apache/tuscany/databinding/castor/Reader2Castor.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-castor/src/test/java/org/apache/tuscany/databinding/castor/Castor2NodeTestCase.java (renamed from branches/pre-spec-changes/services/databinding/databinding-castor/src/test/java/org/apache/tuscany/databinding/castor/Castor2NodeTestCase.java)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-castor/src/test/resources/binding.xml (renamed from branches/pre-spec-changes/services/databinding/databinding-castor/src/test/resources/binding.xml)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-castor/src/test/resources/ipo.xsd (renamed from branches/pre-spec-changes/services/databinding/databinding-castor/src/test/resources/ipo.xsd)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-castor/src/test/resources/org/exolab/castor/builder/castorbuilder.properties (renamed from branches/pre-spec-changes/services/databinding/databinding-castor/src/test/resources/org/exolab/castor/builder/castorbuilder.properties)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/.ruleset (renamed from branches/pre-spec-changes/services/databinding/databinding-jaxb/.ruleset)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/LICENSE.txt (renamed from branches/pre-spec-changes/services/databinding/databinding-jaxb/LICENSE.txt)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/NOTICE.txt (renamed from branches/pre-spec-changes/services/databinding/databinding-jaxb/NOTICE.txt)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/pom.xml (renamed from branches/pre-spec-changes/services/databinding/databinding-jaxb/pom.xml)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXB2Node.java (renamed from branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXB2Node.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBContextHelper.java (renamed from branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBContextHelper.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBDataBinding.java (renamed from branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBDataBinding.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBWrapperHandler.java (renamed from branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBWrapperHandler.java)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/Node2JAXB.java (renamed from branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/Node2JAXB.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/Reader2JAXB.java (renamed from branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/Reader2JAXB.java)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/XMLStreamReader2JAXB.java (renamed from branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/XMLStreamReader2JAXB.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/resources/META-INF/sca/databinding.jaxb.scdl (renamed from branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/resources/META-INF/sca/databinding.jaxb.scdl)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/resources/META-INF/sca/default.scdl (renamed from branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/resources/META-INF/sca/default.scdl)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBDataBindingTestCase.java (renamed from branches/pre-spec-changes/services/databinding/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBDataBindingTestCase.java)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBTestCase.java (renamed from branches/pre-spec-changes/services/databinding/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBTestCase.java)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/test/resources/ipo.xsd (renamed from branches/pre-spec-changes/services/databinding/databinding-jaxb/src/test/resources/ipo.xsd)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/.ruleset (renamed from branches/pre-spec-changes/services/databinding/databinding-sdo/.ruleset)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/LICENSE.txt (renamed from branches/pre-spec-changes/services/databinding/databinding-sdo/LICENSE.txt)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/NOTICE.txt (renamed from branches/pre-spec-changes/services/databinding/databinding-sdo/NOTICE.txt)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/pom.xml (renamed from branches/pre-spec-changes/services/databinding/databinding-sdo/pom.xml)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2String.java (renamed from branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2String.java)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2XMLStreamReader.java (renamed from branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2XMLStreamReader.java)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObjectLoader.java (renamed from branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObjectLoader.java)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOLoader.java (renamed from branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOLoader.java)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ModelDataObject.java (renamed from branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ModelDataObject.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDODataBinding.java (renamed from branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDODataBinding.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDODataTypeHelper.java (renamed from branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDODataTypeHelper.java)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOObjectFactory.java (renamed from branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOObjectFactory.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOSimpleTypeMapper.java (renamed from branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOSimpleTypeMapper.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOWrapperHandler.java (renamed from branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOWrapperHandler.java)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/String2DataObject.java (renamed from branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/String2DataObject.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2String.java (renamed from branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2String.java)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReader.java (renamed from branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReader.java)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2DataObject.java (renamed from branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2DataObject.java)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2XMLDocument.java (renamed from branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2XMLDocument.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/databinding.sdo.scdl (renamed from branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/databinding.sdo.scdl)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/default.scdl (renamed from branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/default.scdl)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObject2StringTestCase.java (renamed from branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObject2StringTestCase.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObject2XMLStreamReaderTestCase.java (renamed from branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObject2XMLStreamReaderTestCase.java)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObjectLoaderTestCase.java (renamed from branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObjectLoaderTestCase.java)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/ImportSDOLoaderTestCase.java (renamed from branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/ImportSDOLoaderTestCase.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDODataBindingTestCase.java (renamed from branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDODataBindingTestCase.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDOTransformerTestCaseBase.java (renamed from branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDOTransformerTestCaseBase.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java (renamed from branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/resources/META-INF/tuscany/databinding.sdo.scdl (renamed from branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/resources/META-INF/tuscany/databinding.sdo.scdl)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/resources/ipo.xsd (renamed from branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/resources/ipo.xsd)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/resources/model/sca-core.xsd (renamed from branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/resources/model/sca-core.xsd)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd (renamed from branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/.ruleset (renamed from branches/pre-spec-changes/services/databinding/databinding-test/.ruleset)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/LICENSE.txt (renamed from branches/pre-spec-changes/services/databinding/databinding-test/LICENSE.txt)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/NOTICE.txt (renamed from branches/pre-spec-changes/services/databinding/databinding-test/NOTICE.txt)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/pom.xml (renamed from branches/pre-spec-changes/services/databinding/databinding-test/pom.xml)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/JAXBTestCase.java (renamed from branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/JAXBTestCase.java)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/TransformationTestCase.java (renamed from branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/TransformationTestCase.java)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/XmlObjectTestCase.java (renamed from branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/XmlObjectTestCase.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/Client.java (renamed from branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/Client.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/ClientImpl.java (renamed from branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/ClientImpl.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/DataBindingBootStrapTest.java (renamed from branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/DataBindingBootStrapTest.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/Echo.java (renamed from branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/Echo.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/EchoImpl.java (renamed from branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/EchoImpl.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/META-INF/sca/default.scdl (renamed from branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/META-INF/sca/default.scdl)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/META-INF/tuscany/databinding.axiom.scdl (renamed from branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/META-INF/tuscany/databinding.axiom.scdl)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/META-INF/tuscany/databinding.jaxb.scdl (renamed from branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/META-INF/tuscany/databinding.jaxb.scdl)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/META-INF/tuscany/databinding.sdo.scdl (renamed from branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/META-INF/tuscany/databinding.sdo.scdl)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/META-INF/tuscany/databinding.xmlbeans.scdl (renamed from branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/META-INF/tuscany/databinding.xmlbeans.scdl)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/META-INF/tuscany/interface.wsdl.scdl (renamed from branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/META-INF/tuscany/interface.wsdl.scdl)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/META-INF/tuscany/test-extensions.scdl (renamed from branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/META-INF/tuscany/test-extensions.scdl)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/ipo.xml (renamed from branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/ipo.xml)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/ipo.xsd (renamed from branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/ipo.xsd)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/ipo.xsdconfig (renamed from branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/ipo.xsdconfig)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/.ruleset (renamed from branches/pre-spec-changes/services/databinding/databinding-xmlbeans/.ruleset)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/LICENSE.txt (renamed from branches/pre-spec-changes/services/databinding/databinding-xmlbeans/LICENSE.txt)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/NOTICE.txt (renamed from branches/pre-spec-changes/services/databinding/databinding-xmlbeans/NOTICE.txt)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/pom.xml (renamed from branches/pre-spec-changes/services/databinding/databinding-xmlbeans/pom.xml)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/Node2XmlObject.java (renamed from branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/Node2XmlObject.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XMLBeansDataBinding.java (renamed from branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XMLBeansDataBinding.java)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XMLStreamReader2XmlObject.java (renamed from branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XMLStreamReader2XmlObject.java)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XmlObject2Node.java (renamed from branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XmlObject2Node.java)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XmlObject2XMLStreamReader.java (renamed from branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XmlObject2XMLStreamReader.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/main/resources/META-INF/sca/default.scdl (renamed from branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/main/resources/META-INF/sca/default.scdl)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/test/java/org/apache/tuscany/databinding/xmlbeans/XmlObjectTestCase.java (renamed from branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/test/java/org/apache/tuscany/databinding/xmlbeans/XmlObjectTestCase.java)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/test/resources/ipo.xsd (renamed from branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/test/resources/ipo.xsd)0
-rwxr-xr-xsca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/test/resources/ipo.xsdconfig (renamed from branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/test/resources/ipo.xsdconfig)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/databinding/pom.xml (renamed from branches/pre-spec-changes/services/databinding/pom.xml)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/idl/pom.xml (renamed from branches/pre-spec-changes/services/idl/pom.xml)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/.ruleset (renamed from branches/pre-spec-changes/services/idl/wsdl/.ruleset)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/LICENSE.txt (renamed from branches/pre-spec-changes/services/idl/wsdl/LICENSE.txt)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/NOTICE.txt (renamed from branches/pre-spec-changes/services/idl/wsdl/NOTICE.txt)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/pom.xml (renamed from branches/pre-spec-changes/services/idl/wsdl/pom.xml)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLIntrospector.java (renamed from branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLIntrospector.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLIntrospectorImpl.java (renamed from branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLIntrospectorImpl.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLLoader.java (renamed from branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLLoader.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InvalidFragmentException.java (renamed from branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InvalidFragmentException.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InvalidWSDLException.java (renamed from branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InvalidWSDLException.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InvalidWSDLLocationException.java (renamed from branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InvalidWSDLLocationException.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/NotSupportedWSDLException.java (renamed from branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/NotSupportedWSDLException.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/UnresolveableResourceException.java (renamed from branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/UnresolveableResourceException.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistry.java (renamed from branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistry.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistryImpl.java (renamed from branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistryImpl.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLLoader.java (renamed from branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLLoader.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLLoaderException.java (renamed from branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLLoaderException.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLLoaderImpl.java (renamed from branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLLoaderImpl.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLLocation.java (renamed from branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLLocation.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLOperation.java (renamed from branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLOperation.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLServiceContract.java (renamed from branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLServiceContract.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/XMLSchemaRegistry.java (renamed from branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/XMLSchemaRegistry.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/XMLSchemaRegistryImpl.java (renamed from branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/XMLSchemaRegistryImpl.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/resources/META-INF/sca/default.scdl (renamed from branches/pre-spec-changes/services/idl/wsdl/src/main/resources/META-INF/sca/default.scdl)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/resources/META-INF/sca/idl.wsdl.scdl (renamed from branches/pre-spec-changes/services/idl/wsdl/src/main/resources/META-INF/sca/idl.wsdl.scdl)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLIntrospectorImplTestCase.java (renamed from branches/pre-spec-changes/services/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLIntrospectorImplTestCase.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistryTestCase.java (renamed from branches/pre-spec-changes/services/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistryTestCase.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/WSDLLoaderImplTestCase.java (renamed from branches/pre-spec-changes/services/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/WSDLLoaderImplTestCase.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/WSDLOperationTestCase.java (renamed from branches/pre-spec-changes/services/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/WSDLOperationTestCase.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/WrapperStyleOperationTestCase.java (renamed from branches/pre-spec-changes/services/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/WrapperStyleOperationTestCase.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/XMLSchemaRegistryImplTestCase.java (renamed from branches/pre-spec-changes/services/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/XMLSchemaRegistryImplTestCase.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/test/resources/org/apache/tuscany/idl/wsdl/example.wsdl (renamed from branches/pre-spec-changes/services/idl/wsdl/src/test/resources/org/apache/tuscany/idl/wsdl/example.wsdl)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/test/resources/org/apache/tuscany/idl/wsdl/invalid-stockquote.wsdl (renamed from branches/pre-spec-changes/services/idl/wsdl/src/test/resources/org/apache/tuscany/idl/wsdl/invalid-stockquote.wsdl)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/test/resources/org/apache/tuscany/idl/wsdl/ipo.xsd (renamed from branches/pre-spec-changes/services/idl/wsdl/src/test/resources/org/apache/tuscany/idl/wsdl/ipo.xsd)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/test/resources/org/apache/tuscany/idl/wsdl/stockquote.wsdl (renamed from branches/pre-spec-changes/services/idl/wsdl/src/test/resources/org/apache/tuscany/idl/wsdl/stockquote.wsdl)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/test/resources/org/apache/tuscany/idl/wsdl/unwrapped-stockquote.wsdl (renamed from branches/pre-spec-changes/services/idl/wsdl/src/test/resources/org/apache/tuscany/idl/wsdl/unwrapped-stockquote.wsdl)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/management/jmx/LICENSE.txt (renamed from branches/pre-spec-changes/services/management/jmx/LICENSE.txt)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/management/jmx/NOTICE.txt (renamed from branches/pre-spec-changes/services/management/jmx/NOTICE.txt)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/management/jmx/pom.xml (renamed from branches/pre-spec-changes/services/management/jmx/pom.xml)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxException.java (renamed from branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxException.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxManagementService.java (renamed from branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxManagementService.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/AbstractAgent.java (renamed from branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/AbstractAgent.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/Agent.java (renamed from branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/Agent.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/ManagementException.java (renamed from branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/ManagementException.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/RmiAgent.java (renamed from branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/RmiAgent.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/AnnotationDrivenDynamicMBean.java (renamed from branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/AnnotationDrivenDynamicMBean.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/InstrumentationException.java (renamed from branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/InstrumentationException.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/InstrumentedComponent.java (renamed from branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/InstrumentedComponent.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/ReflectedDynamicMBean.java (renamed from branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/ReflectedDynamicMBean.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/management/pom.xml (renamed from branches/pre-spec-changes/services/management/pom.xml)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/maven/LICENSE.txt (renamed from branches/pre-spec-changes/services/maven/LICENSE.txt)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/maven/NOTICE.txt (renamed from branches/pre-spec-changes/services/maven/NOTICE.txt)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/maven/pom.xml (renamed from branches/pre-spec-changes/services/maven/pom.xml)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/maven/src/main/java/org/apache/tuscany/services/maven/MavenArtifactRepository.java (renamed from branches/pre-spec-changes/services/maven/src/main/java/org/apache/tuscany/services/maven/MavenArtifactRepository.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/maven/src/main/java/org/apache/tuscany/services/maven/MavenHelper.java (renamed from branches/pre-spec-changes/services/maven/src/main/java/org/apache/tuscany/services/maven/MavenHelper.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/maven/src/main/java/org/apache/tuscany/services/maven/TuscanyDependencyException.java (renamed from branches/pre-spec-changes/services/maven/src/main/java/org/apache/tuscany/services/maven/TuscanyDependencyException.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/maven/src/main/java/org/apache/tuscany/services/maven/WarRepositoryHelper.java (renamed from branches/pre-spec-changes/services/maven/src/main/java/org/apache/tuscany/services/maven/WarRepositoryHelper.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/maven/src/test/java/org/apache/tuscany/services/maven/MavenArtifactRepositoryTestCase.java (renamed from branches/pre-spec-changes/services/maven/src/test/java/org/apache/tuscany/services/maven/MavenArtifactRepositoryTestCase.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/maven/src/test/java/org/apache/tuscany/services/maven/WarRepositoryHelperTestCase.java (renamed from branches/pre-spec-changes/services/maven/src/test/java/org/apache/tuscany/services/maven/WarRepositoryHelperTestCase.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/maven/src/test/resources/webapp.war (renamed from branches/pre-spec-changes/services/maven/src/test/resources/webapp.war)bin443672 -> 443672 bytes
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/plugins/plugin.itest/LICENSE.txt (renamed from branches/pre-spec-changes/services/plugins/plugin.itest/LICENSE.txt)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/plugins/plugin.itest/NOTICE.txt (renamed from branches/pre-spec-changes/services/plugins/plugin.itest/NOTICE.txt)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/plugins/plugin.itest/pom.xml (renamed from branches/pre-spec-changes/services/plugins/plugin.itest/pom.xml)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/Dependency.java (renamed from branches/pre-spec-changes/services/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/Dependency.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenEmbeddedRuntime.java (renamed from branches/pre-spec-changes/services/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenEmbeddedRuntime.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenRuntimeInfo.java (renamed from branches/pre-spec-changes/services/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenRuntimeInfo.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/TuscanyITestMojo.java (renamed from branches/pre-spec-changes/services/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/TuscanyITestMojo.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/TuscanyStartMojo.java (renamed from branches/pre-spec-changes/services/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/TuscanyStartMojo.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/TuscanyStopMojo.java (renamed from branches/pre-spec-changes/services/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/TuscanyStopMojo.java)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/plugins/plugin.itest/src/main/resources/META-INF/tuscany/embeddedMaven.scdl (renamed from branches/pre-spec-changes/services/plugins/plugin.itest/src/main/resources/META-INF/tuscany/embeddedMaven.scdl)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/plugins/pom.xml (renamed from branches/pre-spec-changes/services/plugins/pom.xml)0
-rw-r--r--sca-java-1.x/branches/pre-spec-changes/services/pom.xml (renamed from branches/pre-spec-changes/services/pom.xml)0
188 files changed, 0 insertions, 0 deletions
diff --git a/branches/pre-spec-changes/services/databinding/databinding-axiom/.ruleset b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/.ruleset
index e615e93a4b..e615e93a4b 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-axiom/.ruleset
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/.ruleset
diff --git a/branches/pre-spec-changes/services/databinding/databinding-axiom/LICENSE.txt b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/LICENSE.txt
index d645695673..d645695673 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-axiom/LICENSE.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/LICENSE.txt
diff --git a/branches/pre-spec-changes/services/databinding/databinding-axiom/NOTICE.txt b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/NOTICE.txt
index d83ebbe236..d83ebbe236 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-axiom/NOTICE.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/NOTICE.txt
diff --git a/branches/pre-spec-changes/services/databinding/databinding-axiom/pom.xml b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/pom.xml
index 9f5b4a31e1..9f5b4a31e1 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-axiom/pom.xml
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/pom.xml
diff --git a/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/AxiomDataBinding.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/AxiomDataBinding.java
index 771e7221ef..771e7221ef 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/AxiomDataBinding.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/AxiomDataBinding.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2Object.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2Object.java
index 91b1f4da90..91b1f4da90 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2Object.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2Object.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2String.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2String.java
index 52be08537d..52be08537d 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2String.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2String.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2XMLStreamReader.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2XMLStreamReader.java
index 343408a027..343408a027 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2XMLStreamReader.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElement2XMLStreamReader.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElementWrapperHandler.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElementWrapperHandler.java
index 0ba2863735..0ba2863735 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElementWrapperHandler.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/OMElementWrapperHandler.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/Object2OMElement.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/Object2OMElement.java
index 5416b5239e..5416b5239e 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/Object2OMElement.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/Object2OMElement.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/String2OMElement.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/String2OMElement.java
index 59ac5423d7..59ac5423d7 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/String2OMElement.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/String2OMElement.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/XMLStreamReader2OMElement.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/XMLStreamReader2OMElement.java
index 5b2c89b443..5b2c89b443 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/XMLStreamReader2OMElement.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/XMLStreamReader2OMElement.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/resources/META-INF/sca/databinding.axiom.scdl b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/resources/META-INF/sca/databinding.axiom.scdl
index ecdaab994e..ecdaab994e 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/resources/META-INF/sca/databinding.axiom.scdl
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/resources/META-INF/sca/databinding.axiom.scdl
diff --git a/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/resources/META-INF/sca/default.scdl b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/resources/META-INF/sca/default.scdl
index 2350c77b17..2350c77b17 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/resources/META-INF/sca/default.scdl
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/src/main/resources/META-INF/sca/default.scdl
diff --git a/branches/pre-spec-changes/services/databinding/databinding-axiom/src/test/java/org/apache/tuscany/databinding/axiom/OMElementTestCase.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/src/test/java/org/apache/tuscany/databinding/axiom/OMElementTestCase.java
index 2351b7da97..2351b7da97 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-axiom/src/test/java/org/apache/tuscany/databinding/axiom/OMElementTestCase.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/src/test/java/org/apache/tuscany/databinding/axiom/OMElementTestCase.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-axiom/src/test/resources/ipo.xml b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/src/test/resources/ipo.xml
index 58058dbe1a..58058dbe1a 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-axiom/src/test/resources/ipo.xml
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/src/test/resources/ipo.xml
diff --git a/branches/pre-spec-changes/services/databinding/databinding-axiom/src/test/resources/ipo.xsd b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/src/test/resources/ipo.xsd
index 5468542693..5468542693 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-axiom/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/src/test/resources/ipo.xsd
diff --git a/branches/pre-spec-changes/services/databinding/databinding-axiom/src/test/resources/order.wsdl b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/src/test/resources/order.wsdl
index cde45f12ae..cde45f12ae 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-axiom/src/test/resources/order.wsdl
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-axiom/src/test/resources/order.wsdl
diff --git a/branches/pre-spec-changes/services/databinding/databinding-castor/.ruleset b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-castor/.ruleset
index e615e93a4b..e615e93a4b 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-castor/.ruleset
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-castor/.ruleset
diff --git a/branches/pre-spec-changes/services/databinding/databinding-castor/LICENSE.txt b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-castor/LICENSE.txt
index d645695673..d645695673 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-castor/LICENSE.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-castor/LICENSE.txt
diff --git a/branches/pre-spec-changes/services/databinding/databinding-castor/NOTICE.txt b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-castor/NOTICE.txt
index d83ebbe236..d83ebbe236 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-castor/NOTICE.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-castor/NOTICE.txt
diff --git a/branches/pre-spec-changes/services/databinding/databinding-castor/pom.xml b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-castor/pom.xml
index a0db5b75d5..a0db5b75d5 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-castor/pom.xml
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-castor/pom.xml
diff --git a/branches/pre-spec-changes/services/databinding/databinding-castor/src/main/java/org/apache/tuscany/databinding/castor/Castor2Node.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-castor/src/main/java/org/apache/tuscany/databinding/castor/Castor2Node.java
index 9ae0335ada..9ae0335ada 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-castor/src/main/java/org/apache/tuscany/databinding/castor/Castor2Node.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-castor/src/main/java/org/apache/tuscany/databinding/castor/Castor2Node.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-castor/src/main/java/org/apache/tuscany/databinding/castor/Castor2SAX.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-castor/src/main/java/org/apache/tuscany/databinding/castor/Castor2SAX.java
index 643d6fb4ad..643d6fb4ad 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-castor/src/main/java/org/apache/tuscany/databinding/castor/Castor2SAX.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-castor/src/main/java/org/apache/tuscany/databinding/castor/Castor2SAX.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-castor/src/main/java/org/apache/tuscany/databinding/castor/Castor2Writer.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-castor/src/main/java/org/apache/tuscany/databinding/castor/Castor2Writer.java
index f477273387..f477273387 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-castor/src/main/java/org/apache/tuscany/databinding/castor/Castor2Writer.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-castor/src/main/java/org/apache/tuscany/databinding/castor/Castor2Writer.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-castor/src/main/java/org/apache/tuscany/databinding/castor/InputSource2Castor.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-castor/src/main/java/org/apache/tuscany/databinding/castor/InputSource2Castor.java
index 61bac7d20f..61bac7d20f 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-castor/src/main/java/org/apache/tuscany/databinding/castor/InputSource2Castor.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-castor/src/main/java/org/apache/tuscany/databinding/castor/InputSource2Castor.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-castor/src/main/java/org/apache/tuscany/databinding/castor/Node2Castor.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-castor/src/main/java/org/apache/tuscany/databinding/castor/Node2Castor.java
index fa5a15b3ba..fa5a15b3ba 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-castor/src/main/java/org/apache/tuscany/databinding/castor/Node2Castor.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-castor/src/main/java/org/apache/tuscany/databinding/castor/Node2Castor.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-castor/src/main/java/org/apache/tuscany/databinding/castor/Reader2Castor.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-castor/src/main/java/org/apache/tuscany/databinding/castor/Reader2Castor.java
index a8ade1bda5..a8ade1bda5 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-castor/src/main/java/org/apache/tuscany/databinding/castor/Reader2Castor.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-castor/src/main/java/org/apache/tuscany/databinding/castor/Reader2Castor.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-castor/src/test/java/org/apache/tuscany/databinding/castor/Castor2NodeTestCase.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-castor/src/test/java/org/apache/tuscany/databinding/castor/Castor2NodeTestCase.java
index 3ea86321e7..3ea86321e7 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-castor/src/test/java/org/apache/tuscany/databinding/castor/Castor2NodeTestCase.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-castor/src/test/java/org/apache/tuscany/databinding/castor/Castor2NodeTestCase.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-castor/src/test/resources/binding.xml b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-castor/src/test/resources/binding.xml
index 9b66de4cca..9b66de4cca 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-castor/src/test/resources/binding.xml
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-castor/src/test/resources/binding.xml
diff --git a/branches/pre-spec-changes/services/databinding/databinding-castor/src/test/resources/ipo.xsd b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-castor/src/test/resources/ipo.xsd
index 5468542693..5468542693 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-castor/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-castor/src/test/resources/ipo.xsd
diff --git a/branches/pre-spec-changes/services/databinding/databinding-castor/src/test/resources/org/exolab/castor/builder/castorbuilder.properties b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-castor/src/test/resources/org/exolab/castor/builder/castorbuilder.properties
index d6f593fd00..d6f593fd00 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-castor/src/test/resources/org/exolab/castor/builder/castorbuilder.properties
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-castor/src/test/resources/org/exolab/castor/builder/castorbuilder.properties
diff --git a/branches/pre-spec-changes/services/databinding/databinding-jaxb/.ruleset b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/.ruleset
index e615e93a4b..e615e93a4b 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-jaxb/.ruleset
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/.ruleset
diff --git a/branches/pre-spec-changes/services/databinding/databinding-jaxb/LICENSE.txt b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/LICENSE.txt
index d645695673..d645695673 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-jaxb/LICENSE.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/LICENSE.txt
diff --git a/branches/pre-spec-changes/services/databinding/databinding-jaxb/NOTICE.txt b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/NOTICE.txt
index d83ebbe236..d83ebbe236 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-jaxb/NOTICE.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/NOTICE.txt
diff --git a/branches/pre-spec-changes/services/databinding/databinding-jaxb/pom.xml b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/pom.xml
index 99ad0f9d39..99ad0f9d39 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-jaxb/pom.xml
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/pom.xml
diff --git a/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXB2Node.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXB2Node.java
index 607b515809..607b515809 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXB2Node.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXB2Node.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBContextHelper.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBContextHelper.java
index 457232635f..457232635f 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBContextHelper.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBContextHelper.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBDataBinding.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBDataBinding.java
index c43e9bcd42..c43e9bcd42 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBDataBinding.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBDataBinding.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBWrapperHandler.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBWrapperHandler.java
index 507f36eb19..507f36eb19 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBWrapperHandler.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/JAXBWrapperHandler.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/Node2JAXB.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/Node2JAXB.java
index 301e316889..301e316889 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/Node2JAXB.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/Node2JAXB.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/Reader2JAXB.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/Reader2JAXB.java
index 273c15db1b..273c15db1b 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/Reader2JAXB.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/Reader2JAXB.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/XMLStreamReader2JAXB.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/XMLStreamReader2JAXB.java
index 3f6a2f64d3..3f6a2f64d3 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/XMLStreamReader2JAXB.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/XMLStreamReader2JAXB.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/resources/META-INF/sca/databinding.jaxb.scdl b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/resources/META-INF/sca/databinding.jaxb.scdl
index be6b90026e..be6b90026e 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/resources/META-INF/sca/databinding.jaxb.scdl
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/resources/META-INF/sca/databinding.jaxb.scdl
diff --git a/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/resources/META-INF/sca/default.scdl b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/resources/META-INF/sca/default.scdl
index 02800fd3e9..02800fd3e9 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/resources/META-INF/sca/default.scdl
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/main/resources/META-INF/sca/default.scdl
diff --git a/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBDataBindingTestCase.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBDataBindingTestCase.java
index 1b80be724f..1b80be724f 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBDataBindingTestCase.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBDataBindingTestCase.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBTestCase.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBTestCase.java
index 08583d9729..08583d9729 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBTestCase.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBTestCase.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/test/resources/ipo.xsd b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/test/resources/ipo.xsd
index 5468542693..5468542693 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-jaxb/src/test/resources/ipo.xsd
diff --git a/branches/pre-spec-changes/services/databinding/databinding-sdo/.ruleset b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/.ruleset
index e615e93a4b..e615e93a4b 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-sdo/.ruleset
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/.ruleset
diff --git a/branches/pre-spec-changes/services/databinding/databinding-sdo/LICENSE.txt b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/LICENSE.txt
index d645695673..d645695673 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-sdo/LICENSE.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/LICENSE.txt
diff --git a/branches/pre-spec-changes/services/databinding/databinding-sdo/NOTICE.txt b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/NOTICE.txt
index d83ebbe236..d83ebbe236 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-sdo/NOTICE.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/NOTICE.txt
diff --git a/branches/pre-spec-changes/services/databinding/databinding-sdo/pom.xml b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/pom.xml
index 84e8b084ea..84e8b084ea 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-sdo/pom.xml
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/pom.xml
diff --git a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2String.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2String.java
index 9125980eed..9125980eed 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2String.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2String.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2XMLStreamReader.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2XMLStreamReader.java
index 2892b1bc4d..2892b1bc4d 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2XMLStreamReader.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObject2XMLStreamReader.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObjectLoader.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObjectLoader.java
index 5706005252..5706005252 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObjectLoader.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObjectLoader.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOLoader.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOLoader.java
index 92b1036bc0..92b1036bc0 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOLoader.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOLoader.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ModelDataObject.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ModelDataObject.java
index a3870b5e9a..a3870b5e9a 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ModelDataObject.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ModelDataObject.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDODataBinding.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDODataBinding.java
index 213dfd9280..213dfd9280 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDODataBinding.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDODataBinding.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDODataTypeHelper.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDODataTypeHelper.java
index 7cb52e366e..7cb52e366e 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDODataTypeHelper.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDODataTypeHelper.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOObjectFactory.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOObjectFactory.java
index 0c3e74cdc7..0c3e74cdc7 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOObjectFactory.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOObjectFactory.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOSimpleTypeMapper.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOSimpleTypeMapper.java
index a363a8a3ec..a363a8a3ec 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOSimpleTypeMapper.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOSimpleTypeMapper.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOWrapperHandler.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOWrapperHandler.java
index 7074687722..7074687722 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOWrapperHandler.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOWrapperHandler.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/String2DataObject.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/String2DataObject.java
index 64c79a3bd0..64c79a3bd0 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/String2DataObject.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/String2DataObject.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2String.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2String.java
index 16e2714a89..16e2714a89 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2String.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2String.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReader.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReader.java
index 53343aba6b..53343aba6b 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReader.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReader.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2DataObject.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2DataObject.java
index 2a4ce83eb6..2a4ce83eb6 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2DataObject.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2DataObject.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2XMLDocument.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2XMLDocument.java
index 616d2139d4..616d2139d4 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2XMLDocument.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/XMLStreamReader2XMLDocument.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/databinding.sdo.scdl b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/databinding.sdo.scdl
index 84ac5cc58a..84ac5cc58a 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/databinding.sdo.scdl
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/databinding.sdo.scdl
diff --git a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/default.scdl b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/default.scdl
index 19a00aa147..19a00aa147 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/default.scdl
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/default.scdl
diff --git a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObject2StringTestCase.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObject2StringTestCase.java
index 28a885cd16..28a885cd16 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObject2StringTestCase.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObject2StringTestCase.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObject2XMLStreamReaderTestCase.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
index 5ab23c6df1..5ab23c6df1 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObjectLoaderTestCase.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObjectLoaderTestCase.java
index 33ae6bbe97..33ae6bbe97 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObjectLoaderTestCase.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObjectLoaderTestCase.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/ImportSDOLoaderTestCase.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/ImportSDOLoaderTestCase.java
index ff6f07427c..ff6f07427c 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/ImportSDOLoaderTestCase.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/ImportSDOLoaderTestCase.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDODataBindingTestCase.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDODataBindingTestCase.java
index 438de93c76..438de93c76 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDODataBindingTestCase.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDODataBindingTestCase.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDOTransformerTestCaseBase.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDOTransformerTestCaseBase.java
index c7403410ef..c7403410ef 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDOTransformerTestCaseBase.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/SDOTransformerTestCaseBase.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
index a7f391216b..a7f391216b 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/resources/META-INF/tuscany/databinding.sdo.scdl b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/resources/META-INF/tuscany/databinding.sdo.scdl
index 8f4ee4be3e..8f4ee4be3e 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/resources/META-INF/tuscany/databinding.sdo.scdl
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/resources/META-INF/tuscany/databinding.sdo.scdl
diff --git a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/resources/ipo.xsd b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/resources/ipo.xsd
index 5468542693..5468542693 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/resources/ipo.xsd
diff --git a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/resources/model/sca-core.xsd b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/resources/model/sca-core.xsd
index 56c6977254..56c6977254 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/resources/model/sca-core.xsd
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/resources/model/sca-core.xsd
diff --git a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd
index bbaf58f00c..bbaf58f00c 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd
diff --git a/branches/pre-spec-changes/services/databinding/databinding-test/.ruleset b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/.ruleset
index e615e93a4b..e615e93a4b 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-test/.ruleset
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/.ruleset
diff --git a/branches/pre-spec-changes/services/databinding/databinding-test/LICENSE.txt b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/LICENSE.txt
index d645695673..d645695673 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-test/LICENSE.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/LICENSE.txt
diff --git a/branches/pre-spec-changes/services/databinding/databinding-test/NOTICE.txt b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/NOTICE.txt
index d83ebbe236..d83ebbe236 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-test/NOTICE.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/NOTICE.txt
diff --git a/branches/pre-spec-changes/services/databinding/databinding-test/pom.xml b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/pom.xml
index 37386075a0..37386075a0 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-test/pom.xml
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/pom.xml
diff --git a/branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/JAXBTestCase.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/JAXBTestCase.java
index 894bee16e4..894bee16e4 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/JAXBTestCase.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/JAXBTestCase.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/TransformationTestCase.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/TransformationTestCase.java
index 613bcd9cf8..613bcd9cf8 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/TransformationTestCase.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/TransformationTestCase.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/XmlObjectTestCase.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/XmlObjectTestCase.java
index 78d51352cb..78d51352cb 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/XmlObjectTestCase.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/XmlObjectTestCase.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/Client.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/Client.java
index 8ddc625d66..8ddc625d66 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/Client.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/Client.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/ClientImpl.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/ClientImpl.java
index 2d33a8666b..2d33a8666b 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/ClientImpl.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/ClientImpl.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/DataBindingBootStrapTest.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/DataBindingBootStrapTest.java
index ff44dfb68d..ff44dfb68d 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/DataBindingBootStrapTest.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/DataBindingBootStrapTest.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/Echo.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/Echo.java
index c44e575e26..c44e575e26 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/Echo.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/Echo.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/EchoImpl.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/EchoImpl.java
index 775c0317a4..775c0317a4 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/EchoImpl.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/java/org/apache/tuscany/databinding/sample/EchoImpl.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/META-INF/sca/default.scdl b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/META-INF/sca/default.scdl
index 7e4ed88498..7e4ed88498 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/META-INF/sca/default.scdl
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/META-INF/sca/default.scdl
diff --git a/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/META-INF/tuscany/databinding.axiom.scdl b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/META-INF/tuscany/databinding.axiom.scdl
index e4fe956e61..e4fe956e61 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/META-INF/tuscany/databinding.axiom.scdl
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/META-INF/tuscany/databinding.axiom.scdl
diff --git a/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/META-INF/tuscany/databinding.jaxb.scdl b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/META-INF/tuscany/databinding.jaxb.scdl
index 3b7cd0c32a..3b7cd0c32a 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/META-INF/tuscany/databinding.jaxb.scdl
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/META-INF/tuscany/databinding.jaxb.scdl
diff --git a/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/META-INF/tuscany/databinding.sdo.scdl b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/META-INF/tuscany/databinding.sdo.scdl
index 36577487ba..36577487ba 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/META-INF/tuscany/databinding.sdo.scdl
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/META-INF/tuscany/databinding.sdo.scdl
diff --git a/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/META-INF/tuscany/databinding.xmlbeans.scdl b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/META-INF/tuscany/databinding.xmlbeans.scdl
index 2cadfbbca1..2cadfbbca1 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/META-INF/tuscany/databinding.xmlbeans.scdl
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/META-INF/tuscany/databinding.xmlbeans.scdl
diff --git a/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/META-INF/tuscany/interface.wsdl.scdl b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/META-INF/tuscany/interface.wsdl.scdl
index 9a15675f9f..9a15675f9f 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/META-INF/tuscany/interface.wsdl.scdl
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/META-INF/tuscany/interface.wsdl.scdl
diff --git a/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/META-INF/tuscany/test-extensions.scdl b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/META-INF/tuscany/test-extensions.scdl
index 88bb3b856d..88bb3b856d 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/META-INF/tuscany/test-extensions.scdl
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/META-INF/tuscany/test-extensions.scdl
diff --git a/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/ipo.xml b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/ipo.xml
index 58058dbe1a..58058dbe1a 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/ipo.xml
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/ipo.xml
diff --git a/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/ipo.xsd b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/ipo.xsd
index 5468542693..5468542693 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/ipo.xsd
diff --git a/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/ipo.xsdconfig b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/ipo.xsdconfig
index a397182672..a397182672 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/ipo.xsdconfig
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-test/src/test/resources/ipo.xsdconfig
diff --git a/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/.ruleset b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/.ruleset
index e615e93a4b..e615e93a4b 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/.ruleset
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/.ruleset
diff --git a/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/LICENSE.txt b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/LICENSE.txt
index d645695673..d645695673 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/LICENSE.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/LICENSE.txt
diff --git a/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/NOTICE.txt b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/NOTICE.txt
index d83ebbe236..d83ebbe236 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/NOTICE.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/NOTICE.txt
diff --git a/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/pom.xml b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/pom.xml
index 9cdc7660ec..9cdc7660ec 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/pom.xml
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/pom.xml
diff --git a/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/Node2XmlObject.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/Node2XmlObject.java
index 0b4da53473..0b4da53473 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/Node2XmlObject.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/Node2XmlObject.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XMLBeansDataBinding.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XMLBeansDataBinding.java
index 12057982e4..12057982e4 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XMLBeansDataBinding.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XMLBeansDataBinding.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XMLStreamReader2XmlObject.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XMLStreamReader2XmlObject.java
index 0e61bd9571..0e61bd9571 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XMLStreamReader2XmlObject.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XMLStreamReader2XmlObject.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XmlObject2Node.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XmlObject2Node.java
index 8fc1e58bd5..8fc1e58bd5 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XmlObject2Node.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XmlObject2Node.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XmlObject2XMLStreamReader.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XmlObject2XMLStreamReader.java
index 8a12cf34f0..8a12cf34f0 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XmlObject2XMLStreamReader.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/main/java/org/apache/tuscany/databinding/xmlbeans/XmlObject2XMLStreamReader.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/main/resources/META-INF/sca/default.scdl b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/main/resources/META-INF/sca/default.scdl
index 2cadfbbca1..2cadfbbca1 100644
--- a/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/main/resources/META-INF/sca/default.scdl
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/main/resources/META-INF/sca/default.scdl
diff --git a/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/test/java/org/apache/tuscany/databinding/xmlbeans/XmlObjectTestCase.java b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/test/java/org/apache/tuscany/databinding/xmlbeans/XmlObjectTestCase.java
index 57fbae7e35..57fbae7e35 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/test/java/org/apache/tuscany/databinding/xmlbeans/XmlObjectTestCase.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/test/java/org/apache/tuscany/databinding/xmlbeans/XmlObjectTestCase.java
diff --git a/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/test/resources/ipo.xsd b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/test/resources/ipo.xsd
index 5468542693..5468542693 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/test/resources/ipo.xsd
diff --git a/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/test/resources/ipo.xsdconfig b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/test/resources/ipo.xsdconfig
index a397182672..a397182672 100755
--- a/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/test/resources/ipo.xsdconfig
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/databinding-xmlbeans/src/test/resources/ipo.xsdconfig
diff --git a/branches/pre-spec-changes/services/databinding/pom.xml b/sca-java-1.x/branches/pre-spec-changes/services/databinding/pom.xml
index af5af8c5f0..af5af8c5f0 100644
--- a/branches/pre-spec-changes/services/databinding/pom.xml
+++ b/sca-java-1.x/branches/pre-spec-changes/services/databinding/pom.xml
diff --git a/branches/pre-spec-changes/services/idl/pom.xml b/sca-java-1.x/branches/pre-spec-changes/services/idl/pom.xml
index 7c46142a9f..7c46142a9f 100644
--- a/branches/pre-spec-changes/services/idl/pom.xml
+++ b/sca-java-1.x/branches/pre-spec-changes/services/idl/pom.xml
diff --git a/branches/pre-spec-changes/services/idl/wsdl/.ruleset b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/.ruleset
index 3886f07f2d..3886f07f2d 100644
--- a/branches/pre-spec-changes/services/idl/wsdl/.ruleset
+++ b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/.ruleset
diff --git a/branches/pre-spec-changes/services/idl/wsdl/LICENSE.txt b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/LICENSE.txt
index 0084319535..0084319535 100644
--- a/branches/pre-spec-changes/services/idl/wsdl/LICENSE.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/LICENSE.txt
diff --git a/branches/pre-spec-changes/services/idl/wsdl/NOTICE.txt b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/NOTICE.txt
index d83ebbe236..d83ebbe236 100644
--- a/branches/pre-spec-changes/services/idl/wsdl/NOTICE.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/NOTICE.txt
diff --git a/branches/pre-spec-changes/services/idl/wsdl/pom.xml b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/pom.xml
index 69a2577256..69a2577256 100644
--- a/branches/pre-spec-changes/services/idl/wsdl/pom.xml
+++ b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/pom.xml
diff --git a/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLIntrospector.java b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLIntrospector.java
index 1b9326acab..1b9326acab 100644
--- a/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLIntrospector.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLIntrospector.java
diff --git a/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLIntrospectorImpl.java b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLIntrospectorImpl.java
index bbfb3b3d01..bbfb3b3d01 100644
--- a/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLIntrospectorImpl.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLIntrospectorImpl.java
diff --git a/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLLoader.java b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLLoader.java
index fc2de45eb3..fc2de45eb3 100644
--- a/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLLoader.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLLoader.java
diff --git a/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InvalidFragmentException.java b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InvalidFragmentException.java
index a629ff4fbb..a629ff4fbb 100644
--- a/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InvalidFragmentException.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InvalidFragmentException.java
diff --git a/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InvalidWSDLException.java b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InvalidWSDLException.java
index a22ab92863..a22ab92863 100644
--- a/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InvalidWSDLException.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InvalidWSDLException.java
diff --git a/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InvalidWSDLLocationException.java b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InvalidWSDLLocationException.java
index b2d77bf52f..b2d77bf52f 100644
--- a/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InvalidWSDLLocationException.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InvalidWSDLLocationException.java
diff --git a/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/NotSupportedWSDLException.java b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/NotSupportedWSDLException.java
index 04cea4cefd..04cea4cefd 100644
--- a/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/NotSupportedWSDLException.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/NotSupportedWSDLException.java
diff --git a/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/UnresolveableResourceException.java b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/UnresolveableResourceException.java
index afb4ed3d40..afb4ed3d40 100644
--- a/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/UnresolveableResourceException.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/UnresolveableResourceException.java
diff --git a/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistry.java b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistry.java
index 0694811f0d..0694811f0d 100644
--- a/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistry.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistry.java
diff --git a/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistryImpl.java b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistryImpl.java
index 976a09caca..976a09caca 100644
--- a/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistryImpl.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistryImpl.java
diff --git a/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLLoader.java b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLLoader.java
index fb90e839f5..fb90e839f5 100644
--- a/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLLoader.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLLoader.java
diff --git a/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLLoaderException.java b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLLoaderException.java
index 1fececa62c..1fececa62c 100644
--- a/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLLoaderException.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLLoaderException.java
diff --git a/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLLoaderImpl.java b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLLoaderImpl.java
index ebf8cafedc..ebf8cafedc 100644
--- a/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLLoaderImpl.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLLoaderImpl.java
diff --git a/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLLocation.java b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLLocation.java
index a124294c3a..a124294c3a 100644
--- a/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLLocation.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLLocation.java
diff --git a/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLOperation.java b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLOperation.java
index c8d26a5626..c8d26a5626 100644
--- a/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLOperation.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLOperation.java
diff --git a/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLServiceContract.java b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLServiceContract.java
index 868ad0f3b4..868ad0f3b4 100644
--- a/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLServiceContract.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLServiceContract.java
diff --git a/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/XMLSchemaRegistry.java b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/XMLSchemaRegistry.java
index 681e08be4d..681e08be4d 100644
--- a/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/XMLSchemaRegistry.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/XMLSchemaRegistry.java
diff --git a/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/XMLSchemaRegistryImpl.java b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/XMLSchemaRegistryImpl.java
index 08600e4b7e..08600e4b7e 100644
--- a/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/XMLSchemaRegistryImpl.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/XMLSchemaRegistryImpl.java
diff --git a/branches/pre-spec-changes/services/idl/wsdl/src/main/resources/META-INF/sca/default.scdl b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/resources/META-INF/sca/default.scdl
index 99dd44b11e..99dd44b11e 100644
--- a/branches/pre-spec-changes/services/idl/wsdl/src/main/resources/META-INF/sca/default.scdl
+++ b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/resources/META-INF/sca/default.scdl
diff --git a/branches/pre-spec-changes/services/idl/wsdl/src/main/resources/META-INF/sca/idl.wsdl.scdl b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/resources/META-INF/sca/idl.wsdl.scdl
index be1cf749dd..be1cf749dd 100644
--- a/branches/pre-spec-changes/services/idl/wsdl/src/main/resources/META-INF/sca/idl.wsdl.scdl
+++ b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/main/resources/META-INF/sca/idl.wsdl.scdl
diff --git a/branches/pre-spec-changes/services/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLIntrospectorImplTestCase.java b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLIntrospectorImplTestCase.java
index 8f263607e0..8f263607e0 100644
--- a/branches/pre-spec-changes/services/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLIntrospectorImplTestCase.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLIntrospectorImplTestCase.java
diff --git a/branches/pre-spec-changes/services/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistryTestCase.java b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistryTestCase.java
index a7d7457f76..a7d7457f76 100644
--- a/branches/pre-spec-changes/services/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistryTestCase.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistryTestCase.java
diff --git a/branches/pre-spec-changes/services/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/WSDLLoaderImplTestCase.java b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/WSDLLoaderImplTestCase.java
index c05cf9770f..c05cf9770f 100644
--- a/branches/pre-spec-changes/services/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/WSDLLoaderImplTestCase.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/WSDLLoaderImplTestCase.java
diff --git a/branches/pre-spec-changes/services/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/WSDLOperationTestCase.java b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/WSDLOperationTestCase.java
index cdb4c529ef..cdb4c529ef 100644
--- a/branches/pre-spec-changes/services/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/WSDLOperationTestCase.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/WSDLOperationTestCase.java
diff --git a/branches/pre-spec-changes/services/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/WrapperStyleOperationTestCase.java b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/WrapperStyleOperationTestCase.java
index 748c790297..748c790297 100644
--- a/branches/pre-spec-changes/services/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/WrapperStyleOperationTestCase.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/WrapperStyleOperationTestCase.java
diff --git a/branches/pre-spec-changes/services/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/XMLSchemaRegistryImplTestCase.java b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/XMLSchemaRegistryImplTestCase.java
index 60433d3bc1..60433d3bc1 100644
--- a/branches/pre-spec-changes/services/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/XMLSchemaRegistryImplTestCase.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/test/java/org/apache/tuscany/idl/wsdl/XMLSchemaRegistryImplTestCase.java
diff --git a/branches/pre-spec-changes/services/idl/wsdl/src/test/resources/org/apache/tuscany/idl/wsdl/example.wsdl b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/test/resources/org/apache/tuscany/idl/wsdl/example.wsdl
index 5e8e5dad0d..5e8e5dad0d 100644
--- a/branches/pre-spec-changes/services/idl/wsdl/src/test/resources/org/apache/tuscany/idl/wsdl/example.wsdl
+++ b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/test/resources/org/apache/tuscany/idl/wsdl/example.wsdl
diff --git a/branches/pre-spec-changes/services/idl/wsdl/src/test/resources/org/apache/tuscany/idl/wsdl/invalid-stockquote.wsdl b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/test/resources/org/apache/tuscany/idl/wsdl/invalid-stockquote.wsdl
index 38f9cb05d2..38f9cb05d2 100644
--- a/branches/pre-spec-changes/services/idl/wsdl/src/test/resources/org/apache/tuscany/idl/wsdl/invalid-stockquote.wsdl
+++ b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/test/resources/org/apache/tuscany/idl/wsdl/invalid-stockquote.wsdl
diff --git a/branches/pre-spec-changes/services/idl/wsdl/src/test/resources/org/apache/tuscany/idl/wsdl/ipo.xsd b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/test/resources/org/apache/tuscany/idl/wsdl/ipo.xsd
index 5468542693..5468542693 100644
--- a/branches/pre-spec-changes/services/idl/wsdl/src/test/resources/org/apache/tuscany/idl/wsdl/ipo.xsd
+++ b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/test/resources/org/apache/tuscany/idl/wsdl/ipo.xsd
diff --git a/branches/pre-spec-changes/services/idl/wsdl/src/test/resources/org/apache/tuscany/idl/wsdl/stockquote.wsdl b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/test/resources/org/apache/tuscany/idl/wsdl/stockquote.wsdl
index 7be1c896a3..7be1c896a3 100644
--- a/branches/pre-spec-changes/services/idl/wsdl/src/test/resources/org/apache/tuscany/idl/wsdl/stockquote.wsdl
+++ b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/test/resources/org/apache/tuscany/idl/wsdl/stockquote.wsdl
diff --git a/branches/pre-spec-changes/services/idl/wsdl/src/test/resources/org/apache/tuscany/idl/wsdl/unwrapped-stockquote.wsdl b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/test/resources/org/apache/tuscany/idl/wsdl/unwrapped-stockquote.wsdl
index 2fade0036c..2fade0036c 100644
--- a/branches/pre-spec-changes/services/idl/wsdl/src/test/resources/org/apache/tuscany/idl/wsdl/unwrapped-stockquote.wsdl
+++ b/sca-java-1.x/branches/pre-spec-changes/services/idl/wsdl/src/test/resources/org/apache/tuscany/idl/wsdl/unwrapped-stockquote.wsdl
diff --git a/branches/pre-spec-changes/services/management/jmx/LICENSE.txt b/sca-java-1.x/branches/pre-spec-changes/services/management/jmx/LICENSE.txt
index 0084319535..0084319535 100644
--- a/branches/pre-spec-changes/services/management/jmx/LICENSE.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/services/management/jmx/LICENSE.txt
diff --git a/branches/pre-spec-changes/services/management/jmx/NOTICE.txt b/sca-java-1.x/branches/pre-spec-changes/services/management/jmx/NOTICE.txt
index d83ebbe236..d83ebbe236 100644
--- a/branches/pre-spec-changes/services/management/jmx/NOTICE.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/services/management/jmx/NOTICE.txt
diff --git a/branches/pre-spec-changes/services/management/jmx/pom.xml b/sca-java-1.x/branches/pre-spec-changes/services/management/jmx/pom.xml
index ef6a4313b3..ef6a4313b3 100644
--- a/branches/pre-spec-changes/services/management/jmx/pom.xml
+++ b/sca-java-1.x/branches/pre-spec-changes/services/management/jmx/pom.xml
diff --git a/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxException.java b/sca-java-1.x/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxException.java
index 5b50affdf2..5b50affdf2 100644
--- a/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxException.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxException.java
diff --git a/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxManagementService.java b/sca-java-1.x/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxManagementService.java
index 2905a50c54..2905a50c54 100644
--- a/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxManagementService.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxManagementService.java
diff --git a/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/AbstractAgent.java b/sca-java-1.x/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/AbstractAgent.java
index 0172b15d8c..0172b15d8c 100644
--- a/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/AbstractAgent.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/AbstractAgent.java
diff --git a/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/Agent.java b/sca-java-1.x/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/Agent.java
index 30727e21bf..30727e21bf 100644
--- a/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/Agent.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/Agent.java
diff --git a/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/ManagementException.java b/sca-java-1.x/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/ManagementException.java
index 6ff8c14ac6..6ff8c14ac6 100644
--- a/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/ManagementException.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/ManagementException.java
diff --git a/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/RmiAgent.java b/sca-java-1.x/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/RmiAgent.java
index 593f6fec90..593f6fec90 100644
--- a/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/RmiAgent.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/RmiAgent.java
diff --git a/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/AnnotationDrivenDynamicMBean.java b/sca-java-1.x/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/AnnotationDrivenDynamicMBean.java
index 3d16ff6a2a..3d16ff6a2a 100644
--- a/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/AnnotationDrivenDynamicMBean.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/AnnotationDrivenDynamicMBean.java
diff --git a/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/InstrumentationException.java b/sca-java-1.x/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/InstrumentationException.java
index a8ad1666d5..a8ad1666d5 100644
--- a/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/InstrumentationException.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/InstrumentationException.java
diff --git a/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/InstrumentedComponent.java b/sca-java-1.x/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/InstrumentedComponent.java
index 1ef33c8bc9..1ef33c8bc9 100644
--- a/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/InstrumentedComponent.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/InstrumentedComponent.java
diff --git a/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/ReflectedDynamicMBean.java b/sca-java-1.x/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/ReflectedDynamicMBean.java
index b07787208c..b07787208c 100644
--- a/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/ReflectedDynamicMBean.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/ReflectedDynamicMBean.java
diff --git a/branches/pre-spec-changes/services/management/pom.xml b/sca-java-1.x/branches/pre-spec-changes/services/management/pom.xml
index d652189c7e..d652189c7e 100644
--- a/branches/pre-spec-changes/services/management/pom.xml
+++ b/sca-java-1.x/branches/pre-spec-changes/services/management/pom.xml
diff --git a/branches/pre-spec-changes/services/maven/LICENSE.txt b/sca-java-1.x/branches/pre-spec-changes/services/maven/LICENSE.txt
index 75b52484ea..75b52484ea 100644
--- a/branches/pre-spec-changes/services/maven/LICENSE.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/services/maven/LICENSE.txt
diff --git a/branches/pre-spec-changes/services/maven/NOTICE.txt b/sca-java-1.x/branches/pre-spec-changes/services/maven/NOTICE.txt
index ecc68a9614..ecc68a9614 100644
--- a/branches/pre-spec-changes/services/maven/NOTICE.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/services/maven/NOTICE.txt
diff --git a/branches/pre-spec-changes/services/maven/pom.xml b/sca-java-1.x/branches/pre-spec-changes/services/maven/pom.xml
index eafc73e392..eafc73e392 100644
--- a/branches/pre-spec-changes/services/maven/pom.xml
+++ b/sca-java-1.x/branches/pre-spec-changes/services/maven/pom.xml
diff --git a/branches/pre-spec-changes/services/maven/src/main/java/org/apache/tuscany/services/maven/MavenArtifactRepository.java b/sca-java-1.x/branches/pre-spec-changes/services/maven/src/main/java/org/apache/tuscany/services/maven/MavenArtifactRepository.java
index 394ccae97c..394ccae97c 100644
--- a/branches/pre-spec-changes/services/maven/src/main/java/org/apache/tuscany/services/maven/MavenArtifactRepository.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/maven/src/main/java/org/apache/tuscany/services/maven/MavenArtifactRepository.java
diff --git a/branches/pre-spec-changes/services/maven/src/main/java/org/apache/tuscany/services/maven/MavenHelper.java b/sca-java-1.x/branches/pre-spec-changes/services/maven/src/main/java/org/apache/tuscany/services/maven/MavenHelper.java
index f82756afbd..f82756afbd 100644
--- a/branches/pre-spec-changes/services/maven/src/main/java/org/apache/tuscany/services/maven/MavenHelper.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/maven/src/main/java/org/apache/tuscany/services/maven/MavenHelper.java
diff --git a/branches/pre-spec-changes/services/maven/src/main/java/org/apache/tuscany/services/maven/TuscanyDependencyException.java b/sca-java-1.x/branches/pre-spec-changes/services/maven/src/main/java/org/apache/tuscany/services/maven/TuscanyDependencyException.java
index a7817ff3be..a7817ff3be 100644
--- a/branches/pre-spec-changes/services/maven/src/main/java/org/apache/tuscany/services/maven/TuscanyDependencyException.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/maven/src/main/java/org/apache/tuscany/services/maven/TuscanyDependencyException.java
diff --git a/branches/pre-spec-changes/services/maven/src/main/java/org/apache/tuscany/services/maven/WarRepositoryHelper.java b/sca-java-1.x/branches/pre-spec-changes/services/maven/src/main/java/org/apache/tuscany/services/maven/WarRepositoryHelper.java
index 6b3ba3ed10..6b3ba3ed10 100644
--- a/branches/pre-spec-changes/services/maven/src/main/java/org/apache/tuscany/services/maven/WarRepositoryHelper.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/maven/src/main/java/org/apache/tuscany/services/maven/WarRepositoryHelper.java
diff --git a/branches/pre-spec-changes/services/maven/src/test/java/org/apache/tuscany/services/maven/MavenArtifactRepositoryTestCase.java b/sca-java-1.x/branches/pre-spec-changes/services/maven/src/test/java/org/apache/tuscany/services/maven/MavenArtifactRepositoryTestCase.java
index b4e9babd05..b4e9babd05 100644
--- a/branches/pre-spec-changes/services/maven/src/test/java/org/apache/tuscany/services/maven/MavenArtifactRepositoryTestCase.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/maven/src/test/java/org/apache/tuscany/services/maven/MavenArtifactRepositoryTestCase.java
diff --git a/branches/pre-spec-changes/services/maven/src/test/java/org/apache/tuscany/services/maven/WarRepositoryHelperTestCase.java b/sca-java-1.x/branches/pre-spec-changes/services/maven/src/test/java/org/apache/tuscany/services/maven/WarRepositoryHelperTestCase.java
index 3a79599fa7..3a79599fa7 100644
--- a/branches/pre-spec-changes/services/maven/src/test/java/org/apache/tuscany/services/maven/WarRepositoryHelperTestCase.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/maven/src/test/java/org/apache/tuscany/services/maven/WarRepositoryHelperTestCase.java
diff --git a/branches/pre-spec-changes/services/maven/src/test/resources/webapp.war b/sca-java-1.x/branches/pre-spec-changes/services/maven/src/test/resources/webapp.war
index 4448aca8ff..4448aca8ff 100644
--- a/branches/pre-spec-changes/services/maven/src/test/resources/webapp.war
+++ b/sca-java-1.x/branches/pre-spec-changes/services/maven/src/test/resources/webapp.war
Binary files differ
diff --git a/branches/pre-spec-changes/services/plugins/plugin.itest/LICENSE.txt b/sca-java-1.x/branches/pre-spec-changes/services/plugins/plugin.itest/LICENSE.txt
index 9601ead3f6..9601ead3f6 100644
--- a/branches/pre-spec-changes/services/plugins/plugin.itest/LICENSE.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/services/plugins/plugin.itest/LICENSE.txt
diff --git a/branches/pre-spec-changes/services/plugins/plugin.itest/NOTICE.txt b/sca-java-1.x/branches/pre-spec-changes/services/plugins/plugin.itest/NOTICE.txt
index d83ebbe236..d83ebbe236 100644
--- a/branches/pre-spec-changes/services/plugins/plugin.itest/NOTICE.txt
+++ b/sca-java-1.x/branches/pre-spec-changes/services/plugins/plugin.itest/NOTICE.txt
diff --git a/branches/pre-spec-changes/services/plugins/plugin.itest/pom.xml b/sca-java-1.x/branches/pre-spec-changes/services/plugins/plugin.itest/pom.xml
index d6c2c35617..d6c2c35617 100644
--- a/branches/pre-spec-changes/services/plugins/plugin.itest/pom.xml
+++ b/sca-java-1.x/branches/pre-spec-changes/services/plugins/plugin.itest/pom.xml
diff --git a/branches/pre-spec-changes/services/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/Dependency.java b/sca-java-1.x/branches/pre-spec-changes/services/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/Dependency.java
index 8f8934488a..8f8934488a 100644
--- a/branches/pre-spec-changes/services/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/Dependency.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/Dependency.java
diff --git a/branches/pre-spec-changes/services/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenEmbeddedRuntime.java b/sca-java-1.x/branches/pre-spec-changes/services/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenEmbeddedRuntime.java
index fda97c8a64..fda97c8a64 100644
--- a/branches/pre-spec-changes/services/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenEmbeddedRuntime.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenEmbeddedRuntime.java
diff --git a/branches/pre-spec-changes/services/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenRuntimeInfo.java b/sca-java-1.x/branches/pre-spec-changes/services/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenRuntimeInfo.java
index 60dfeb604d..60dfeb604d 100644
--- a/branches/pre-spec-changes/services/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenRuntimeInfo.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenRuntimeInfo.java
diff --git a/branches/pre-spec-changes/services/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/TuscanyITestMojo.java b/sca-java-1.x/branches/pre-spec-changes/services/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/TuscanyITestMojo.java
index 935dd95d2f..935dd95d2f 100644
--- a/branches/pre-spec-changes/services/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/TuscanyITestMojo.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/TuscanyITestMojo.java
diff --git a/branches/pre-spec-changes/services/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/TuscanyStartMojo.java b/sca-java-1.x/branches/pre-spec-changes/services/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/TuscanyStartMojo.java
index 178561b870..178561b870 100644
--- a/branches/pre-spec-changes/services/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/TuscanyStartMojo.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/TuscanyStartMojo.java
diff --git a/branches/pre-spec-changes/services/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/TuscanyStopMojo.java b/sca-java-1.x/branches/pre-spec-changes/services/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/TuscanyStopMojo.java
index 46bde33d5a..46bde33d5a 100644
--- a/branches/pre-spec-changes/services/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/TuscanyStopMojo.java
+++ b/sca-java-1.x/branches/pre-spec-changes/services/plugins/plugin.itest/src/main/java/org/apache/tuscany/sca/plugin/itest/TuscanyStopMojo.java
diff --git a/branches/pre-spec-changes/services/plugins/plugin.itest/src/main/resources/META-INF/tuscany/embeddedMaven.scdl b/sca-java-1.x/branches/pre-spec-changes/services/plugins/plugin.itest/src/main/resources/META-INF/tuscany/embeddedMaven.scdl
index 5b3eeca646..5b3eeca646 100644
--- a/branches/pre-spec-changes/services/plugins/plugin.itest/src/main/resources/META-INF/tuscany/embeddedMaven.scdl
+++ b/sca-java-1.x/branches/pre-spec-changes/services/plugins/plugin.itest/src/main/resources/META-INF/tuscany/embeddedMaven.scdl
diff --git a/branches/pre-spec-changes/services/plugins/pom.xml b/sca-java-1.x/branches/pre-spec-changes/services/plugins/pom.xml
index a1e32c4000..a1e32c4000 100644
--- a/branches/pre-spec-changes/services/plugins/pom.xml
+++ b/sca-java-1.x/branches/pre-spec-changes/services/plugins/pom.xml
diff --git a/branches/pre-spec-changes/services/pom.xml b/sca-java-1.x/branches/pre-spec-changes/services/pom.xml
index b95f7d4dda..b95f7d4dda 100644
--- a/branches/pre-spec-changes/services/pom.xml
+++ b/sca-java-1.x/branches/pre-spec-changes/services/pom.xml