2279 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-java-0.90/distribution/bundle/pom.xml b/sca-java-1.x/branches/sca-java-0.90/distribution/bundle/pom.xml
index f65fb7d788..f65fb7d788 100644
--- a/branches/sca-java-0.90/distribution/bundle/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/distribution/bundle/pom.xml
diff --git a/branches/sca-java-0.90/distribution/manifest/pom.xml b/sca-java-1.x/branches/sca-java-0.90/distribution/manifest/pom.xml
index a94e936725..a94e936725 100644
--- a/branches/sca-java-0.90/distribution/manifest/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/distribution/manifest/pom.xml
diff --git a/branches/sca-java-0.90/distribution/pom.xml b/sca-java-1.x/branches/sca-java-0.90/distribution/pom.xml
index 502fcf3183..502fcf3183 100644
--- a/branches/sca-java-0.90/distribution/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/distribution/pom.xml
diff --git a/branches/sca-java-0.90/distribution/src/main/assembly/bin.xml b/sca-java-1.x/branches/sca-java-0.90/distribution/src/main/assembly/bin.xml
index 0b89611e16..0b89611e16 100644
--- a/branches/sca-java-0.90/distribution/src/main/assembly/bin.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/distribution/src/main/assembly/bin.xml
diff --git a/branches/sca-java-0.90/distribution/src/main/assembly/src.xml b/sca-java-1.x/branches/sca-java-0.90/distribution/src/main/assembly/src.xml
index dc519c891b..dc519c891b 100644
--- a/branches/sca-java-0.90/distribution/src/main/assembly/src.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/distribution/src/main/assembly/src.xml
diff --git a/branches/sca-java-0.90/distribution/src/main/release/CHANGES b/sca-java-1.x/branches/sca-java-0.90/distribution/src/main/release/CHANGES
index e3ebeeabd3..e3ebeeabd3 100644
--- a/branches/sca-java-0.90/distribution/src/main/release/CHANGES
+++ b/sca-java-1.x/branches/sca-java-0.90/distribution/src/main/release/CHANGES
diff --git a/branches/sca-java-0.90/distribution/src/main/release/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/distribution/src/main/release/DISCLAIMER
index a65af91c5a..a65af91c5a 100644
--- a/branches/sca-java-0.90/distribution/src/main/release/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/distribution/src/main/release/DISCLAIMER
diff --git a/branches/sca-java-0.90/distribution/src/main/release/README b/sca-java-1.x/branches/sca-java-0.90/distribution/src/main/release/README
index 94c8e61cb8..94c8e61cb8 100644
--- a/branches/sca-java-0.90/distribution/src/main/release/README
+++ b/sca-java-1.x/branches/sca-java-0.90/distribution/src/main/release/README
diff --git a/branches/sca-java-0.90/distribution/src/main/release/RELEASE_NOTES b/sca-java-1.x/branches/sca-java-0.90/distribution/src/main/release/RELEASE_NOTES
index 1d7e2f79b0..1d7e2f79b0 100644
--- a/branches/sca-java-0.90/distribution/src/main/release/RELEASE_NOTES
+++ b/sca-java-1.x/branches/sca-java-0.90/distribution/src/main/release/RELEASE_NOTES
diff --git a/branches/sca-java-0.90/distribution/src/main/release/bin/INSTALL b/sca-java-1.x/branches/sca-java-0.90/distribution/src/main/release/bin/INSTALL
index 5d8263c7f5..5d8263c7f5 100644
--- a/branches/sca-java-0.90/distribution/src/main/release/bin/INSTALL
+++ b/sca-java-1.x/branches/sca-java-0.90/distribution/src/main/release/bin/INSTALL
diff --git a/branches/sca-java-0.90/distribution/src/main/release/bin/LICENSE b/sca-java-1.x/branches/sca-java-0.90/distribution/src/main/release/bin/LICENSE
index 4bb604759f..4bb604759f 100644
--- a/branches/sca-java-0.90/distribution/src/main/release/bin/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/distribution/src/main/release/bin/LICENSE
diff --git a/branches/sca-java-0.90/distribution/src/main/release/bin/NOTICE b/sca-java-1.x/branches/sca-java-0.90/distribution/src/main/release/bin/NOTICE
index db953ef8c6..db953ef8c6 100644
--- a/branches/sca-java-0.90/distribution/src/main/release/bin/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/distribution/src/main/release/bin/NOTICE
diff --git a/branches/sca-java-0.90/distribution/src/main/release/src/BUILDING b/sca-java-1.x/branches/sca-java-0.90/distribution/src/main/release/src/BUILDING
index 7d02d6e1aa..7d02d6e1aa 100644
--- a/branches/sca-java-0.90/distribution/src/main/release/src/BUILDING
+++ b/sca-java-1.x/branches/sca-java-0.90/distribution/src/main/release/src/BUILDING
diff --git a/branches/sca-java-0.90/distribution/src/main/release/src/LICENSE b/sca-java-1.x/branches/sca-java-0.90/distribution/src/main/release/src/LICENSE
index 1f6ff4894f..1f6ff4894f 100644
--- a/branches/sca-java-0.90/distribution/src/main/release/src/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/distribution/src/main/release/src/LICENSE
diff --git a/branches/sca-java-0.90/distribution/src/main/release/src/NOTICE b/sca-java-1.x/branches/sca-java-0.90/distribution/src/main/release/src/NOTICE
index 206e2e5a1d..206e2e5a1d 100644
--- a/branches/sca-java-0.90/distribution/src/main/release/src/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/distribution/src/main/release/src/NOTICE
diff --git a/branches/sca-java-0.90/distribution/src/main/xsl/srcbuild_paths.xsl b/sca-java-1.x/branches/sca-java-0.90/distribution/src/main/xsl/srcbuild_paths.xsl
index ab7a40b94a..ab7a40b94a 100644
--- a/branches/sca-java-0.90/distribution/src/main/xsl/srcbuild_paths.xsl
+++ b/sca-java-1.x/branches/sca-java-0.90/distribution/src/main/xsl/srcbuild_paths.xsl
diff --git a/branches/sca-java-0.90/itest/bindings/bindingsclient/pom.xml b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingsclient/pom.xml
index a396285f07..a396285f07 100644
--- a/branches/sca-java-0.90/itest/bindings/bindingsclient/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingsclient/pom.xml
diff --git a/branches/sca-java-0.90/itest/bindings/bindingsclient/src/main/java/org/apache/tuscany/sca/itest/SCATestToolService.java b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingsclient/src/main/java/org/apache/tuscany/sca/itest/SCATestToolService.java
index 44801846f6..44801846f6 100644
--- a/branches/sca-java-0.90/itest/bindings/bindingsclient/src/main/java/org/apache/tuscany/sca/itest/SCATestToolService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingsclient/src/main/java/org/apache/tuscany/sca/itest/SCATestToolService.java
diff --git a/branches/sca-java-0.90/itest/bindings/bindingsclient/src/main/resources/bindingsclient.composite b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingsclient/src/main/resources/bindingsclient.composite
index ca3ff6494e..ca3ff6494e 100644
--- a/branches/sca-java-0.90/itest/bindings/bindingsclient/src/main/resources/bindingsclient.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingsclient/src/main/resources/bindingsclient.composite
diff --git a/branches/sca-java-0.90/itest/bindings/bindingsclient/src/main/resources/wsdl/testtool.wsdl b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingsclient/src/main/resources/wsdl/testtool.wsdl
index 22d7070ec3..22d7070ec3 100644
--- a/branches/sca-java-0.90/itest/bindings/bindingsclient/src/main/resources/wsdl/testtool.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingsclient/src/main/resources/wsdl/testtool.wsdl
diff --git a/branches/sca-java-0.90/itest/bindings/bindingsclient/src/main/webapp/SCATestTool.jsp b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingsclient/src/main/webapp/SCATestTool.jsp
index eb219e4cef..eb219e4cef 100644
--- a/branches/sca-java-0.90/itest/bindings/bindingsclient/src/main/webapp/SCATestTool.jsp
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingsclient/src/main/webapp/SCATestTool.jsp
diff --git a/branches/sca-java-0.90/itest/bindings/bindingsclient/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingsclient/src/main/webapp/WEB-INF/web.xml
index fd58cb8b0e..fd58cb8b0e 100644
--- a/branches/sca-java-0.90/itest/bindings/bindingsclient/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingsclient/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-0.90/itest/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/SCATestToolServerTest.java b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/SCATestToolServerTest.java
index 8467074c26..8467074c26 100644
--- a/branches/sca-java-0.90/itest/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/SCATestToolServerTest.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/SCATestToolServerTest.java
diff --git a/branches/sca-java-0.90/itest/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/WSBindingsClientTestCase.java b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/WSBindingsClientTestCase.java
index b5f076b7e8..b5f076b7e8 100644
--- a/branches/sca-java-0.90/itest/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/WSBindingsClientTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/WSBindingsClientTestCase.java
diff --git a/branches/sca-java-0.90/itest/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/util/SCATestUtilityServerTest.java b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/util/SCATestUtilityServerTest.java
index 0f6cb912a7..0f6cb912a7 100644
--- a/branches/sca-java-0.90/itest/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/util/SCATestUtilityServerTest.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/util/SCATestUtilityServerTest.java
diff --git a/branches/sca-java-0.90/itest/bindings/bindingscomposite/pom.xml b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingscomposite/pom.xml
index ceb96ac6d8..ceb96ac6d8 100644
--- a/branches/sca-java-0.90/itest/bindings/bindingscomposite/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingscomposite/pom.xml
diff --git a/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCADataTypeHelper.java b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCADataTypeHelper.java
index efe30c4f4e..efe30c4f4e 100644
--- a/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCADataTypeHelper.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCADataTypeHelper.java
diff --git a/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCADataTypeHelperException.java b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCADataTypeHelperException.java
index 074fba8057..074fba8057 100644
--- a/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCADataTypeHelperException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCADataTypeHelperException.java
diff --git a/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolCallbackService.java b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolCallbackService.java
index c55e22c905..c55e22c905 100644
--- a/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolCallbackService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolCallbackService.java
diff --git a/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolServer.java b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolServer.java
index 44e799a566..44e799a566 100644
--- a/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolServer.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolServer.java
diff --git a/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolService.java b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolService.java
index 67b7e8eb64..67b7e8eb64 100644
--- a/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolService.java
diff --git a/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolServiceImpl.java
index e207a23927..e207a23927 100644
--- a/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/itest/SCATestToolServiceImpl.java
diff --git a/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityService.java b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityService.java
index 0ceb553727..0ceb553727 100644
--- a/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityService.java
diff --git a/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/resources/bindingscomposite-system.composite b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/resources/bindingscomposite-system.composite
index c288471c14..c288471c14 100644
--- a/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/resources/bindingscomposite-system.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/resources/bindingscomposite-system.composite
diff --git a/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/resources/bindingscomposite.composite b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/resources/bindingscomposite.composite
index 33f9f713c2..33f9f713c2 100644
--- a/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/resources/bindingscomposite.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/resources/bindingscomposite.composite
diff --git a/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/resources/wsdl/testtool.wsdl b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/resources/wsdl/testtool.wsdl
index 729593518d..729593518d 100644
--- a/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/resources/wsdl/testtool.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/resources/wsdl/testtool.wsdl
diff --git a/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/resources/wsdl/testutility.wsdl b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/resources/wsdl/testutility.wsdl
index 32d9050a61..32d9050a61 100644
--- a/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/resources/wsdl/testutility.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/main/resources/wsdl/testutility.wsdl
diff --git a/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/test/java/org/apache/tuscany/sca/itest/SCATestToolServerTestCase.java b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/test/java/org/apache/tuscany/sca/itest/SCATestToolServerTestCase.java
index f6fe13c112..f6fe13c112 100644
--- a/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/test/java/org/apache/tuscany/sca/itest/SCATestToolServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingscomposite/src/test/java/org/apache/tuscany/sca/itest/SCATestToolServerTestCase.java
diff --git a/branches/sca-java-0.90/itest/bindings/bindingsutility/pom.xml b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingsutility/pom.xml
index febfcf52cb..febfcf52cb 100644
--- a/branches/sca-java-0.90/itest/bindings/bindingsutility/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingsutility/pom.xml
diff --git a/branches/sca-java-0.90/itest/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/itest/SCATestToolCallbackService.java b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/itest/SCATestToolCallbackService.java
index 664fb06930..664fb06930 100644
--- a/branches/sca-java-0.90/itest/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/itest/SCATestToolCallbackService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/itest/SCATestToolCallbackService.java
diff --git a/branches/sca-java-0.90/itest/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityServer.java b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityServer.java
index cd967e275a..cd967e275a 100644
--- a/branches/sca-java-0.90/itest/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityServer.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityServer.java
diff --git a/branches/sca-java-0.90/itest/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityService.java b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityService.java
index 0ceb553727..0ceb553727 100644
--- a/branches/sca-java-0.90/itest/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityService.java
diff --git a/branches/sca-java-0.90/itest/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityServiceImpl.java
index e752e4d6e6..e752e4d6e6 100644
--- a/branches/sca-java-0.90/itest/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingsutility/src/main/java/org/apache/tuscany/sca/util/SCATestUtilityServiceImpl.java
diff --git a/branches/sca-java-0.90/itest/bindings/bindingsutility/src/main/resources/bindingsutility-system.composite b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingsutility/src/main/resources/bindingsutility-system.composite
index 7126b78572..7126b78572 100644
--- a/branches/sca-java-0.90/itest/bindings/bindingsutility/src/main/resources/bindingsutility-system.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingsutility/src/main/resources/bindingsutility-system.composite
diff --git a/branches/sca-java-0.90/itest/bindings/bindingsutility/src/main/resources/bindingsutility.composite b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingsutility/src/main/resources/bindingsutility.composite
index 6771b72442..6771b72442 100644
--- a/branches/sca-java-0.90/itest/bindings/bindingsutility/src/main/resources/bindingsutility.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingsutility/src/main/resources/bindingsutility.composite
diff --git a/branches/sca-java-0.90/itest/bindings/bindingsutility/src/main/resources/wsdl/testutility.wsdl b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingsutility/src/main/resources/wsdl/testutility.wsdl
index 32d9050a61..32d9050a61 100644
--- a/branches/sca-java-0.90/itest/bindings/bindingsutility/src/main/resources/wsdl/testutility.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingsutility/src/main/resources/wsdl/testutility.wsdl
diff --git a/branches/sca-java-0.90/itest/bindings/bindingsutility/src/test/java/org/apache/tuscany/sca/util/SCATestUtilityServerTestCase.java b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingsutility/src/test/java/org/apache/tuscany/sca/util/SCATestUtilityServerTestCase.java
index 66246fc006..66246fc006 100644
--- a/branches/sca-java-0.90/itest/bindings/bindingsutility/src/test/java/org/apache/tuscany/sca/util/SCATestUtilityServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/bindingsutility/src/test/java/org/apache/tuscany/sca/util/SCATestUtilityServerTestCase.java
diff --git a/branches/sca-java-0.90/itest/bindings/pom.xml b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/pom.xml
index 8289ede113..8289ede113 100644
--- a/branches/sca-java-0.90/itest/bindings/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/bindings/pom.xml
diff --git a/branches/sca-java-0.90/itest/callback-api/pom.xml b/sca-java-1.x/branches/sca-java-0.90/itest/callback-api/pom.xml
index 92da2ac39c..92da2ac39c 100644
--- a/branches/sca-java-0.90/itest/callback-api/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-api/pom.xml
diff --git a/branches/sca-java-0.90/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java b/sca-java-1.x/branches/sca-java-0.90/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
index 56e7ba7b3f..56e7ba7b3f 100644
--- a/branches/sca-java-0.90/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
diff --git a/branches/sca-java-0.90/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java b/sca-java-1.x/branches/sca-java-0.90/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
index 3e7c840e15..3e7c840e15 100644
--- a/branches/sca-java-0.90/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
diff --git a/branches/sca-java-0.90/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
index 1c32783271..1c32783271 100644
--- a/branches/sca-java-0.90/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
diff --git a/branches/sca-java-0.90/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java b/sca-java-1.x/branches/sca-java-0.90/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
index 51d9f24723..51d9f24723 100644
--- a/branches/sca-java-0.90/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
diff --git a/branches/sca-java-0.90/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
index 727047e42e..727047e42e 100644
--- a/branches/sca-java-0.90/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
diff --git a/branches/sca-java-0.90/itest/callback-api/src/main/resources/CallBackApiTest.composite b/sca-java-1.x/branches/sca-java-0.90/itest/callback-api/src/main/resources/CallBackApiTest.composite
index 946c4862ee..946c4862ee 100644
--- a/branches/sca-java-0.90/itest/callback-api/src/main/resources/CallBackApiTest.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-api/src/main/resources/CallBackApiTest.composite
diff --git a/branches/sca-java-0.90/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTest.java b/sca-java-1.x/branches/sca-java-0.90/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTest.java
index 892c425e48..892c425e48 100644
--- a/branches/sca-java-0.90/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTest.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTest.java
diff --git a/branches/sca-java-0.90/itest/callback-basic/pom.xml b/sca-java-1.x/branches/sca-java-0.90/itest/callback-basic/pom.xml
index 9cc75e2b44..9cc75e2b44 100644
--- a/branches/sca-java-0.90/itest/callback-basic/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-basic/pom.xml
diff --git a/branches/sca-java-0.90/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java b/sca-java-1.x/branches/sca-java-0.90/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
index ab1f39c057..ab1f39c057 100644
--- a/branches/sca-java-0.90/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
diff --git a/branches/sca-java-0.90/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java b/sca-java-1.x/branches/sca-java-0.90/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
index 9f4019f28c..9f4019f28c 100644
--- a/branches/sca-java-0.90/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
diff --git a/branches/sca-java-0.90/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
index 1bb2dc22b7..1bb2dc22b7 100644
--- a/branches/sca-java-0.90/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
diff --git a/branches/sca-java-0.90/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java b/sca-java-1.x/branches/sca-java-0.90/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
index bd41fa7037..bd41fa7037 100644
--- a/branches/sca-java-0.90/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
diff --git a/branches/sca-java-0.90/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
index 4ca2dc9af9..4ca2dc9af9 100644
--- a/branches/sca-java-0.90/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
diff --git a/branches/sca-java-0.90/itest/callback-basic/src/main/resources/CallBackBasicTest.composite b/sca-java-1.x/branches/sca-java-0.90/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
index c506956088..c506956088 100644
--- a/branches/sca-java-0.90/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
diff --git a/branches/sca-java-0.90/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java b/sca-java-1.x/branches/sca-java-0.90/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
index c01d3d3e2c..c01d3d3e2c 100644
--- a/branches/sca-java-0.90/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
diff --git a/branches/sca-java-0.90/itest/callback-complex-type/pom.xml b/sca-java-1.x/branches/sca-java-0.90/itest/callback-complex-type/pom.xml
index 010194364b..010194364b 100644
--- a/branches/sca-java-0.90/itest/callback-complex-type/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-complex-type/pom.xml
diff --git a/branches/sca-java-0.90/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java b/sca-java-1.x/branches/sca-java-0.90/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
index 70e22f4ef2..70e22f4ef2 100644
--- a/branches/sca-java-0.90/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
diff --git a/branches/sca-java-0.90/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java b/sca-java-1.x/branches/sca-java-0.90/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
index 739983c277..739983c277 100644
--- a/branches/sca-java-0.90/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
diff --git a/branches/sca-java-0.90/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
index 188b1f2c01..188b1f2c01 100644
--- a/branches/sca-java-0.90/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
diff --git a/branches/sca-java-0.90/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java b/sca-java-1.x/branches/sca-java-0.90/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
index ffbf4f35fa..ffbf4f35fa 100644
--- a/branches/sca-java-0.90/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
diff --git a/branches/sca-java-0.90/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
index dc31ed156b..dc31ed156b 100644
--- a/branches/sca-java-0.90/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
diff --git a/branches/sca-java-0.90/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite b/sca-java-1.x/branches/sca-java-0.90/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
index 3f48f16389..3f48f16389 100644
--- a/branches/sca-java-0.90/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
diff --git a/branches/sca-java-0.90/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType b/sca-java-1.x/branches/sca-java-0.90/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
index ff38134df5..ff38134df5 100644
--- a/branches/sca-java-0.90/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
diff --git a/branches/sca-java-0.90/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTest.java b/sca-java-1.x/branches/sca-java-0.90/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTest.java
index 5ea13b8981..5ea13b8981 100644
--- a/branches/sca-java-0.90/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTest.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTest.java
diff --git a/branches/sca-java-0.90/itest/callback-id/pom.xml b/sca-java-1.x/branches/sca-java-0.90/itest/callback-id/pom.xml
index c1eabad457..c1eabad457 100644
--- a/branches/sca-java-0.90/itest/callback-id/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-id/pom.xml
diff --git a/branches/sca-java-0.90/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java b/sca-java-1.x/branches/sca-java-0.90/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java
index e86c7e9ed7..e86c7e9ed7 100644
--- a/branches/sca-java-0.90/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java
diff --git a/branches/sca-java-0.90/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java b/sca-java-1.x/branches/sca-java-0.90/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java
index a9e551f8b4..a9e551f8b4 100644
--- a/branches/sca-java-0.90/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java
diff --git a/branches/sca-java-0.90/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
index 5adf64f0c6..5adf64f0c6 100644
--- a/branches/sca-java-0.90/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
diff --git a/branches/sca-java-0.90/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java b/sca-java-1.x/branches/sca-java-0.90/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java
index 18c592a1c1..18c592a1c1 100644
--- a/branches/sca-java-0.90/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java
diff --git a/branches/sca-java-0.90/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
index 16f5ec3e11..16f5ec3e11 100644
--- a/branches/sca-java-0.90/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
diff --git a/branches/sca-java-0.90/itest/callback-id/src/main/resources/CallBackIdClient.composite b/sca-java-1.x/branches/sca-java-0.90/itest/callback-id/src/main/resources/CallBackIdClient.composite
index c9a6ba6258..c9a6ba6258 100644
--- a/branches/sca-java-0.90/itest/callback-id/src/main/resources/CallBackIdClient.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-id/src/main/resources/CallBackIdClient.composite
diff --git a/branches/sca-java-0.90/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTest.java b/sca-java-1.x/branches/sca-java-0.90/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTest.java
index a86fbc9a45..a86fbc9a45 100644
--- a/branches/sca-java-0.90/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTest.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTest.java
diff --git a/branches/sca-java-0.90/itest/callback-set-callback/pom.xml b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-callback/pom.xml
index 6226917bd6..6226917bd6 100644
--- a/branches/sca-java-0.90/itest/callback-set-callback/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-callback/pom.xml
diff --git a/branches/sca-java-0.90/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java
index b352a2f1f7..b352a2f1f7 100644
--- a/branches/sca-java-0.90/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java
diff --git a/branches/sca-java-0.90/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
index 766d47c654..766d47c654 100644
--- a/branches/sca-java-0.90/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
diff --git a/branches/sca-java-0.90/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java
index 26a6ecc879..26a6ecc879 100644
--- a/branches/sca-java-0.90/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java
diff --git a/branches/sca-java-0.90/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java
index 0a22b0e01f..0a22b0e01f 100644
--- a/branches/sca-java-0.90/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java
diff --git a/branches/sca-java-0.90/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java
index 94cb6aa73b..94cb6aa73b 100644
--- a/branches/sca-java-0.90/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java
diff --git a/branches/sca-java-0.90/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
index 9fafb05835..9fafb05835 100644
--- a/branches/sca-java-0.90/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
diff --git a/branches/sca-java-0.90/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java
index afedcdf7f1..afedcdf7f1 100644
--- a/branches/sca-java-0.90/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java
diff --git a/branches/sca-java-0.90/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java
index 0eccf6e379..0eccf6e379 100644
--- a/branches/sca-java-0.90/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java
diff --git a/branches/sca-java-0.90/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite
index 3552ddecab..3552ddecab 100644
--- a/branches/sca-java-0.90/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite
diff --git a/branches/sca-java-0.90/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTest.java b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTest.java
index f977dd643f..f977dd643f 100644
--- a/branches/sca-java-0.90/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTest.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTest.java
diff --git a/branches/sca-java-0.90/itest/callback-set-conversation/pom.xml b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-conversation/pom.xml
index 3a88495594..3a88495594 100644
--- a/branches/sca-java-0.90/itest/callback-set-conversation/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-conversation/pom.xml
diff --git a/branches/sca-java-0.90/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java
index 685dd83c62..685dd83c62 100644
--- a/branches/sca-java-0.90/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java
diff --git a/branches/sca-java-0.90/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java
index 7483e834b4..7483e834b4 100644
--- a/branches/sca-java-0.90/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java
diff --git a/branches/sca-java-0.90/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java
index 013424bf5e..013424bf5e 100644
--- a/branches/sca-java-0.90/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java
diff --git a/branches/sca-java-0.90/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
index ef9d858126..ef9d858126 100644
--- a/branches/sca-java-0.90/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
diff --git a/branches/sca-java-0.90/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java
index 789e04e907..789e04e907 100644
--- a/branches/sca-java-0.90/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java
diff --git a/branches/sca-java-0.90/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java
index fead6705fd..fead6705fd 100644
--- a/branches/sca-java-0.90/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java
diff --git a/branches/sca-java-0.90/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java
index 4b0dccefdc..4b0dccefdc 100644
--- a/branches/sca-java-0.90/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java
diff --git a/branches/sca-java-0.90/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java
index 5b685e695b..5b685e695b 100644
--- a/branches/sca-java-0.90/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java
diff --git a/branches/sca-java-0.90/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite
index ce73417f94..ce73417f94 100644
--- a/branches/sca-java-0.90/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite
diff --git a/branches/sca-java-0.90/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTest.java b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTest.java
index e9113a8766..e9113a8766 100644
--- a/branches/sca-java-0.90/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTest.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTest.java
diff --git a/branches/sca-java-0.90/itest/contribution/pom.xml b/sca-java-1.x/branches/sca-java-0.90/itest/contribution/pom.xml
index 57359aa667..57359aa667 100644
--- a/branches/sca-java-0.90/itest/contribution/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/contribution/pom.xml
diff --git a/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/AddService.java
index 6392676e76..6392676e76 100644
--- a/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/AddServiceImpl.java
index e9c635e3c8..e9c635e3c8 100644
--- a/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/CalculatorClient.java
index 40ca4d9b0f..40ca4d9b0f 100644
--- a/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/CalculatorService.java
index ad87375529..ad87375529 100644
--- a/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
index ae4ed12b7b..ae4ed12b7b 100644
--- a/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/DivideService.java
index 3158458b5e..3158458b5e 100644
--- a/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/MultiplyService.java
index 62db05175e..62db05175e 100644
--- a/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/SubtractService.java
index 309f88f098..309f88f098 100644
--- a/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-0.90/itest/contribution/src/main/resources/ContributionTest.composite b/sca-java-1.x/branches/sca-java-0.90/itest/contribution/src/main/resources/ContributionTest.composite
index d814e439e2..d814e439e2 100644
--- a/branches/sca-java-0.90/itest/contribution/src/main/resources/ContributionTest.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/contribution/src/main/resources/ContributionTest.composite
diff --git a/branches/sca-java-0.90/itest/contribution/src/main/resources/calculator/Calculator.composite b/sca-java-1.x/branches/sca-java-0.90/itest/contribution/src/main/resources/calculator/Calculator.composite
index 657a2f95d8..657a2f95d8 100644
--- a/branches/sca-java-0.90/itest/contribution/src/main/resources/calculator/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/contribution/src/main/resources/calculator/Calculator.composite
diff --git a/branches/sca-java-0.90/itest/contribution/src/main/resources/calculator/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.90/itest/contribution/src/main/resources/calculator/sca-contribution.xml
index 2d31075091..2d31075091 100644
--- a/branches/sca-java-0.90/itest/contribution/src/main/resources/calculator/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/contribution/src/main/resources/calculator/sca-contribution.xml
diff --git a/branches/sca-java-0.90/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java b/sca-java-1.x/branches/sca-java-0.90/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
index 0322796417..0322796417 100644
--- a/branches/sca-java-0.90/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
diff --git a/branches/sca-java-0.90/itest/contribution/src/test/resources/deployables/sample-calculator.jar b/sca-java-1.x/branches/sca-java-0.90/itest/contribution/src/test/resources/deployables/sample-calculator.jar
index 0ca3a1b781..0ca3a1b781 100644
--- a/branches/sca-java-0.90/itest/contribution/src/test/resources/deployables/sample-calculator.jar
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/contribution/src/test/resources/deployables/sample-calculator.jar
diff --git a/branches/sca-java-0.90/itest/contribution/src/test/resources/repository/sample-calculator.jar b/sca-java-1.x/branches/sca-java-0.90/itest/contribution/src/test/resources/repository/sample-calculator.jar
index 0ca3a1b781..0ca3a1b781 100644
--- a/branches/sca-java-0.90/itest/contribution/src/test/resources/repository/sample-calculator.jar
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/contribution/src/test/resources/repository/sample-calculator.jar
diff --git a/branches/sca-java-0.90/itest/conversations/pom.xml b/sca-java-1.x/branches/sca-java-0.90/itest/conversations/pom.xml
index a00b2c8ac3..a00b2c8ac3 100644
--- a/branches/sca-java-0.90/itest/conversations/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/conversations/pom.xml
diff --git a/branches/sca-java-0.90/itest/conversations/src/main/java/org/apache/tuscany/sca/test/AnotherService.java b/sca-java-1.x/branches/sca-java-0.90/itest/conversations/src/main/java/org/apache/tuscany/sca/test/AnotherService.java
index 31786588b2..31786588b2 100644
--- a/branches/sca-java-0.90/itest/conversations/src/main/java/org/apache/tuscany/sca/test/AnotherService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/conversations/src/main/java/org/apache/tuscany/sca/test/AnotherService.java
diff --git a/branches/sca-java-0.90/itest/conversations/src/main/java/org/apache/tuscany/sca/test/AnotherServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/conversations/src/main/java/org/apache/tuscany/sca/test/AnotherServiceImpl.java
index 027109787a..027109787a 100644
--- a/branches/sca-java-0.90/itest/conversations/src/main/java/org/apache/tuscany/sca/test/AnotherServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/conversations/src/main/java/org/apache/tuscany/sca/test/AnotherServiceImpl.java
diff --git a/branches/sca-java-0.90/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsCallback.java b/sca-java-1.x/branches/sca-java-0.90/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsCallback.java
index 5eb9ba3ace..5eb9ba3ace 100644
--- a/branches/sca-java-0.90/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsCallback.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsCallback.java
diff --git a/branches/sca-java-0.90/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClient.java b/sca-java-1.x/branches/sca-java-0.90/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClient.java
index a23748bcd2..a23748bcd2 100644
--- a/branches/sca-java-0.90/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClient.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClient.java
diff --git a/branches/sca-java-0.90/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClient2.java b/sca-java-1.x/branches/sca-java-0.90/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClient2.java
index 41463fa39a..41463fa39a 100644
--- a/branches/sca-java-0.90/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClient2.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClient2.java
diff --git a/branches/sca-java-0.90/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClientImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClientImpl.java
index 00c2a1c2f5..00c2a1c2f5 100644
--- a/branches/sca-java-0.90/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClientImpl.java
diff --git a/branches/sca-java-0.90/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsLifeCycleService.java b/sca-java-1.x/branches/sca-java-0.90/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsLifeCycleService.java
index bd18b48da2..bd18b48da2 100644
--- a/branches/sca-java-0.90/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsLifeCycleService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsLifeCycleService.java
diff --git a/branches/sca-java-0.90/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsLifeCycleServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsLifeCycleServiceImpl.java
index 7f38e356f6..7f38e356f6 100644
--- a/branches/sca-java-0.90/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsLifeCycleServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsLifeCycleServiceImpl.java
diff --git a/branches/sca-java-0.90/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsService.java b/sca-java-1.x/branches/sca-java-0.90/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsService.java
index 6bdc1c5c03..6bdc1c5c03 100644
--- a/branches/sca-java-0.90/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsService.java
diff --git a/branches/sca-java-0.90/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsServiceImpl.java
index 45fc68308b..45fc68308b 100644
--- a/branches/sca-java-0.90/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsServiceImpl.java
diff --git a/branches/sca-java-0.90/itest/conversations/src/main/resources/ConversationsTest.composite b/sca-java-1.x/branches/sca-java-0.90/itest/conversations/src/main/resources/ConversationsTest.composite
index 93b44c260f..93b44c260f 100644
--- a/branches/sca-java-0.90/itest/conversations/src/main/resources/ConversationsTest.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/conversations/src/main/resources/ConversationsTest.composite
diff --git a/branches/sca-java-0.90/itest/conversations/src/test/java/org/apache/tuscany/sca/test/ConversationsTest.java b/sca-java-1.x/branches/sca-java-0.90/itest/conversations/src/test/java/org/apache/tuscany/sca/test/ConversationsTest.java
index af917d67f4..af917d67f4 100644
--- a/branches/sca-java-0.90/itest/conversations/src/test/java/org/apache/tuscany/sca/test/ConversationsTest.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/conversations/src/test/java/org/apache/tuscany/sca/test/ConversationsTest.java
diff --git a/branches/sca-java-0.90/itest/databindings/common/pom.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/pom.xml
index 9551a637f3..9551a637f3 100644
--- a/branches/sca-java-0.90/itest/databindings/common/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/pom.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java
index 73dfebb73c..73dfebb73c 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm
index b2346aa973..b2346aa973 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm
index f08d56c55a..f08d56c55a 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm
index b0e298b823..b0e298b823 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm
index ee73db6152..ee73db6152 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm
index 57827d27b9..57827d27b9 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm
index 1fd7509667..1fd7509667 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/generate/generate.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/generate/generate.xsd
index 1fabedf55f..1fabedf55f 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/generate/generate.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/generate/generate.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/wsdl/Dummy.txt b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/wsdl/Dummy.txt
index 8927d725b6..8927d725b6 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/wsdl/Dummy.txt
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/wsdl/Dummy.txt
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Annotation.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Annotation.xml
index f1f4346e58..f1f4346e58 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Annotation.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Annotation.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Annotation.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Annotation.xsd
index 1fae43eb09..1fae43eb09 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Annotation.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Annotation.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Attribute.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Attribute.xml
index c20c80b658..c20c80b658 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Attribute.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Attribute.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Attribute.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Attribute.xsd
index bd3db2e030..bd3db2e030 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Attribute.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Attribute.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml
index 30e4979dca..30e4979dca 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd
index e7738dcff7..e7738dcff7 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml
index 9552421e2d..9552421e2d 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd
index c7b9655749..c7b9655749 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml
index 5e5e7fbd55..5e5e7fbd55 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd
index 5c455c2ab5..5c455c2ab5 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml
index 635e851632..635e851632 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd
index 004dab4fbb..004dab4fbb 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml
index 136092951b..136092951b 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd
index 796f08e1cf..796f08e1cf 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml
index 927b94885c..927b94885c 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd
index 93f83cd0a1..93f83cd0a1 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml
index ea7db70595..ea7db70595 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd
index c64323e7e1..c64323e7e1 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml
index 85c7d85fd4..85c7d85fd4 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd
index 543f276c50..543f276c50 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml
index fcd281539b..fcd281539b 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd
index 1610c2b861..1610c2b861 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml
index 36a0760a61..36a0760a61 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd
index 999b72bb35..999b72bb35 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml
index 5849165fe0..5849165fe0 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd
index 71dad561ca..71dad561ca 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml
index 8acf9376d7..8acf9376d7 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd
index a49987c352..a49987c352 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml
index a35b6e174a..a35b6e174a 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd
index e1995890f9..e1995890f9 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml
index 91cfce51b8..91cfce51b8 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd
index a2f86ba8c5..a2f86ba8c5 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml
index 907474cd1b..907474cd1b 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd
index a2f6bcfa77..a2f6bcfa77 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml
index c5820e1a2e..c5820e1a2e 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd
index f4d596bfe3..f4d596bfe3 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml
index 0debe2fec5..0debe2fec5 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd
index b5bcfdcfd4..b5bcfdcfd4 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml
index 7f001254cc..7f001254cc 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd
index 8d4d106f59..8d4d106f59 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml
index f875b9f94d..f875b9f94d 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd
index 4c8a39b06c..4c8a39b06c 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml
index 7d343d6dda..7d343d6dda 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd
index bb12bc04a9..bb12bc04a9 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml
index 7a81f3b0dd..7a81f3b0dd 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd
index f0e1c21233..f0e1c21233 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml
index d35568b3c9..d35568b3c9 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd
index 92bd9a4b66..92bd9a4b66 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml
index 52cdfa8c4e..52cdfa8c4e 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd
index 78d001a585..78d001a585 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml
index 2609a858f7..2609a858f7 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd
index 38f6c55059..38f6c55059 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml
index 7868a47ca3..7868a47ca3 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd
index 0d65b124ff..0d65b124ff 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml
index 3f5080d49f..3f5080d49f 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd
index 340555dc5f..340555dc5f 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml
index 0deb7af980..0deb7af980 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd
index 8059fe6da0..8059fe6da0 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml
index 06c92ce19b..06c92ce19b 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd
index 7b1f02d1d4..7b1f02d1d4 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml
index 9bc0cefd0f..9bc0cefd0f 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd
index 0c207983bc..0c207983bc 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml
index f91b602f99..f91b602f99 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd
index b99bf01b73..b99bf01b73 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml
index c99698e175..c99698e175 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd
index b5b9b0d1eb..b5b9b0d1eb 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml
index 80d22ce057..80d22ce057 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd
index 4902935db5..4902935db5 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml
index 664bf824b4..664bf824b4 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd
index 5d3658d224..5d3658d224 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml
index c5861fa92a..c5861fa92a 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd
index 0aa4710057..0aa4710057 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml
index 1f95950394..1f95950394 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd
index 6ee9c435db..6ee9c435db 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml
index 0297f1aeb4..0297f1aeb4 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd
index 56d027bdbb..56d027bdbb 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml
index 81ba1069bd..81ba1069bd 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd
index 866ab73024..866ab73024 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml
index 8bb3a08b94..8bb3a08b94 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd
index c7c62f812b..c7c62f812b 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml
index 8235718c5e..8235718c5e 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd
index 36caba2f16..36caba2f16 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml
index 599c428a44..599c428a44 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd
index 389d5a99f0..389d5a99f0 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml
index 919c4a20ee..919c4a20ee 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd
index 59887078b5..59887078b5 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml
index 79011f26ab..79011f26ab 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd
index 5de7d64d7b..5de7d64d7b 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml
index c40be9e18b..c40be9e18b 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd
index d4a78787b8..d4a78787b8 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml
index c30434de66..c30434de66 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd
index 5381590cd1..5381590cd1 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml
index 4cd6ea7e72..4cd6ea7e72 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd
index e8faf6225b..e8faf6225b 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml
index b4375467c4..b4375467c4 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd
index a4f564d9b7..a4f564d9b7 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml
index d30ab85530..d30ab85530 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd
index 8abb34b5a5..8abb34b5a5 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml
index 7fd9a061ae..7fd9a061ae 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd
index 1615976813..1615976813 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml
index cd567ba528..cd567ba528 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd
index 0beaac571f..0beaac571f 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml
index 025362defb..025362defb 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd
index d6d951fe5d..d6d951fe5d 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml
index 5736a8c121..5736a8c121 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd
index 242be1d53b..242be1d53b 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml
index d728115a77..d728115a77 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd
index 108e3a8619..108e3a8619 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml
index d4ffae5e17..d4ffae5e17 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd
index 5ee5e0229e..5ee5e0229e 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml
index 3d5aed5aa8..3d5aed5aa8 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd
index e7b80ab11c..e7b80ab11c 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml
index 2b4fe5594e..2b4fe5594e 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd
index fc4deb63c2..fc4deb63c2 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml
index 03570f41d9..03570f41d9 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd
index c754502645..c754502645 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml
index 4603793bfc..4603793bfc 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd
index 4bcd2f8c46..4bcd2f8c46 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml
index a6861f803a..a6861f803a 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd
index 8bb251cab2..8bb251cab2 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml
index 467ec007ed..467ec007ed 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd
index 8d00646678..8d00646678 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml
index 7deafd798a..7deafd798a 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd
index 72ac75fee0..72ac75fee0 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml
index f6208f81b3..f6208f81b3 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd
index 1f26e13673..1f26e13673 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml
index 97de7b98eb..97de7b98eb 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd
index 67716553d8..67716553d8 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml
index 5941348921..5941348921 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd
index 24d5d09054..24d5d09054 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml
index f684d06a4d..f684d06a4d 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd
index de4a8a666d..de4a8a666d 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml
index 242908bd27..242908bd27 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd
index 4c00fbe295..4c00fbe295 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml
index 925e8625d5..925e8625d5 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd
index b12bec040b..b12bec040b 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml
index c73708ce46..c73708ce46 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd
index 795c3ea7d9..795c3ea7d9 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml
index 3ebdc89ae0..3ebdc89ae0 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd
index 21546d0f67..21546d0f67 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml
index 89657e42ca..89657e42ca 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd
index d01b4172e4..d01b4172e4 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml
index 82fd1eedaf..82fd1eedaf 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd
index e1dcf06194..e1dcf06194 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml
index ebf03c9d5d..ebf03c9d5d 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd
index 8b9ba5b4b8..8b9ba5b4b8 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml
index 26466b1b39..26466b1b39 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd
index ff418c56ab..ff418c56ab 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml
index 27bb1ce9cc..27bb1ce9cc 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd
index 2bf1df8c99..2bf1df8c99 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml
index 9b5561ed43..9b5561ed43 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd
index 0b4e7bdf45..0b4e7bdf45 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml
index f1b7cd264c..f1b7cd264c 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd
index a2c8456257..a2c8456257 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml
index 1f60b0423f..1f60b0423f 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd
index 21e55ab8c1..21e55ab8c1 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml
index 30762f4912..30762f4912 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd
index 5bf35d0d70..5bf35d0d70 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml
index 2dd01e4090..2dd01e4090 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd
index 6920cd8dd0..6920cd8dd0 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml
index 6a526bdc47..6a526bdc47 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd
index 1117a95eb8..1117a95eb8 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml
index ab91458bff..ab91458bff 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd
index 3e015843b5..3e015843b5 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml
index b6d68fd08a..b6d68fd08a 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd
index d4453a4477..d4453a4477 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml
index 6de3adc937..6de3adc937 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd
index 786ab226da..786ab226da 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml
index 64093aa803..64093aa803 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd
index 01f4c2b1ef..01f4c2b1ef 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml
index 774646f682..774646f682 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd
index 34da37564c..34da37564c 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml
index a1fb3aa803..a1fb3aa803 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd
index 8eb7a4fce4..8eb7a4fce4 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml
index f68eb1939d..f68eb1939d 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd
index b9f77e6658..b9f77e6658 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Import.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Import.xml
index fd28850050..fd28850050 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Import.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Import.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Import.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Import.xsd
index eae93fd44a..eae93fd44a 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Import.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Import.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd
index a7e568decf..a7e568decf 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Include.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Include.xml
index d4b9e24fa6..d4b9e24fa6 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Include.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Include.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Include.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Include.xsd
index 34ff314a19..34ff314a19 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Include.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Include.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Interop.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Interop.xsd
index ae22ab2c44..ae22ab2c44 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Interop.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Interop.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Notation.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Notation.xml
index b75ac6500a..b75ac6500a 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Notation.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Notation.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Notation.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Notation.xsd
index 6ad019cb81..6ad019cb81 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Notation.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Notation.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Person.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Person.xsd
index 5f5021b15e..5f5021b15e 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Person.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/Person.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml
index 6c5ad88ff4..6c5ad88ff4 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd
index 6b7e39b334..6b7e39b334 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml
index f9d4a24a49..f9d4a24a49 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd
index f649e2ba83..f649e2ba83 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml
index 410df4b7e4..410df4b7e4 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd
index 36629e8295..36629e8295 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml
index 7b74867c03..7b74867c03 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd
index 7a08de84be..7a08de84be 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml
index 708d526f44..708d526f44 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd
index 681cf7d5af..681cf7d5af 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml
index e404ac86b7..e404ac86b7 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd
index af0431f048..af0431f048 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml
index c86a0f6bcb..c86a0f6bcb 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd
index 89b00a36cc..89b00a36cc 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml
index 399b0d8175..399b0d8175 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd
index fee04b9f24..fee04b9f24 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml
index bc8cf35368..bc8cf35368 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd
index 536aa822de..536aa822de 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml
index da2929776e..da2929776e 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd
index ace5427786..ace5427786 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/datagraph.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/datagraph.xsd
index e6b9697a8d..e6b9697a8d 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/datagraph.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/datagraph.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd
index 7387568942..7387568942 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd
index c5aabc9cc8..c5aabc9cc8 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd
diff --git a/branches/sca-java-0.90/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java
index 131e11012a..131e11012a 100644
--- a/branches/sca-java-0.90/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java
diff --git a/branches/sca-java-0.90/itest/databindings/config.png b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/config.png
index 7912019e9d..7912019e9d 100644
--- a/branches/sca-java-0.90/itest/databindings/config.png
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/config.png
diff --git a/branches/sca-java-0.90/itest/databindings/config.svg b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/config.svg
index aaf027e2df..aaf027e2df 100644
--- a/branches/sca-java-0.90/itest/databindings/config.svg
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/config.svg
diff --git a/branches/sca-java-0.90/itest/databindings/databinding.png b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/databinding.png
index 76a9c71b7d..76a9c71b7d 100644
--- a/branches/sca-java-0.90/itest/databindings/databinding.png
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/databinding.png
diff --git a/branches/sca-java-0.90/itest/databindings/databinding.svg b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/databinding.svg
index d6850ccf7d..d6850ccf7d 100644
--- a/branches/sca-java-0.90/itest/databindings/databinding.svg
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/databinding.svg
diff --git a/branches/sca-java-0.90/itest/databindings/interop.png b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/interop.png
index 005e0f24ea..005e0f24ea 100644
--- a/branches/sca-java-0.90/itest/databindings/interop.png
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/interop.png
diff --git a/branches/sca-java-0.90/itest/databindings/interop.svg b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/interop.svg
index 03897c6d09..03897c6d09 100644
--- a/branches/sca-java-0.90/itest/databindings/interop.svg
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/interop.svg
diff --git a/branches/sca-java-0.90/itest/databindings/interop/pom.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/interop/pom.xml
index 14f94ae740..14f94ae740 100644
--- a/branches/sca-java-0.90/itest/databindings/interop/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/interop/pom.xml
diff --git a/branches/sca-java-0.90/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm
index 7bdfc57924..7bdfc57924 100644
--- a/branches/sca-java-0.90/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm
diff --git a/branches/sca-java-0.90/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm
index da346f372d..da346f372d 100644
--- a/branches/sca-java-0.90/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm
diff --git a/branches/sca-java-0.90/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm
index 40ccc83302..40ccc83302 100644
--- a/branches/sca-java-0.90/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm
diff --git a/branches/sca-java-0.90/itest/databindings/interop/src/main/resources/generate/generate.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/interop/src/main/resources/generate/generate.xml
index 8453dd56b4..8453dd56b4 100644
--- a/branches/sca-java-0.90/itest/databindings/interop/src/main/resources/generate/generate.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/interop/src/main/resources/generate/generate.xml
diff --git a/branches/sca-java-0.90/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm
index 36797fde57..36797fde57 100644
--- a/branches/sca-java-0.90/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm
diff --git a/branches/sca-java-0.90/itest/databindings/jaxbgen/pom.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/jaxbgen/pom.xml
index a161bcf6ad..a161bcf6ad 100644
--- a/branches/sca-java-0.90/itest/databindings/jaxbgen/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/jaxbgen/pom.xml
diff --git a/branches/sca-java-0.90/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml
index 8381a164ea..8381a164ea 100644
--- a/branches/sca-java-0.90/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml
diff --git a/branches/sca-java-0.90/itest/databindings/jaxbgen/src/main/resources/greeter.composite b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/jaxbgen/src/main/resources/greeter.composite
index 520a68e9b8..520a68e9b8 100644
--- a/branches/sca-java-0.90/itest/databindings/jaxbgen/src/main/resources/greeter.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/jaxbgen/src/main/resources/greeter.composite
diff --git a/branches/sca-java-0.90/itest/databindings/pom.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/pom.xml
index ac038180ed..ac038180ed 100644
--- a/branches/sca-java-0.90/itest/databindings/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/pom.xml
diff --git a/branches/sca-java-0.90/itest/databindings/readme.html b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/readme.html
index 24a44e4ed7..24a44e4ed7 100644
--- a/branches/sca-java-0.90/itest/databindings/readme.html
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/readme.html
diff --git a/branches/sca-java-0.90/itest/databindings/sdogen/pom.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/sdogen/pom.xml
index 27b7fc66a4..27b7fc66a4 100644
--- a/branches/sca-java-0.90/itest/databindings/sdogen/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/sdogen/pom.xml
diff --git a/branches/sca-java-0.90/itest/databindings/sdogen/src/main/resources/generate/generate.xml b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/sdogen/src/main/resources/generate/generate.xml
index 5487b113e8..5487b113e8 100644
--- a/branches/sca-java-0.90/itest/databindings/sdogen/src/main/resources/generate/generate.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/sdogen/src/main/resources/generate/generate.xml
diff --git a/branches/sca-java-0.90/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm
index 9494d70f96..9494d70f96 100644
--- a/branches/sca-java-0.90/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm
diff --git a/branches/sca-java-0.90/itest/databindings/sdogen/src/main/resources/generate/pom.xml.vm b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/sdogen/src/main/resources/generate/pom.xml.vm
index c057b80938..c057b80938 100644
--- a/branches/sca-java-0.90/itest/databindings/sdogen/src/main/resources/generate/pom.xml.vm
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/databindings/sdogen/src/main/resources/generate/pom.xml.vm
diff --git a/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/pom.xml b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/pom.xml
index a72ef801d6..a72ef801d6 100644
--- a/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/pom.xml
diff --git a/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
index 2c9b2d25cb..2c9b2d25cb 100644
--- a/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
diff --git a/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
index 65751175fb..65751175fb 100644
--- a/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
diff --git a/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
index 5f65d293ea..5f65d293ea 100644
--- a/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
diff --git a/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
index 7d303887e7..7d303887e7 100644
--- a/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
diff --git a/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
index e9df6ba473..e9df6ba473 100644
--- a/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
diff --git a/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
index 39b702afe3..39b702afe3 100644
--- a/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
diff --git a/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
index 7b4b3a0f29..7b4b3a0f29 100644
--- a/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
diff --git a/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite
index f955ba093c..f955ba093c 100644
--- a/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite
diff --git a/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
index f385ebb47d..f385ebb47d 100644
--- a/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
diff --git a/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
index f5e716de94..f5e716de94 100644
--- a/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
diff --git a/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl
index b4ed2b90cf..b4ed2b90cf 100644
--- a/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl
diff --git a/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd
index 9759647cfe..9759647cfe 100644
--- a/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd
diff --git a/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
index ee4076394b..ee4076394b 100644
--- a/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
diff --git a/branches/sca-java-0.90/itest/exceptions-cross-binding/pom.xml b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding/pom.xml
index 3d4f03ffb9..3d4f03ffb9 100644
--- a/branches/sca-java-0.90/itest/exceptions-cross-binding/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding/pom.xml
diff --git a/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
index 2c9b2d25cb..2c9b2d25cb 100644
--- a/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
diff --git a/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
index 65751175fb..65751175fb 100644
--- a/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
diff --git a/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
index 5f65d293ea..5f65d293ea 100644
--- a/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
diff --git a/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
index 7d303887e7..7d303887e7 100644
--- a/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
diff --git a/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
index e9df6ba473..e9df6ba473 100644
--- a/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
diff --git a/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
index 39b702afe3..39b702afe3 100644
--- a/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
diff --git a/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
index 7b4b3a0f29..7b4b3a0f29 100644
--- a/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
diff --git a/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite
index f955ba093c..f955ba093c 100644
--- a/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite
diff --git a/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite
index da10f8881e..da10f8881e 100644
--- a/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite
diff --git a/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
index f5e716de94..f5e716de94 100644
--- a/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
diff --git a/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl
index 58367acac1..58367acac1 100644
--- a/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl
diff --git a/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd
index 9759647cfe..9759647cfe 100644
--- a/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd
diff --git a/branches/sca-java-0.90/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
index c589c5611c..c589c5611c 100644
--- a/branches/sca-java-0.90/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
diff --git a/branches/sca-java-0.90/itest/exceptions/pom.xml b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions/pom.xml
index 0bb10203c8..0bb10203c8 100644
--- a/branches/sca-java-0.90/itest/exceptions/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions/pom.xml
diff --git a/branches/sca-java-0.90/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
index e90289a07d..e90289a07d 100644
--- a/branches/sca-java-0.90/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
diff --git a/branches/sca-java-0.90/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
index 0d14240513..0d14240513 100644
--- a/branches/sca-java-0.90/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
diff --git a/branches/sca-java-0.90/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
index 80073e7679..80073e7679 100644
--- a/branches/sca-java-0.90/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
diff --git a/branches/sca-java-0.90/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
index 1a439711dd..1a439711dd 100644
--- a/branches/sca-java-0.90/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
diff --git a/branches/sca-java-0.90/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
index 32a23c5e7d..32a23c5e7d 100644
--- a/branches/sca-java-0.90/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
diff --git a/branches/sca-java-0.90/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
index c1b7c23d5d..c1b7c23d5d 100644
--- a/branches/sca-java-0.90/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
diff --git a/branches/sca-java-0.90/itest/exceptions/src/main/resources/ExceptionTest.composite b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions/src/main/resources/ExceptionTest.composite
index ca3cc6eac2..ca3cc6eac2 100644
--- a/branches/sca-java-0.90/itest/exceptions/src/main/resources/ExceptionTest.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions/src/main/resources/ExceptionTest.composite
diff --git a/branches/sca-java-0.90/itest/exceptions/src/main/resources/intracomposite.composite b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions/src/main/resources/intracomposite.composite
index efe1c5e207..efe1c5e207 100644
--- a/branches/sca-java-0.90/itest/exceptions/src/main/resources/intracomposite.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions/src/main/resources/intracomposite.composite
diff --git a/branches/sca-java-0.90/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
index 4f719a26c4..4f719a26c4 100644
--- a/branches/sca-java-0.90/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
diff --git a/branches/sca-java-0.90/itest/extended-api/pom.xml b/sca-java-1.x/branches/sca-java-0.90/itest/extended-api/pom.xml
index afa68d83b4..afa68d83b4 100644
--- a/branches/sca-java-0.90/itest/extended-api/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/extended-api/pom.xml
diff --git a/branches/sca-java-0.90/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java b/sca-java-1.x/branches/sca-java-0.90/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java
index 869565af17..869565af17 100644
--- a/branches/sca-java-0.90/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java
diff --git a/branches/sca-java-0.90/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java b/sca-java-1.x/branches/sca-java-0.90/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java
index c54af93c05..c54af93c05 100644
--- a/branches/sca-java-0.90/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java
diff --git a/branches/sca-java-0.90/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java
index 523d238f2e..523d238f2e 100644
--- a/branches/sca-java-0.90/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java
diff --git a/branches/sca-java-0.90/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java
index ab4300a7dd..ab4300a7dd 100644
--- a/branches/sca-java-0.90/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java
diff --git a/branches/sca-java-0.90/itest/extended-api/src/main/resources/BasicService.composite b/sca-java-1.x/branches/sca-java-0.90/itest/extended-api/src/main/resources/BasicService.composite
index 128b33b16f..128b33b16f 100644
--- a/branches/sca-java-0.90/itest/extended-api/src/main/resources/BasicService.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/extended-api/src/main/resources/BasicService.composite
diff --git a/branches/sca-java-0.90/itest/extended-api/src/main/resources/MathService.composite b/sca-java-1.x/branches/sca-java-0.90/itest/extended-api/src/main/resources/MathService.composite
index 8e99d3da60..8e99d3da60 100644
--- a/branches/sca-java-0.90/itest/extended-api/src/main/resources/MathService.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/extended-api/src/main/resources/MathService.composite
diff --git a/branches/sca-java-0.90/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java b/sca-java-1.x/branches/sca-java-0.90/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java
index 2187a5afa0..2187a5afa0 100644
--- a/branches/sca-java-0.90/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java
diff --git a/branches/sca-java-0.90/itest/operation-overloading/pom.xml b/sca-java-1.x/branches/sca-java-0.90/itest/operation-overloading/pom.xml
index d14eba05db..d14eba05db 100644
--- a/branches/sca-java-0.90/itest/operation-overloading/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/operation-overloading/pom.xml
diff --git a/branches/sca-java-0.90/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java b/sca-java-1.x/branches/sca-java-0.90/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
index f630f9904f..f630f9904f 100644
--- a/branches/sca-java-0.90/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
diff --git a/branches/sca-java-0.90/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java b/sca-java-1.x/branches/sca-java-0.90/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
index d0f78c409f..d0f78c409f 100644
--- a/branches/sca-java-0.90/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
diff --git a/branches/sca-java-0.90/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java b/sca-java-1.x/branches/sca-java-0.90/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
index e83952e573..e83952e573 100644
--- a/branches/sca-java-0.90/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
diff --git a/branches/sca-java-0.90/itest/operation-overloading/src/main/resources/OperationOverload.composite b/sca-java-1.x/branches/sca-java-0.90/itest/operation-overloading/src/main/resources/OperationOverload.composite
index cbf5aa2078..cbf5aa2078 100644
--- a/branches/sca-java-0.90/itest/operation-overloading/src/main/resources/OperationOverload.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/operation-overloading/src/main/resources/OperationOverload.composite
diff --git a/branches/sca-java-0.90/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java b/sca-java-1.x/branches/sca-java-0.90/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
index 3129b03ff3..3129b03ff3 100644
--- a/branches/sca-java-0.90/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
diff --git a/branches/sca-java-0.90/itest/pom.xml b/sca-java-1.x/branches/sca-java-0.90/itest/pom.xml
index 052907d5fc..052907d5fc 100644
--- a/branches/sca-java-0.90/itest/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/pom.xml
diff --git a/branches/sca-java-0.90/itest/properties/pom.xml b/sca-java-1.x/branches/sca-java-0.90/itest/properties/pom.xml
index c7b33e0a65..c7b33e0a65 100644
--- a/branches/sca-java-0.90/itest/properties/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/properties/pom.xml
diff --git a/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java b/sca-java-1.x/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
index 667b854c10..667b854c10 100644
--- a/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
diff --git a/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
index 51d4d9b3cb..51d4d9b3cb 100644
--- a/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
diff --git a/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java b/sca-java-1.x/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
index c33c140aec..c33c140aec 100644
--- a/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
diff --git a/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
index b78d6380ef..b78d6380ef 100644
--- a/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
diff --git a/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java b/sca-java-1.x/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
index cd3046c62c..cd3046c62c 100644
--- a/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
diff --git a/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
index aec71d30f9..aec71d30f9 100644
--- a/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
diff --git a/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java b/sca-java-1.x/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
index 56820279d6..56820279d6 100644
--- a/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
diff --git a/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java b/sca-java-1.x/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
index 116cdef48f..116cdef48f 100644
--- a/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
diff --git a/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
index a36bb5e419..a36bb5e419 100644
--- a/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
diff --git a/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java b/sca-java-1.x/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
index a76f17bcad..a76f17bcad 100644
--- a/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
diff --git a/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
index be99611dfa..be99611dfa 100644
--- a/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
diff --git a/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java b/sca-java-1.x/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
index f20d295a06..f20d295a06 100644
--- a/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
diff --git a/branches/sca-java-0.90/itest/properties/src/main/resources/OuterPropertyTest.composite b/sca-java-1.x/branches/sca-java-0.90/itest/properties/src/main/resources/OuterPropertyTest.composite
index 43853d46a5..43853d46a5 100644
--- a/branches/sca-java-0.90/itest/properties/src/main/resources/OuterPropertyTest.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/properties/src/main/resources/OuterPropertyTest.composite
diff --git a/branches/sca-java-0.90/itest/properties/src/main/resources/PropertyTest.composite b/sca-java-1.x/branches/sca-java-0.90/itest/properties/src/main/resources/PropertyTest.composite
index a678451c74..a678451c74 100644
--- a/branches/sca-java-0.90/itest/properties/src/main/resources/PropertyTest.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/properties/src/main/resources/PropertyTest.composite
diff --git a/branches/sca-java-0.90/itest/properties/src/main/resources/fileProperty.txt b/sca-java-1.x/branches/sca-java-0.90/itest/properties/src/main/resources/fileProperty.txt
index 0d3d9ead83..0d3d9ead83 100644
--- a/branches/sca-java-0.90/itest/properties/src/main/resources/fileProperty.txt
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/properties/src/main/resources/fileProperty.txt
diff --git a/branches/sca-java-0.90/itest/properties/src/main/resources/manyValuesFileProperty.txt b/sca-java-1.x/branches/sca-java-0.90/itest/properties/src/main/resources/manyValuesFileProperty.txt
index 450f397b30..450f397b30 100644
--- a/branches/sca-java-0.90/itest/properties/src/main/resources/manyValuesFileProperty.txt
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/properties/src/main/resources/manyValuesFileProperty.txt
diff --git a/branches/sca-java-0.90/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java b/sca-java-1.x/branches/sca-java-0.90/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
index b2ac537dec..b2ac537dec 100644
--- a/branches/sca-java-0.90/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
diff --git a/branches/sca-java-0.90/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java b/sca-java-1.x/branches/sca-java-0.90/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
index 4e9c76bf09..4e9c76bf09 100644
--- a/branches/sca-java-0.90/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
diff --git a/branches/sca-java-0.90/itest/recursive/pom.xml b/sca-java-1.x/branches/sca-java-0.90/itest/recursive/pom.xml
index 6354b3337d..6354b3337d 100644
--- a/branches/sca-java-0.90/itest/recursive/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/recursive/pom.xml
diff --git a/branches/sca-java-0.90/itest/recursive/src/main/java/composite/CompositeClient.java b/sca-java-1.x/branches/sca-java-0.90/itest/recursive/src/main/java/composite/CompositeClient.java
index 5edc305970..5edc305970 100644
--- a/branches/sca-java-0.90/itest/recursive/src/main/java/composite/CompositeClient.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/recursive/src/main/java/composite/CompositeClient.java
diff --git a/branches/sca-java-0.90/itest/recursive/src/main/java/composite/Source.java b/sca-java-1.x/branches/sca-java-0.90/itest/recursive/src/main/java/composite/Source.java
index d0efcc1df1..d0efcc1df1 100644
--- a/branches/sca-java-0.90/itest/recursive/src/main/java/composite/Source.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/recursive/src/main/java/composite/Source.java
diff --git a/branches/sca-java-0.90/itest/recursive/src/main/java/composite/SourceCallback.java b/sca-java-1.x/branches/sca-java-0.90/itest/recursive/src/main/java/composite/SourceCallback.java
index baa95a8e39..baa95a8e39 100644
--- a/branches/sca-java-0.90/itest/recursive/src/main/java/composite/SourceCallback.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/recursive/src/main/java/composite/SourceCallback.java
diff --git a/branches/sca-java-0.90/itest/recursive/src/main/java/composite/SourceImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/recursive/src/main/java/composite/SourceImpl.java
index b9a0c7ff74..b9a0c7ff74 100644
--- a/branches/sca-java-0.90/itest/recursive/src/main/java/composite/SourceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/recursive/src/main/java/composite/SourceImpl.java
diff --git a/branches/sca-java-0.90/itest/recursive/src/main/java/composite/Target.java b/sca-java-1.x/branches/sca-java-0.90/itest/recursive/src/main/java/composite/Target.java
index 9a8f68a7fa..9a8f68a7fa 100644
--- a/branches/sca-java-0.90/itest/recursive/src/main/java/composite/Target.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/recursive/src/main/java/composite/Target.java
diff --git a/branches/sca-java-0.90/itest/recursive/src/main/java/composite/TargetImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/recursive/src/main/java/composite/TargetImpl.java
index 86686e9233..86686e9233 100644
--- a/branches/sca-java-0.90/itest/recursive/src/main/java/composite/TargetImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/recursive/src/main/java/composite/TargetImpl.java
diff --git a/branches/sca-java-0.90/itest/recursive/src/main/java/sample/ComponentAImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/recursive/src/main/java/sample/ComponentAImpl.java
index f513949105..f513949105 100644
--- a/branches/sca-java-0.90/itest/recursive/src/main/java/sample/ComponentAImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/recursive/src/main/java/sample/ComponentAImpl.java
diff --git a/branches/sca-java-0.90/itest/recursive/src/main/java/sample/ComponentCImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/recursive/src/main/java/sample/ComponentCImpl.java
index 586a9ee6a7..586a9ee6a7 100644
--- a/branches/sca-java-0.90/itest/recursive/src/main/java/sample/ComponentCImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/recursive/src/main/java/sample/ComponentCImpl.java
diff --git a/branches/sca-java-0.90/itest/recursive/src/main/java/sample/ComponentEImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/recursive/src/main/java/sample/ComponentEImpl.java
index dbf2735aa7..dbf2735aa7 100644
--- a/branches/sca-java-0.90/itest/recursive/src/main/java/sample/ComponentEImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/recursive/src/main/java/sample/ComponentEImpl.java
diff --git a/branches/sca-java-0.90/itest/recursive/src/main/java/sample/ComponentFImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/recursive/src/main/java/sample/ComponentFImpl.java
index 5e136e536c..5e136e536c 100644
--- a/branches/sca-java-0.90/itest/recursive/src/main/java/sample/ComponentFImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/recursive/src/main/java/sample/ComponentFImpl.java
diff --git a/branches/sca-java-0.90/itest/recursive/src/main/java/sample/Service1.java b/sca-java-1.x/branches/sca-java-0.90/itest/recursive/src/main/java/sample/Service1.java
index 81bdce79f1..81bdce79f1 100644
--- a/branches/sca-java-0.90/itest/recursive/src/main/java/sample/Service1.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/recursive/src/main/java/sample/Service1.java
diff --git a/branches/sca-java-0.90/itest/recursive/src/main/resources/Composite1.composite b/sca-java-1.x/branches/sca-java-0.90/itest/recursive/src/main/resources/Composite1.composite
index 56fd7c621f..56fd7c621f 100644
--- a/branches/sca-java-0.90/itest/recursive/src/main/resources/Composite1.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/recursive/src/main/resources/Composite1.composite
diff --git a/branches/sca-java-0.90/itest/recursive/src/main/resources/Composite2.composite b/sca-java-1.x/branches/sca-java-0.90/itest/recursive/src/main/resources/Composite2.composite
index 377f14bd4d..377f14bd4d 100644
--- a/branches/sca-java-0.90/itest/recursive/src/main/resources/Composite2.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/recursive/src/main/resources/Composite2.composite
diff --git a/branches/sca-java-0.90/itest/recursive/src/main/resources/Composite3.composite b/sca-java-1.x/branches/sca-java-0.90/itest/recursive/src/main/resources/Composite3.composite
index 6c81b28d1c..6c81b28d1c 100644
--- a/branches/sca-java-0.90/itest/recursive/src/main/resources/Composite3.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/recursive/src/main/resources/Composite3.composite
diff --git a/branches/sca-java-0.90/itest/recursive/src/main/resources/InnerComposite.composite b/sca-java-1.x/branches/sca-java-0.90/itest/recursive/src/main/resources/InnerComposite.composite
index 3376ac8ff5..3376ac8ff5 100644
--- a/branches/sca-java-0.90/itest/recursive/src/main/resources/InnerComposite.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/recursive/src/main/resources/InnerComposite.composite
diff --git a/branches/sca-java-0.90/itest/recursive/src/main/resources/InnerComposite2.composite b/sca-java-1.x/branches/sca-java-0.90/itest/recursive/src/main/resources/InnerComposite2.composite
index c9eff4fa9d..c9eff4fa9d 100644
--- a/branches/sca-java-0.90/itest/recursive/src/main/resources/InnerComposite2.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/recursive/src/main/resources/InnerComposite2.composite
diff --git a/branches/sca-java-0.90/itest/recursive/src/main/resources/OuterComposite.composite b/sca-java-1.x/branches/sca-java-0.90/itest/recursive/src/main/resources/OuterComposite.composite
index cb1c1e13d4..cb1c1e13d4 100644
--- a/branches/sca-java-0.90/itest/recursive/src/main/resources/OuterComposite.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/recursive/src/main/resources/OuterComposite.composite
diff --git a/branches/sca-java-0.90/itest/recursive/src/test/java/composite/CompositeTestCase.java b/sca-java-1.x/branches/sca-java-0.90/itest/recursive/src/test/java/composite/CompositeTestCase.java
index f81b02faef..f81b02faef 100644
--- a/branches/sca-java-0.90/itest/recursive/src/test/java/composite/CompositeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/recursive/src/test/java/composite/CompositeTestCase.java
diff --git a/branches/sca-java-0.90/itest/recursive/src/test/java/sample/RecursiveCompositeTest.java b/sca-java-1.x/branches/sca-java-0.90/itest/recursive/src/test/java/sample/RecursiveCompositeTest.java
index 45f16b38c6..45f16b38c6 100644
--- a/branches/sca-java-0.90/itest/recursive/src/test/java/sample/RecursiveCompositeTest.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/recursive/src/test/java/sample/RecursiveCompositeTest.java
diff --git a/branches/sca-java-0.90/itest/spec-api/pom.xml b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/pom.xml
index fbccd0a9a3..fbccd0a9a3 100644
--- a/branches/sca-java-0.90/itest/spec-api/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/pom.xml
diff --git a/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/BasicService.java b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/BasicService.java
index 65e85e5db6..65e85e5db6 100644
--- a/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/BasicService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/BasicService.java
diff --git a/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MathService.java b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MathService.java
index db367225ab..db367225ab 100644
--- a/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MathService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MathService.java
diff --git a/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MyListService.java b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MyListService.java
index 7fe9fa4909..7fe9fa4909 100644
--- a/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MyListService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MyListService.java
diff --git a/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MyListServiceByYear.java b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MyListServiceByYear.java
index a381fc62dc..a381fc62dc 100644
--- a/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MyListServiceByYear.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MyListServiceByYear.java
diff --git a/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MyService.java b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MyService.java
index fbb2161df3..fbb2161df3 100644
--- a/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MyService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MyService.java
diff --git a/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MyServiceByDate.java b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MyServiceByDate.java
index 98490c4e3d..98490c4e3d 100644
--- a/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MyServiceByDate.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MyServiceByDate.java
diff --git a/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MyTotalService.java b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MyTotalService.java
index 6a4cfc1f79..6a4cfc1f79 100644
--- a/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MyTotalService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/MyTotalService.java
diff --git a/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/SCAComponentService.java b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/SCAComponentService.java
index c2d107ef28..c2d107ef28 100644
--- a/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/SCAComponentService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/SCAComponentService.java
diff --git a/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/impl/BasicServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/impl/BasicServiceImpl.java
index ea0b59528f..ea0b59528f 100644
--- a/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/impl/BasicServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/impl/BasicServiceImpl.java
diff --git a/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/impl/MathServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/impl/MathServiceImpl.java
index 8b52a5fe31..8b52a5fe31 100644
--- a/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/impl/MathServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/impl/MathServiceImpl.java
diff --git a/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/impl/MyListServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/impl/MyListServiceImpl.java
index 5170c32cd2..5170c32cd2 100644
--- a/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/impl/MyListServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/impl/MyListServiceImpl.java
diff --git a/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/impl/MyServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/impl/MyServiceImpl.java
index b81c2c2120..b81c2c2120 100644
--- a/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/impl/MyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/impl/MyServiceImpl.java
diff --git a/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/impl/MyTotalServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/impl/MyTotalServiceImpl.java
index 11767522d6..11767522d6 100644
--- a/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/impl/MyTotalServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/java/org/apache/tuscany/sca/test/spec/impl/MyTotalServiceImpl.java
diff --git a/branches/sca-java-0.90/itest/spec-api/src/main/resources/BasicService.composite b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/resources/BasicService.composite
index d650c8ab42..d650c8ab42 100644
--- a/branches/sca-java-0.90/itest/spec-api/src/main/resources/BasicService.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/resources/BasicService.composite
diff --git a/branches/sca-java-0.90/itest/spec-api/src/main/resources/CompositeTest.composite b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/resources/CompositeTest.composite
index c01c6845e7..c01c6845e7 100644
--- a/branches/sca-java-0.90/itest/spec-api/src/main/resources/CompositeTest.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/resources/CompositeTest.composite
diff --git a/branches/sca-java-0.90/itest/spec-api/src/main/resources/MathService.composite b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/resources/MathService.composite
index 59f8fa6981..59f8fa6981 100644
--- a/branches/sca-java-0.90/itest/spec-api/src/main/resources/MathService.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/resources/MathService.composite
diff --git a/branches/sca-java-0.90/itest/spec-api/src/main/resources/myListService.composite b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/resources/myListService.composite
index 819c399a7e..819c399a7e 100644
--- a/branches/sca-java-0.90/itest/spec-api/src/main/resources/myListService.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/resources/myListService.composite
diff --git a/branches/sca-java-0.90/itest/spec-api/src/main/resources/myServiceInComposite.composite b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/resources/myServiceInComposite.composite
index 38e58f31a7..38e58f31a7 100644
--- a/branches/sca-java-0.90/itest/spec-api/src/main/resources/myServiceInComposite.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/resources/myServiceInComposite.composite
diff --git a/branches/sca-java-0.90/itest/spec-api/src/main/resources/myServiceInRecursive.composite b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/resources/myServiceInRecursive.composite
index 4b54f430b9..4b54f430b9 100644
--- a/branches/sca-java-0.90/itest/spec-api/src/main/resources/myServiceInRecursive.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/resources/myServiceInRecursive.composite
diff --git a/branches/sca-java-0.90/itest/spec-api/src/main/resources/mySimpleService.composite b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/resources/mySimpleService.composite
index 2281149b19..2281149b19 100644
--- a/branches/sca-java-0.90/itest/spec-api/src/main/resources/mySimpleService.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/resources/mySimpleService.composite
diff --git a/branches/sca-java-0.90/itest/spec-api/src/main/resources/mySimpleServiceInRecursive.composite b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/resources/mySimpleServiceInRecursive.composite
index 82b022b4d8..82b022b4d8 100644
--- a/branches/sca-java-0.90/itest/spec-api/src/main/resources/mySimpleServiceInRecursive.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/resources/mySimpleServiceInRecursive.composite
diff --git a/branches/sca-java-0.90/itest/spec-api/src/main/resources/mySimpleServiceInRecursive2.composite b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/resources/mySimpleServiceInRecursive2.composite
index 0547ac977f..0547ac977f 100644
--- a/branches/sca-java-0.90/itest/spec-api/src/main/resources/mySimpleServiceInRecursive2.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/resources/mySimpleServiceInRecursive2.composite
diff --git a/branches/sca-java-0.90/itest/spec-api/src/main/resources/myTotalService.composite b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/resources/myTotalService.composite
index eb00da6c76..eb00da6c76 100644
--- a/branches/sca-java-0.90/itest/spec-api/src/main/resources/myTotalService.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/resources/myTotalService.composite
diff --git a/branches/sca-java-0.90/itest/spec-api/src/main/resources/myTotalServiceInComposite.composite b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/resources/myTotalServiceInComposite.composite
index 87ca0641af..87ca0641af 100644
--- a/branches/sca-java-0.90/itest/spec-api/src/main/resources/myTotalServiceInComposite.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/resources/myTotalServiceInComposite.composite
diff --git a/branches/sca-java-0.90/itest/spec-api/src/main/resources/myTotalServiceInCompositeForReferenceOverride.composite b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/resources/myTotalServiceInCompositeForReferenceOverride.composite
index 9354da4d9c..9354da4d9c 100644
--- a/branches/sca-java-0.90/itest/spec-api/src/main/resources/myTotalServiceInCompositeForReferenceOverride.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/resources/myTotalServiceInCompositeForReferenceOverride.composite
diff --git a/branches/sca-java-0.90/itest/spec-api/src/main/resources/myTotalServiceInRecursive.composite b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/resources/myTotalServiceInRecursive.composite
index b5083feaa6..b5083feaa6 100644
--- a/branches/sca-java-0.90/itest/spec-api/src/main/resources/myTotalServiceInRecursive.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/resources/myTotalServiceInRecursive.composite
diff --git a/branches/sca-java-0.90/itest/spec-api/src/main/resources/myTotalServiceInRecursiveForReferenceOverride.composite b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/resources/myTotalServiceInRecursiveForReferenceOverride.composite
index b1b47530a4..b1b47530a4 100644
--- a/branches/sca-java-0.90/itest/spec-api/src/main/resources/myTotalServiceInRecursiveForReferenceOverride.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/resources/myTotalServiceInRecursiveForReferenceOverride.composite
diff --git a/branches/sca-java-0.90/itest/spec-api/src/main/resources/myservice.composite b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/resources/myservice.composite
index a4f57a58b0..a4f57a58b0 100644
--- a/branches/sca-java-0.90/itest/spec-api/src/main/resources/myservice.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/main/resources/myservice.composite
diff --git a/branches/sca-java-0.90/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/ComponentContextTestCase.java b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/ComponentContextTestCase.java
index 3853b1ff85..3853b1ff85 100644
--- a/branches/sca-java-0.90/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/ComponentContextTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/ComponentContextTestCase.java
diff --git a/branches/sca-java-0.90/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceListTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceListTestCaseFIXME.java
index a39cbbbbca..a39cbbbbca 100644
--- a/branches/sca-java-0.90/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceListTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceListTestCaseFIXME.java
diff --git a/branches/sca-java-0.90/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceTestCase.java b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceTestCase.java
index b5c6a0d7b5..b5c6a0d7b5 100644
--- a/branches/sca-java-0.90/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceTestCase.java
diff --git a/branches/sca-java-0.90/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/ComponentTestCase.java b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/ComponentTestCase.java
index d136530412..d136530412 100644
--- a/branches/sca-java-0.90/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/ComponentTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/ComponentTestCase.java
diff --git a/branches/sca-java-0.90/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneService2LevelTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneService2LevelTestCaseFIXME.java
index 38a98e01e2..38a98e01e2 100644
--- a/branches/sca-java-0.90/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneService2LevelTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneService2LevelTestCaseFIXME.java
diff --git a/branches/sca-java-0.90/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneServiceTestCase.java b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneServiceTestCase.java
index c29e9e72b3..c29e9e72b3 100644
--- a/branches/sca-java-0.90/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneServiceTestCase.java
diff --git a/branches/sca-java-0.90/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceForRefOverrideTestCase.java b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceForRefOverrideTestCase.java
index eb846ddb71..eb846ddb71 100644
--- a/branches/sca-java-0.90/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceForRefOverrideTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceForRefOverrideTestCase.java
diff --git a/branches/sca-java-0.90/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceTestCase.java b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceTestCase.java
index 60ee8b2011..60ee8b2011 100644
--- a/branches/sca-java-0.90/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceTestCase.java
diff --git a/branches/sca-java-0.90/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeTestCase.java b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeTestCase.java
index d9c2a73f7e..d9c2a73f7e 100644
--- a/branches/sca-java-0.90/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeTestCase.java
diff --git a/branches/sca-java-0.90/itest/wsdl/pom.xml b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/pom.xml
index f454e661d9..f454e661d9 100644
--- a/branches/sca-java-0.90/itest/wsdl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/pom.xml
diff --git a/branches/sca-java-0.90/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
index 265b11f7dd..265b11f7dd 100644
--- a/branches/sca-java-0.90/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
diff --git a/branches/sca-java-0.90/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
index 1e87899b01..1e87899b01 100644
--- a/branches/sca-java-0.90/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
diff --git a/branches/sca-java-0.90/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
index 694227d7fb..694227d7fb 100644
--- a/branches/sca-java-0.90/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
diff --git a/branches/sca-java-0.90/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
index 462a718c44..462a718c44 100644
--- a/branches/sca-java-0.90/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
diff --git a/branches/sca-java-0.90/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
index 17dbc27060..17dbc27060 100644
--- a/branches/sca-java-0.90/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
diff --git a/branches/sca-java-0.90/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
index 90bf276834..90bf276834 100644
--- a/branches/sca-java-0.90/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
diff --git a/branches/sca-java-0.90/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
index b76ef600e0..b76ef600e0 100644
--- a/branches/sca-java-0.90/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
diff --git a/branches/sca-java-0.90/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
index e747eb041f..e747eb041f 100644
--- a/branches/sca-java-0.90/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
diff --git a/branches/sca-java-0.90/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java
index c9076ebba6..c9076ebba6 100644
--- a/branches/sca-java-0.90/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-0.90/itest/wsdl/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/java/helloworld/HelloWorldService.java
index bd527ff8e2..bd527ff8e2 100644
--- a/branches/sca-java-0.90/itest/wsdl/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-0.90/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java
index d706517b76..d706517b76 100644
--- a/branches/sca-java-0.90/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-java-0.90/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
index 9d147dc013..9d147dc013 100644
--- a/branches/sca-java-0.90/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
diff --git a/branches/sca-java-0.90/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
index 7556e02b36..7556e02b36 100644
--- a/branches/sca-java-0.90/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
diff --git a/branches/sca-java-0.90/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
index e7031ff41c..e7031ff41c 100644
--- a/branches/sca-java-0.90/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
diff --git a/branches/sca-java-0.90/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
index 7a049ed7b0..7a049ed7b0 100644
--- a/branches/sca-java-0.90/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
diff --git a/branches/sca-java-0.90/itest/wsdl/src/main/resources/SDOWSDLTest.composite b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/resources/SDOWSDLTest.composite
index 3e11cf67de..3e11cf67de 100644
--- a/branches/sca-java-0.90/itest/wsdl/src/main/resources/SDOWSDLTest.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/resources/SDOWSDLTest.composite
diff --git a/branches/sca-java-0.90/itest/wsdl/src/main/resources/WSDLTest.composite b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/resources/WSDLTest.composite
index 96a5a62d20..96a5a62d20 100644
--- a/branches/sca-java-0.90/itest/wsdl/src/main/resources/WSDLTest.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/resources/WSDLTest.composite
diff --git a/branches/sca-java-0.90/itest/wsdl/src/main/resources/bigbank/account/services/accountdata/Component2bImpl.componentType b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/resources/bigbank/account/services/accountdata/Component2bImpl.componentType
index aa91a713d9..aa91a713d9 100644
--- a/branches/sca-java-0.90/itest/wsdl/src/main/resources/bigbank/account/services/accountdata/Component2bImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/resources/bigbank/account/services/accountdata/Component2bImpl.componentType
diff --git a/branches/sca-java-0.90/itest/wsdl/src/main/resources/bigbank/account/services/accountdata/Component3bImpl.componentType b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/resources/bigbank/account/services/accountdata/Component3bImpl.componentType
index 57b1d66e9c..57b1d66e9c 100644
--- a/branches/sca-java-0.90/itest/wsdl/src/main/resources/bigbank/account/services/accountdata/Component3bImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/resources/bigbank/account/services/accountdata/Component3bImpl.componentType
diff --git a/branches/sca-java-0.90/itest/wsdl/src/main/resources/org/apache/tuscany/sca/itest/Component2bImpl.componentType b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/resources/org/apache/tuscany/sca/itest/Component2bImpl.componentType
index de8307b8c2..de8307b8c2 100644
--- a/branches/sca-java-0.90/itest/wsdl/src/main/resources/org/apache/tuscany/sca/itest/Component2bImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/resources/org/apache/tuscany/sca/itest/Component2bImpl.componentType
diff --git a/branches/sca-java-0.90/itest/wsdl/src/main/resources/org/apache/tuscany/sca/itest/Component3bImpl.componentType b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/resources/org/apache/tuscany/sca/itest/Component3bImpl.componentType
index de8307b8c2..de8307b8c2 100644
--- a/branches/sca-java-0.90/itest/wsdl/src/main/resources/org/apache/tuscany/sca/itest/Component3bImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/resources/org/apache/tuscany/sca/itest/Component3bImpl.componentType
diff --git a/branches/sca-java-0.90/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl
index 8802f91b9d..8802f91b9d 100644
--- a/branches/sca-java-0.90/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl
diff --git a/branches/sca-java-0.90/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl
index 3921dec72d..3921dec72d 100644
--- a/branches/sca-java-0.90/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-0.90/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
index c11e814058..c11e814058 100644
--- a/branches/sca-java-0.90/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
diff --git a/branches/sca-java-0.90/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
index fd30d69c79..fd30d69c79 100644
--- a/branches/sca-java-0.90/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
diff --git a/branches/sca-java-0.90/modules/assembly-java-dsl/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.90/modules/assembly-java-dsl/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/DISCLAIMER
diff --git a/branches/sca-java-0.90/modules/assembly-java-dsl/LICENSE b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.90/modules/assembly-java-dsl/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/LICENSE
diff --git a/branches/sca-java-0.90/modules/assembly-java-dsl/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.90/modules/assembly-java-dsl/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/NOTICE
diff --git a/branches/sca-java-0.90/modules/assembly-java-dsl/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/pom.xml
index 879e950ec8..879e950ec8 100644
--- a/branches/sca-java-0.90/modules/assembly-java-dsl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/pom.xml
diff --git a/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/AssemblyBuilder.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/AssemblyBuilder.java
index 28a5ecdc24..28a5ecdc24 100644
--- a/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/AssemblyBuilder.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/AssemblyBuilder.java
diff --git a/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentBuilder.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentBuilder.java
index 98f247e5cc..98f247e5cc 100644
--- a/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentBuilder.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentBuilder.java
diff --git a/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentPropertyBuilder.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentPropertyBuilder.java
index 7f3c89fd2f..7f3c89fd2f 100644
--- a/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentPropertyBuilder.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentPropertyBuilder.java
diff --git a/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentReferenceBuilder.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentReferenceBuilder.java
index 8966a4be9d..8966a4be9d 100644
--- a/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentReferenceBuilder.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentReferenceBuilder.java
diff --git a/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentServiceBuilder.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentServiceBuilder.java
index f3e36e8c38..f3e36e8c38 100644
--- a/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentServiceBuilder.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentServiceBuilder.java
diff --git a/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/CompositeBuilder.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/CompositeBuilder.java
index e2108b5ef8..e2108b5ef8 100644
--- a/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/CompositeBuilder.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/CompositeBuilder.java
diff --git a/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/AssemblyBuilderImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/AssemblyBuilderImpl.java
index 0968310548..0968310548 100644
--- a/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/AssemblyBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/AssemblyBuilderImpl.java
diff --git a/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentBuilderImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentBuilderImpl.java
index 9022b9d9e6..9022b9d9e6 100644
--- a/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentBuilderImpl.java
diff --git a/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentPropertyBuilderImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentPropertyBuilderImpl.java
index 49f7cd46b2..49f7cd46b2 100644
--- a/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentPropertyBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentPropertyBuilderImpl.java
diff --git a/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentReferenceBuilderImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentReferenceBuilderImpl.java
index d9aab9de22..d9aab9de22 100644
--- a/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentReferenceBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentReferenceBuilderImpl.java
diff --git a/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentServiceBuilderImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentServiceBuilderImpl.java
index 379429d17e..379429d17e 100644
--- a/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentServiceBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentServiceBuilderImpl.java
diff --git a/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/CompositeBuilderImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/CompositeBuilderImpl.java
index 709562cd72..709562cd72 100644
--- a/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/CompositeBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/CompositeBuilderImpl.java
diff --git a/branches/sca-java-0.90/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataService.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataService.java
index ba91fd2168..ba91fd2168 100644
--- a/branches/sca-java-0.90/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataService.java
diff --git a/branches/sca-java-0.90/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataServiceImpl.java
index 4e239d03d3..4e239d03d3 100644
--- a/branches/sca-java-0.90/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataServiceImpl.java
diff --git a/branches/sca-java-0.90/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountService.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountService.java
index 030c820ed2..030c820ed2 100644
--- a/branches/sca-java-0.90/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountService.java
diff --git a/branches/sca-java-0.90/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountServiceImpl.java
index 92f448ec87..92f448ec87 100644
--- a/branches/sca-java-0.90/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountServiceImpl.java
diff --git a/branches/sca-java-0.90/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilder.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilder.java
index b856201551..b856201551 100644
--- a/branches/sca-java-0.90/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilder.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilder.java
diff --git a/branches/sca-java-0.90/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilderTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilderTestCase.java
index 90a4292546..90a4292546 100644
--- a/branches/sca-java-0.90/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilderTestCase.java
diff --git a/branches/sca-java-0.90/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/StockQuoteService.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/StockQuoteService.java
index a0580095a0..a0580095a0 100644
--- a/branches/sca-java-0.90/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/StockQuoteService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/StockQuoteService.java
diff --git a/branches/sca-java-0.90/modules/assembly-xml/.checkstyle b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/.checkstyle
index 3e57539570..3e57539570 100644
--- a/branches/sca-java-0.90/modules/assembly-xml/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/.checkstyle
diff --git a/branches/sca-java-0.90/modules/assembly-xml/.pmd b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/.pmd
index 2db10d6a6a..2db10d6a6a 100644
--- a/branches/sca-java-0.90/modules/assembly-xml/.pmd
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/.pmd
diff --git a/branches/sca-java-0.90/modules/assembly-xml/.ruleset b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/.ruleset
index 830b4cfee4..830b4cfee4 100644
--- a/branches/sca-java-0.90/modules/assembly-xml/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/.ruleset
diff --git a/branches/sca-java-0.90/modules/assembly-xml/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.90/modules/assembly-xml/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/DISCLAIMER
diff --git a/branches/sca-java-0.90/modules/assembly-xml/LICENSE b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.90/modules/assembly-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/LICENSE
diff --git a/branches/sca-java-0.90/modules/assembly-xml/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.90/modules/assembly-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/NOTICE
diff --git a/branches/sca-java-0.90/modules/assembly-xml/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/pom.xml
index e1ab513836..e1ab513836 100644
--- a/branches/sca-java-0.90/modules/assembly-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/pom.xml
diff --git a/branches/sca-java-0.90/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseArtifactProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseArtifactProcessor.java
index 9223fa8947..9223fa8947 100644
--- a/branches/sca-java-0.90/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseArtifactProcessor.java
diff --git a/branches/sca-java-0.90/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
index 32655689b2..32655689b2 100644
--- a/branches/sca-java-0.90/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
diff --git a/branches/sca-java-0.90/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
index 386842e8d6..386842e8d6 100644
--- a/branches/sca-java-0.90/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
diff --git a/branches/sca-java-0.90/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
index feafb73c05..feafb73c05 100644
--- a/branches/sca-java-0.90/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
diff --git a/branches/sca-java-0.90/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
index 6e68780ff5..6e68780ff5 100644
--- a/branches/sca-java-0.90/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
diff --git a/branches/sca-java-0.90/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
index cd98685203..cd98685203 100644
--- a/branches/sca-java-0.90/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
diff --git a/branches/sca-java-0.90/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
index fa22602356..fa22602356 100644
--- a/branches/sca-java-0.90/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
diff --git a/branches/sca-java-0.90/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
index 74a9fc430e..74a9fc430e 100644
--- a/branches/sca-java-0.90/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
diff --git a/branches/sca-java-0.90/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/XAttr.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/XAttr.java
index 3c991798de..3c991798de 100644
--- a/branches/sca-java-0.90/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/XAttr.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/XAttr.java
diff --git a/branches/sca-java-0.90/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
index 110e155bb0..110e155bb0 100644
--- a/branches/sca-java-0.90/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
diff --git a/branches/sca-java-0.90/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
index 967256c54a..967256c54a 100644
--- a/branches/sca-java-0.90/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
diff --git a/branches/sca-java-0.90/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
index 50a429a82c..50a429a82c 100644
--- a/branches/sca-java-0.90/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
diff --git a/branches/sca-java-0.90/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
index 407354c2d2..407354c2d2 100644
--- a/branches/sca-java-0.90/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
diff --git a/branches/sca-java-0.90/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/StAXPerfTest.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/StAXPerfTest.java
index 46ed9ea425..46ed9ea425 100644
--- a/branches/sca-java-0.90/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/StAXPerfTest.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/StAXPerfTest.java
diff --git a/branches/sca-java-0.90/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestModelResolver.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestModelResolver.java
index 7a4077188a..7a4077188a 100644
--- a/branches/sca-java-0.90/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestModelResolver.java
diff --git a/branches/sca-java-0.90/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
index 2b95057f23..2b95057f23 100644
--- a/branches/sca-java-0.90/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
diff --git a/branches/sca-java-0.90/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
index 39b9b04a3e..39b9b04a3e 100644
--- a/branches/sca-java-0.90/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
diff --git a/branches/sca-java-0.90/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
index 4546fddb2d..4546fddb2d 100644
--- a/branches/sca-java-0.90/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
diff --git a/branches/sca-java-0.90/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
index 072fe8fde1..072fe8fde1 100644
--- a/branches/sca-java-0.90/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
diff --git a/branches/sca-java-0.90/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
index d67ba3ec2b..d67ba3ec2b 100644
--- a/branches/sca-java-0.90/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
diff --git a/branches/sca-java-0.90/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
index 2fedb28df2..2fedb28df2 100644
--- a/branches/sca-java-0.90/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
diff --git a/branches/sca-java-0.90/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
index 74cb8950a3..74cb8950a3 100644
--- a/branches/sca-java-0.90/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
diff --git a/branches/sca-java-0.90/modules/assembly/.checkstyle b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/.checkstyle
index e3c216986d..e3c216986d 100644
--- a/branches/sca-java-0.90/modules/assembly/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/.checkstyle
diff --git a/branches/sca-java-0.90/modules/assembly/.pmd b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/.pmd
index aa1ce3e754..aa1ce3e754 100644
--- a/branches/sca-java-0.90/modules/assembly/.pmd
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/.pmd
diff --git a/branches/sca-java-0.90/modules/assembly/.ruleset b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/.ruleset
index ba9b5ce886..ba9b5ce886 100644
--- a/branches/sca-java-0.90/modules/assembly/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/.ruleset
diff --git a/branches/sca-java-0.90/modules/assembly/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.90/modules/assembly/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/DISCLAIMER
diff --git a/branches/sca-java-0.90/modules/assembly/LICENSE b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.90/modules/assembly/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/LICENSE
diff --git a/branches/sca-java-0.90/modules/assembly/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.90/modules/assembly/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/NOTICE
diff --git a/branches/sca-java-0.90/modules/assembly/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/pom.xml
index 1f119f2efd..1f119f2efd 100644
--- a/branches/sca-java-0.90/modules/assembly/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/pom.xml
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
index 8f371defde..8f371defde 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
index 35c5da4123..35c5da4123 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
index a9ef26bbb9..a9ef26bbb9 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
index 9ae511c07b..9ae511c07b 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
index 3937d34f92..3937d34f92 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
index 9681ff0c40..9681ff0c40 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
index 8d7d6958be..8d7d6958be 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
index b50e4ec06b..b50e4ec06b 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
index 72ee71de8c..72ee71de8c 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
index 9a344afb09..9a344afb09 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
index 1f4b4f0801..1f4b4f0801 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
index c0e42dbb93..c0e42dbb93 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
index ffdef42aed..ffdef42aed 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
index 1fe402d829..1fe402d829 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
index d3fa80ba74..d3fa80ba74 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
index 757e2bda2e..757e2bda2e 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
index 4119d0a268..4119d0a268 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
index 830ede478a..830ede478a 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
index 5dd256e3c4..5dd256e3c4 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultSCABindingFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultSCABindingFactory.java
index 793a8f960b..793a8f960b 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultSCABindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultSCABindingFactory.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
index e79f9bccdb..e79f9bccdb 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
index 5d15ce9938..5d15ce9938 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
index 98089d66cb..98089d66cb 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
index 3b2d2b124c..3b2d2b124c 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
index eaf60aa6d9..eaf60aa6d9 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
index 0abfd13d10..0abfd13d10 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
index ea32efb769..ea32efb769 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Visitable.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Visitable.java
index 6d3998b79e..6d3998b79e 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Visitable.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Visitable.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Visitor.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Visitor.java
index a15354e401..a15354e401 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Visitor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Visitor.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
index 58562eb5ad..58562eb5ad 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
index 26bdc3cffa..26bdc3cffa 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
index 5a2015f55e..5a2015f55e 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderMonitor.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderMonitor.java
index aecdf417f2..aecdf417f2 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderMonitor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderMonitor.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Problem.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Problem.java
index 8965410438..8965410438 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Problem.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Problem.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
index dbb0674522..dbb0674522 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java
index 2b85cec9fa..2b85cec9fa 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyUtil.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyUtil.java
index 71be058795..71be058795 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyUtil.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyUtil.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java
index 9802e9ba63..9802e9ba63 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
index 989aea1237..989aea1237 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
index d0ee3832c5..d0ee3832c5 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
index 346764b1b4..346764b1b4 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
index 1e623d35f2..1e623d35f2 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
index 40c07d2e4f..40c07d2e4f 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
index 87ef907a80..87ef907a80 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
index ec837c060c..ec837c060c 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
index 8a9b8e446d..8a9b8e446d 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
index bd593f7502..bd593f7502 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
index 66883133d7..66883133d7 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
index e57f25551a..e57f25551a 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
index 5c40f9445b..5c40f9445b 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
index 4348e08fcb..4348e08fcb 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
index 19a6ed56c2..19a6ed56c2 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
index f9fbae6659..f9fbae6659 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
index d295384305..d295384305 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
index ebdcdf580b..ebdcdf580b 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
index 5ceb5bb950..5ceb5bb950 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java
index 402b90706d..402b90706d 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java
index 93b7d7a88f..93b7d7a88f 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
index c5bf3a10d0..c5bf3a10d0 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
index 06db488fba..06db488fba 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/util/PrintUtil.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/util/PrintUtil.java
index 08b39f976b..08b39f976b 100644
--- a/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/util/PrintUtil.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/util/PrintUtil.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
index cde42cbc62..cde42cbc62 100644
--- a/branches/sca-java-0.90/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
index 9b3ac4c2d4..9b3ac4c2d4 100644
--- a/branches/sca-java-0.90/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
index 9e34fafb05..9e34fafb05 100644
--- a/branches/sca-java-0.90/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
index dbe0cb8225..dbe0cb8225 100644
--- a/branches/sca-java-0.90/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
index ee6b95edc9..ee6b95edc9 100644
--- a/branches/sca-java-0.90/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
index 460672c1ef..460672c1ef 100644
--- a/branches/sca-java-0.90/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
diff --git a/branches/sca-java-0.90/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
index aeb076a392..aeb076a392 100644
--- a/branches/sca-java-0.90/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
diff --git a/branches/sca-java-0.90/modules/binding-jsonrpc/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.90/modules/binding-jsonrpc/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/DISCLAIMER
diff --git a/branches/sca-java-0.90/modules/binding-jsonrpc/LICENSE b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.90/modules/binding-jsonrpc/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/LICENSE
diff --git a/branches/sca-java-0.90/modules/binding-jsonrpc/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.90/modules/binding-jsonrpc/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/NOTICE
diff --git a/branches/sca-java-0.90/modules/binding-jsonrpc/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/pom.xml
index d5493a95de..d5493a95de 100644
--- a/branches/sca-java-0.90/modules/binding-jsonrpc/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/pom.xml
diff --git a/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/DefaultJSONRPCBindingFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/DefaultJSONRPCBindingFactory.java
index 31575518f4..31575518f4 100644
--- a/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/DefaultJSONRPCBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/DefaultJSONRPCBindingFactory.java
diff --git a/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java
index 5e0e3b5b28..5e0e3b5b28 100644
--- a/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java
diff --git a/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBindingFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBindingFactory.java
index 7ba422eb85..7ba422eb85 100644
--- a/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBindingFactory.java
diff --git a/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingImpl.java
index 66f6dd640d..66f6dd640d 100644
--- a/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingImpl.java
diff --git a/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingProcessor.java
index 1ff888ace6..1ff888ace6 100644
--- a/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingProcessor.java
diff --git a/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/module/JSONRPCModuleActivator.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/module/JSONRPCModuleActivator.java
index 3475a31923..3475a31923 100644
--- a/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/module/JSONRPCModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/module/JSONRPCModuleActivator.java
diff --git a/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java
index ade2603516..ade2603516 100644
--- a/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java
diff --git a/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java
index 4bbf39e02c..4bbf39e02c 100644
--- a/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java
diff --git a/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java
index c8e43d824a..c8e43d824a 100644
--- a/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java
diff --git a/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java
index be593baa97..be593baa97 100644
--- a/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java
diff --git a/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/server/JSONRPCEntryPointServlet.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/server/JSONRPCEntryPointServlet.java
index cab8965f90..cab8965f90 100644
--- a/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/server/JSONRPCEntryPointServlet.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/server/JSONRPCEntryPointServlet.java
diff --git a/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/server/JSONRPCScriptServlet.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/server/JSONRPCScriptServlet.java
index 0fff49100e..0fff49100e 100644
--- a/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/server/JSONRPCScriptServlet.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/server/JSONRPCScriptServlet.java
diff --git a/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/util/JavaToSmd.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/util/JavaToSmd.java
index 339aca376c..339aca376c 100644
--- a/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/util/JavaToSmd.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/util/JavaToSmd.java
diff --git a/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/resources/JSONRPCBinding.composite b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/resources/JSONRPCBinding.composite
index 38a596ecf9..38a596ecf9 100644
--- a/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/resources/JSONRPCBinding.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/resources/JSONRPCBinding.composite
diff --git a/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index c4fa1f5de1..c4fa1f5de1 100644
--- a/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/server/jsonrpc.js b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/server/jsonrpc.js
index 2b9efbb55c..2b9efbb55c 100644
--- a/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/server/jsonrpc.js
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/server/jsonrpc.js
diff --git a/branches/sca-java-0.90/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/Echo.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/Echo.java
index 584228abde..584228abde 100644
--- a/branches/sca-java-0.90/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/Echo.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/Echo.java
diff --git a/branches/sca-java-0.90/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/EchoComponentImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/EchoComponentImpl.java
index e63cafd6a6..e63cafd6a6 100644
--- a/branches/sca-java-0.90/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/EchoComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/EchoComponentImpl.java
diff --git a/branches/sca-java-0.90/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java
index 898807c7ef..898807c7ef 100644
--- a/branches/sca-java-0.90/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java
diff --git a/branches/sca-java-0.90/modules/binding-rmi/.ruleset b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/.ruleset
index 3886f07f2d..3886f07f2d 100644
--- a/branches/sca-java-0.90/modules/binding-rmi/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/.ruleset
diff --git a/branches/sca-java-0.90/modules/binding-rmi/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.90/modules/binding-rmi/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/DISCLAIMER
diff --git a/branches/sca-java-0.90/modules/binding-rmi/LICENSE b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.90/modules/binding-rmi/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/LICENSE
diff --git a/branches/sca-java-0.90/modules/binding-rmi/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.90/modules/binding-rmi/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/NOTICE
diff --git a/branches/sca-java-0.90/modules/binding-rmi/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/pom.xml
index 3953552b03..3953552b03 100755
--- a/branches/sca-java-0.90/modules/binding-rmi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/pom.xml
diff --git a/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/DefaultRMIBindingFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/DefaultRMIBindingFactory.java
index bc92dba962..bc92dba962 100644
--- a/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/DefaultRMIBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/DefaultRMIBindingFactory.java
diff --git a/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/NoRemoteMethodException.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/NoRemoteMethodException.java
index 874a2ca066..874a2ca066 100644
--- a/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/NoRemoteMethodException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/NoRemoteMethodException.java
diff --git a/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/NoRemoteServiceException.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/NoRemoteServiceException.java
index 81b51c7e53..81b51c7e53 100644
--- a/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/NoRemoteServiceException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/NoRemoteServiceException.java
diff --git a/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java
index d01c26f368..d01c26f368 100644
--- a/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java
diff --git a/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingConstants.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingConstants.java
index e350386ca0..e350386ca0 100644
--- a/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingConstants.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingConstants.java
diff --git a/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingFactory.java
index 199b4053e3..199b4053e3 100644
--- a/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingFactory.java
diff --git a/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingImpl.java
index 144bc3623a..144bc3623a 100644
--- a/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingImpl.java
diff --git a/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingInvoker.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingInvoker.java
index 50ff9233ef..50ff9233ef 100644
--- a/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingInvoker.java
diff --git a/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingProvider.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingProvider.java
index b22ddd936a..b22ddd936a 100644
--- a/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingProvider.java
diff --git a/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingProviderFactory.java
index 604eae3ab0..604eae3ab0 100644
--- a/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingProviderFactory.java
diff --git a/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIModuleActivator.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIModuleActivator.java
index aaf77bbf66..aaf77bbf66 100644
--- a/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIModuleActivator.java
diff --git a/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIRuntimeException.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIRuntimeException.java
index 79382c75c6..79382c75c6 100644
--- a/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIRuntimeException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIRuntimeException.java
diff --git a/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/xml/RMIBindingProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/xml/RMIBindingProcessor.java
index 0a33e00548..0a33e00548 100644
--- a/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/xml/RMIBindingProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/xml/RMIBindingProcessor.java
diff --git a/branches/sca-java-0.90/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 9cc4a2ed7f..9cc4a2ed7f 100644
--- a/branches/sca-java-0.90/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-0.90/modules/binding-rmi/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/test/java/helloworld/HelloWorldImpl.java
index acb81a00f6..acb81a00f6 100644
--- a/branches/sca-java-0.90/modules/binding-rmi/src/test/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/test/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-0.90/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiImpl.java
index 73aedc3b6c..73aedc3b6c 100644
--- a/branches/sca-java-0.90/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiImpl.java
diff --git a/branches/sca-java-0.90/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiService.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiService.java
index f636c8f7d8..f636c8f7d8 100644
--- a/branches/sca-java-0.90/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiService.java
diff --git a/branches/sca-java-0.90/modules/binding-rmi/src/test/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/test/java/helloworld/HelloWorldService.java
index d5dc509f3e..d5dc509f3e 100644
--- a/branches/sca-java-0.90/modules/binding-rmi/src/test/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/test/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-0.90/modules/binding-rmi/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java
index e9991185a8..e9991185a8 100644
--- a/branches/sca-java-0.90/modules/binding-rmi/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java
diff --git a/branches/sca-java-0.90/modules/binding-rmi/src/test/java/org/apache/tuscany/sca/binding/rmi/NoRemoteMethodExceptionTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/test/java/org/apache/tuscany/sca/binding/rmi/NoRemoteMethodExceptionTestCase.java
index 3f9aa9950f..3f9aa9950f 100644
--- a/branches/sca-java-0.90/modules/binding-rmi/src/test/java/org/apache/tuscany/sca/binding/rmi/NoRemoteMethodExceptionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/test/java/org/apache/tuscany/sca/binding/rmi/NoRemoteMethodExceptionTestCase.java
diff --git a/branches/sca-java-0.90/modules/binding-rmi/src/test/java/org/apache/tuscany/sca/binding/rmi/NoRemoteServiceExceptionTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/test/java/org/apache/tuscany/sca/binding/rmi/NoRemoteServiceExceptionTestCase.java
index d4de9996de..d4de9996de 100644
--- a/branches/sca-java-0.90/modules/binding-rmi/src/test/java/org/apache/tuscany/sca/binding/rmi/NoRemoteServiceExceptionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/test/java/org/apache/tuscany/sca/binding/rmi/NoRemoteServiceExceptionTestCase.java
diff --git a/branches/sca-java-0.90/modules/binding-rmi/src/test/resources/HelloWorldImpl.componentType b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/test/resources/HelloWorldImpl.componentType
index 224a68f88d..224a68f88d 100644
--- a/branches/sca-java-0.90/modules/binding-rmi/src/test/resources/HelloWorldImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/test/resources/HelloWorldImpl.componentType
diff --git a/branches/sca-java-0.90/modules/binding-rmi/src/test/resources/HelloWorldRmiImpl.componentType b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/test/resources/HelloWorldRmiImpl.componentType
index a83e7e6d1d..a83e7e6d1d 100644
--- a/branches/sca-java-0.90/modules/binding-rmi/src/test/resources/HelloWorldRmiImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/test/resources/HelloWorldRmiImpl.componentType
diff --git a/branches/sca-java-0.90/modules/binding-rmi/src/test/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/test/resources/META-INF/LICENSE.txt
index 0084319535..0084319535 100644
--- a/branches/sca-java-0.90/modules/binding-rmi/src/test/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/test/resources/META-INF/LICENSE.txt
diff --git a/branches/sca-java-0.90/modules/binding-rmi/src/test/resources/META-INF/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/test/resources/META-INF/NOTICE
index d83ebbe236..d83ebbe236 100644
--- a/branches/sca-java-0.90/modules/binding-rmi/src/test/resources/META-INF/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/test/resources/META-INF/NOTICE
diff --git a/branches/sca-java-0.90/modules/binding-rmi/src/test/resources/RMIBindingTest.composite b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/test/resources/RMIBindingTest.composite
index 9f7b2548bf..9f7b2548bf 100644
--- a/branches/sca-java-0.90/modules/binding-rmi/src/test/resources/RMIBindingTest.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-rmi/src/test/resources/RMIBindingTest.composite
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/DISCLAIMER
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/LICENSE b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/LICENSE
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/NOTICE
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/pom.xml
index 3807157bef..3807157bef 100755
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/pom.xml
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/assembly/axis2.xml b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/assembly/axis2.xml
index 52a61790ca..52a61790ca 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/assembly/axis2.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/assembly/axis2.xml
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2AsyncBindingInvoker.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2AsyncBindingInvoker.java
index e2517e02d8..e2517e02d8 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2AsyncBindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2AsyncBindingInvoker.java
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2BindingInvoker.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2BindingInvoker.java
index fe33416f8b..fe33416f8b 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2BindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2BindingInvoker.java
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2BindingProviderFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2BindingProviderFactory.java
index f6631d7e1f..f6631d7e1f 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2BindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2BindingProviderFactory.java
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2CallbackInvocationHandler.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2CallbackInvocationHandler.java
index 91d0f05bde..91d0f05bde 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2CallbackInvocationHandler.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2CallbackInvocationHandler.java
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ModuleActivator.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ModuleActivator.java
index 50e916c084..50e916c084 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ModuleActivator.java
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2OneWayBindingInvoker.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2OneWayBindingInvoker.java
index fb95022c6b..fb95022c6b 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2OneWayBindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2OneWayBindingInvoker.java
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ReferenceBindingProvider.java
index 98994aa917..98994aa917 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ReferenceBindingProvider.java
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ReferenceCallback.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ReferenceCallback.java
index cbc82f9c68..cbc82f9c68 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ReferenceCallback.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ReferenceCallback.java
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ReferenceCallbackTargetInvoker.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ReferenceCallbackTargetInvoker.java
index dce9bf8cf1..dce9bf8cf1 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ReferenceCallbackTargetInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ReferenceCallbackTargetInvoker.java
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceBindingProvider.java
index f843cb07a4..f843cb07a4 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceBindingProvider.java
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceCallbackTargetInvoker.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceCallbackTargetInvoker.java
index 29eb24bc61..29eb24bc61 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceCallbackTargetInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceCallbackTargetInvoker.java
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceInMessageReceiver.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceInMessageReceiver.java
index 85871c7924..85871c7924 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceInMessageReceiver.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceInMessageReceiver.java
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceInOutAsyncMessageReceiver.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceInOutAsyncMessageReceiver.java
index 70d705c7b8..70d705c7b8 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceInOutAsyncMessageReceiver.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceInOutAsyncMessageReceiver.java
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceInOutSyncMessageReceiver.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceInOutSyncMessageReceiver.java
index ea5bb9f2e6..ea5bb9f2e6 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceInOutSyncMessageReceiver.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceInOutSyncMessageReceiver.java
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceServlet.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceServlet.java
index b313ff1b4e..b313ff1b4e 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceServlet.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceServlet.java
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/TuscanyAxisConfigurator.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/TuscanyAxisConfigurator.java
index 370ed6e0a4..370ed6e0a4 100755
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/TuscanyAxisConfigurator.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/TuscanyAxisConfigurator.java
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/TuscanyDispatcher.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/TuscanyDispatcher.java
index 8988c74445..8988c74445 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/TuscanyDispatcher.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/TuscanyDispatcher.java
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/TuscanyListingAgent.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/TuscanyListingAgent.java
index 87338ceb27..87338ceb27 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/TuscanyListingAgent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/TuscanyListingAgent.java
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index f3bdb2511a..f3bdb2511a 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/axis2/engine/config/axis2.xml b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/axis2/engine/config/axis2.xml
index 52a61790ca..52a61790ca 100755
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/axis2/engine/config/axis2.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/axis2/engine/config/axis2.xml
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/Axis2ReferenceTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/Axis2ReferenceTestCase.java
index 6b364eec68..6b364eec68 100755
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/Axis2ReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/Axis2ReferenceTestCase.java
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceTestCase.java
index 13ea94dd66..13ea94dd66 100755
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceTestCase.java
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/Greeter.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/Greeter.java
index c604b954a4..c604b954a4 100755
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/Greeter.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/Greeter.java
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/GreetingCallback.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/GreetingCallback.java
index bcf9baa42d..bcf9baa42d 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/GreetingCallback.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/GreetingCallback.java
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorld.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorld.java
index dfc78e7cd8..dfc78e7cd8 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorld.java
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldComponent.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldComponent.java
index 3978726f2a..3978726f2a 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldComponent.java
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldMultiService.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldMultiService.java
index 8c1120f545..8c1120f545 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldMultiService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldMultiService.java
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldOM.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldOM.java
index 897ac8dcb9..897ac8dcb9 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldOM.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldOM.java
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldOM2.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldOM2.java
index 8981541ad8..8981541ad8 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldOM2.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldOM2.java
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldOMComponent.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldOMComponent.java
index 6b6abb843f..6b6abb843f 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldOMComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldOMComponent.java
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldOMService.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldOMService.java
index 861509c003..861509c003 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldOMService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldOMService.java
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldOMTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldOMTestCase.java
index 40aa0e4480..40aa0e4480 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldOMTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldOMTestCase.java
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldService.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldService.java
index d7d6b93f34..d7d6b93f34 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldService.java
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldTestCaseFIXME.java
index ee42e8cb5f..ee42e8cb5f 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldTestCaseFIXME.java
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/QuestionMarkWSDLTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/QuestionMarkWSDLTestCaseFIXME.java
index 11eba9a8c4..11eba9a8c4 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/QuestionMarkWSDLTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/QuestionMarkWSDLTestCaseFIXME.java
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/endpoints/AbstractHelloWorldOMTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/endpoints/AbstractHelloWorldOMTestCase.java
index b52c10e341..b52c10e341 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/endpoints/AbstractHelloWorldOMTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/endpoints/AbstractHelloWorldOMTestCase.java
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/endpoints/DefaultMultiServiceTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/endpoints/DefaultMultiServiceTestCase.java
index 3f1677fa90..3f1677fa90 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/endpoints/DefaultMultiServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/endpoints/DefaultMultiServiceTestCase.java
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/endpoints/DefaultSingleServiceTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/endpoints/DefaultSingleServiceTestCase.java
index 9b0ee7304d..9b0ee7304d 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/endpoints/DefaultSingleServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/endpoints/DefaultSingleServiceTestCase.java
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/endpoints/WSDLExplicitURITestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/endpoints/WSDLExplicitURITestCase.java
index 7155d80100..7155d80100 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/endpoints/WSDLExplicitURITestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/endpoints/WSDLExplicitURITestCase.java
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/endpoints/WSDLRelativeURITestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/endpoints/WSDLRelativeURITestCase.java
index ce862be74e..ce862be74e 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/endpoints/WSDLRelativeURITestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/endpoints/WSDLRelativeURITestCase.java
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/HelloWorld.composite b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/HelloWorld.composite
index ceb026d253..ceb026d253 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/HelloWorld.composite
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/endpoints/DefaultMultiService.composite b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/endpoints/DefaultMultiService.composite
index a58b7eb0d7..a58b7eb0d7 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/endpoints/DefaultMultiService.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/endpoints/DefaultMultiService.composite
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/endpoints/DefaultSingleService.composite b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/endpoints/DefaultSingleService.composite
index 6b16d9de21..6b16d9de21 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/endpoints/DefaultSingleService.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/endpoints/DefaultSingleService.composite
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/endpoints/WSDLExplicitURI.composite b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/endpoints/WSDLExplicitURI.composite
index f20e8e6574..f20e8e6574 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/endpoints/WSDLExplicitURI.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/endpoints/WSDLExplicitURI.composite
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/endpoints/WSDLRelativeURI.composite b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/endpoints/WSDLRelativeURI.composite
index a9da20141c..a9da20141c 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/endpoints/WSDLRelativeURI.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/endpoints/WSDLRelativeURI.composite
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/endpoints/helloworld-om-relative-uri.wsdl b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/endpoints/helloworld-om-relative-uri.wsdl
index cd63064b59..cd63064b59 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/endpoints/helloworld-om-relative-uri.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/endpoints/helloworld-om-relative-uri.wsdl
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/helloworld-om-uri.wsdl b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/helloworld-om-uri.wsdl
index 456676e068..456676e068 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/helloworld-om-uri.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/helloworld-om-uri.wsdl
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/helloworld-om.composite b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/helloworld-om.composite
index 8c861c84be..8c861c84be 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/helloworld-om.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/helloworld-om.composite
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/helloworld-om.wsdl b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/helloworld-om.wsdl
index 73ca02246d..73ca02246d 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/helloworld-om.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/helloworld-om.wsdl
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/helloworld.wsdl b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/helloworld.wsdl
index 68174d1ecd..68174d1ecd 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/helloworld.wsdl
diff --git a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/questionmark-wsdl.composite b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/questionmark-wsdl.composite
index fca9a4d754..fca9a4d754 100644
--- a/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/questionmark-wsdl.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/questionmark-wsdl.composite
diff --git a/branches/sca-java-0.90/modules/binding-ws-xml/.checkstyle b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-xml/.checkstyle
index e3c216986d..e3c216986d 100644
--- a/branches/sca-java-0.90/modules/binding-ws-xml/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-xml/.checkstyle
diff --git a/branches/sca-java-0.90/modules/binding-ws-xml/.pmd b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-xml/.pmd
index 2db10d6a6a..2db10d6a6a 100644
--- a/branches/sca-java-0.90/modules/binding-ws-xml/.pmd
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-xml/.pmd
diff --git a/branches/sca-java-0.90/modules/binding-ws-xml/.ruleset b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-xml/.ruleset
index ba9b5ce886..ba9b5ce886 100644
--- a/branches/sca-java-0.90/modules/binding-ws-xml/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-xml/.ruleset
diff --git a/branches/sca-java-0.90/modules/binding-ws-xml/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-xml/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.90/modules/binding-ws-xml/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-xml/DISCLAIMER
diff --git a/branches/sca-java-0.90/modules/binding-ws-xml/LICENSE b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.90/modules/binding-ws-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-xml/LICENSE
diff --git a/branches/sca-java-0.90/modules/binding-ws-xml/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-xml/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.90/modules/binding-ws-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-xml/NOTICE
diff --git a/branches/sca-java-0.90/modules/binding-ws-xml/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-xml/pom.xml
index acc305308d..acc305308d 100644
--- a/branches/sca-java-0.90/modules/binding-ws-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-xml/pom.xml
diff --git a/branches/sca-java-0.90/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
index 36afd1d92b..36afd1d92b 100644
--- a/branches/sca-java-0.90/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
diff --git a/branches/sca-java-0.90/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java
index 34d0fc4949..34d0fc4949 100644
--- a/branches/sca-java-0.90/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java
diff --git a/branches/sca-java-0.90/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java
index 8a0e462624..8a0e462624 100644
--- a/branches/sca-java-0.90/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java
diff --git a/branches/sca-java-0.90/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java
index b686cbacaf..b686cbacaf 100644
--- a/branches/sca-java-0.90/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java
diff --git a/branches/sca-java-0.90/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite
index 957ef38753..957ef38753 100644
--- a/branches/sca-java-0.90/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite
diff --git a/branches/sca-java-0.90/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType
index 01121f6771..01121f6771 100644
--- a/branches/sca-java-0.90/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType
diff --git a/branches/sca-java-0.90/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/example.wsdl b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/example.wsdl
index 5e8e5dad0d..5e8e5dad0d 100644
--- a/branches/sca-java-0.90/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/example.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/example.wsdl
diff --git a/branches/sca-java-0.90/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/invalid-stockquote.wsdl b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/invalid-stockquote.wsdl
index ad81fc7867..ad81fc7867 100644
--- a/branches/sca-java-0.90/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/invalid-stockquote.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/invalid-stockquote.wsdl
diff --git a/branches/sca-java-0.90/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/ipo.xsd b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/ipo.xsd
index 241ec15d36..241ec15d36 100644
--- a/branches/sca-java-0.90/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/ipo.xsd
diff --git a/branches/sca-java-0.90/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/stockquote.wsdl b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/stockquote.wsdl
index 39cd5547d9..39cd5547d9 100644
--- a/branches/sca-java-0.90/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/stockquote.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/stockquote.wsdl
diff --git a/branches/sca-java-0.90/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.wsdl b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.wsdl
index 06bdc5510c..06bdc5510c 100644
--- a/branches/sca-java-0.90/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.wsdl
diff --git a/branches/sca-java-0.90/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.xsd b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.xsd
index c2210f4a94..c2210f4a94 100644
--- a/branches/sca-java-0.90/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.xsd
diff --git a/branches/sca-java-0.90/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test2.wsdl b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test2.wsdl
index 529b395fd5..529b395fd5 100644
--- a/branches/sca-java-0.90/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test2.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test2.wsdl
diff --git a/branches/sca-java-0.90/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/unwrapped-stockquote.wsdl b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/unwrapped-stockquote.wsdl
index 666a7e4069..666a7e4069 100644
--- a/branches/sca-java-0.90/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/unwrapped-stockquote.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/unwrapped-stockquote.wsdl
diff --git a/branches/sca-java-0.90/modules/binding-ws/.checkstyle b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws/.checkstyle
index e3c216986d..e3c216986d 100644
--- a/branches/sca-java-0.90/modules/binding-ws/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws/.checkstyle
diff --git a/branches/sca-java-0.90/modules/binding-ws/.pmd b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws/.pmd
index 2db10d6a6a..2db10d6a6a 100644
--- a/branches/sca-java-0.90/modules/binding-ws/.pmd
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws/.pmd
diff --git a/branches/sca-java-0.90/modules/binding-ws/.ruleset b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws/.ruleset
index ba9b5ce886..ba9b5ce886 100644
--- a/branches/sca-java-0.90/modules/binding-ws/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws/.ruleset
diff --git a/branches/sca-java-0.90/modules/binding-ws/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.90/modules/binding-ws/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws/DISCLAIMER
diff --git a/branches/sca-java-0.90/modules/binding-ws/LICENSE b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.90/modules/binding-ws/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws/LICENSE
diff --git a/branches/sca-java-0.90/modules/binding-ws/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.90/modules/binding-ws/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws/NOTICE
diff --git a/branches/sca-java-0.90/modules/binding-ws/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws/pom.xml
index 46f5663a8b..46f5663a8b 100644
--- a/branches/sca-java-0.90/modules/binding-ws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws/pom.xml
diff --git a/branches/sca-java-0.90/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/DefaultWebServiceBindingFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/DefaultWebServiceBindingFactory.java
index 04f8ab0d3c..04f8ab0d3c 100644
--- a/branches/sca-java-0.90/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/DefaultWebServiceBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/DefaultWebServiceBindingFactory.java
diff --git a/branches/sca-java-0.90/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java
index ecfd9cfbc7..ecfd9cfbc7 100644
--- a/branches/sca-java-0.90/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java
diff --git a/branches/sca-java-0.90/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBindingFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBindingFactory.java
index 1ad38c69e4..1ad38c69e4 100644
--- a/branches/sca-java-0.90/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBindingFactory.java
diff --git a/branches/sca-java-0.90/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java
index 8902dd04ee..8902dd04ee 100644
--- a/branches/sca-java-0.90/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java
diff --git a/branches/sca-java-0.90/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
index 910fb652a8..910fb652a8 100644
--- a/branches/sca-java-0.90/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
diff --git a/branches/sca-java-0.90/modules/commonj-api/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/modules/commonj-api/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.90/modules/commonj-api/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/commonj-api/DISCLAIMER
diff --git a/branches/sca-java-0.90/modules/commonj-api/LICENSE b/sca-java-1.x/branches/sca-java-0.90/modules/commonj-api/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.90/modules/commonj-api/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/commonj-api/LICENSE
diff --git a/branches/sca-java-0.90/modules/commonj-api/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/commonj-api/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.90/modules/commonj-api/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/commonj-api/NOTICE
diff --git a/branches/sca-java-0.90/modules/commonj-api/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/commonj-api/pom.xml
index cf8baa9123..cf8baa9123 100644
--- a/branches/sca-java-0.90/modules/commonj-api/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/commonj-api/pom.xml
diff --git a/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/timers/CancelTimerListener.java b/sca-java-1.x/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/timers/CancelTimerListener.java
index ba252e70dc..ba252e70dc 100644
--- a/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/timers/CancelTimerListener.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/timers/CancelTimerListener.java
diff --git a/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/timers/StopTimerListener.java b/sca-java-1.x/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/timers/StopTimerListener.java
index 92defc4bdc..92defc4bdc 100644
--- a/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/timers/StopTimerListener.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/timers/StopTimerListener.java
diff --git a/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/timers/Timer.java b/sca-java-1.x/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/timers/Timer.java
index 0a5c3b65fb..0a5c3b65fb 100644
--- a/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/timers/Timer.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/timers/Timer.java
diff --git a/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/timers/TimerListener.java b/sca-java-1.x/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/timers/TimerListener.java
index 6e3733b5f4..6e3733b5f4 100644
--- a/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/timers/TimerListener.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/timers/TimerListener.java
diff --git a/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/timers/TimerManager.java b/sca-java-1.x/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/timers/TimerManager.java
index c07b6478d5..c07b6478d5 100644
--- a/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/timers/TimerManager.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/timers/TimerManager.java
diff --git a/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/work/RemoteWorkItem.java b/sca-java-1.x/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/work/RemoteWorkItem.java
index f079dce312..f079dce312 100644
--- a/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/work/RemoteWorkItem.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/work/RemoteWorkItem.java
diff --git a/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/work/Work.java b/sca-java-1.x/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/work/Work.java
index 1071fe4a2e..1071fe4a2e 100644
--- a/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/work/Work.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/work/Work.java
diff --git a/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/work/WorkCompletedException.java b/sca-java-1.x/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/work/WorkCompletedException.java
index 21786c4b99..21786c4b99 100644
--- a/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/work/WorkCompletedException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/work/WorkCompletedException.java
diff --git a/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/work/WorkEvent.java b/sca-java-1.x/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/work/WorkEvent.java
index 9a7814b860..9a7814b860 100644
--- a/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/work/WorkEvent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/work/WorkEvent.java
diff --git a/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/work/WorkException.java b/sca-java-1.x/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/work/WorkException.java
index 3d24ec1055..3d24ec1055 100644
--- a/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/work/WorkException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/work/WorkException.java
diff --git a/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/work/WorkItem.java b/sca-java-1.x/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/work/WorkItem.java
index 6b8d3185a1..6b8d3185a1 100644
--- a/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/work/WorkItem.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/work/WorkItem.java
diff --git a/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/work/WorkListener.java b/sca-java-1.x/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/work/WorkListener.java
index 9b523f7321..9b523f7321 100644
--- a/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/work/WorkListener.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/work/WorkListener.java
diff --git a/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/work/WorkManager.java b/sca-java-1.x/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/work/WorkManager.java
index 2c4167d24c..2c4167d24c 100644
--- a/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/work/WorkManager.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/work/WorkManager.java
diff --git a/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/work/WorkRejectedException.java b/sca-java-1.x/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/work/WorkRejectedException.java
index cee8ea588a..cee8ea588a 100644
--- a/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/work/WorkRejectedException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/commonj-api/src/main/java/commonj/work/WorkRejectedException.java
diff --git a/branches/sca-java-0.90/modules/contribution-impl/.checkstyle b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/.checkstyle
index ace5fe6f53..ace5fe6f53 100644
--- a/branches/sca-java-0.90/modules/contribution-impl/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/.checkstyle
diff --git a/branches/sca-java-0.90/modules/contribution-impl/.pmd b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/.pmd
index 84af2f4d5d..84af2f4d5d 100644
--- a/branches/sca-java-0.90/modules/contribution-impl/.pmd
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/.pmd
diff --git a/branches/sca-java-0.90/modules/contribution-impl/.ruleset b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/.ruleset
index ac8671859d..ac8671859d 100644
--- a/branches/sca-java-0.90/modules/contribution-impl/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/.ruleset
diff --git a/branches/sca-java-0.90/modules/contribution-impl/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.90/modules/contribution-impl/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/DISCLAIMER
diff --git a/branches/sca-java-0.90/modules/contribution-impl/LICENSE b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.90/modules/contribution-impl/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/LICENSE
diff --git a/branches/sca-java-0.90/modules/contribution-impl/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.90/modules/contribution-impl/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/NOTICE
diff --git a/branches/sca-java-0.90/modules/contribution-impl/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/pom.xml
index 9dbc9bb569..9dbc9bb569 100644
--- a/branches/sca-java-0.90/modules/contribution-impl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/pom.xml
diff --git a/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java
index daf9f2289f..daf9f2289f 100644
--- a/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java
diff --git a/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionExportImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionExportImpl.java
index 90bde0f67e..90bde0f67e 100644
--- a/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionExportImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionExportImpl.java
diff --git a/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java
index a349939a0e..a349939a0e 100644
--- a/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java
diff --git a/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java
index 8d246eaf1c..8d246eaf1c 100644
--- a/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java
diff --git a/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImportImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImportImpl.java
index 3f241ff3d0..3f241ff3d0 100644
--- a/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImportImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImportImpl.java
diff --git a/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/DeployedArtifactImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/DeployedArtifactImpl.java
index 1d9bb04114..1d9bb04114 100644
--- a/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/DeployedArtifactImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/DeployedArtifactImpl.java
diff --git a/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java
index 5e22363f41..5e22363f41 100644
--- a/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java
diff --git a/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/InvalidFolderContributionException.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/InvalidFolderContributionException.java
index 6dbab56553..6dbab56553 100644
--- a/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/InvalidFolderContributionException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/InvalidFolderContributionException.java
diff --git a/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/InvalidFolderContributionURIException.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/InvalidFolderContributionURIException.java
index 8022834438..8022834438 100644
--- a/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/InvalidFolderContributionURIException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/InvalidFolderContributionURIException.java
diff --git a/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java
index 4ffec693d0..4ffec693d0 100644
--- a/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java
diff --git a/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/resolver/impl/ModelResolverImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/resolver/impl/ModelResolverImpl.java
index ffc82b908f..ffc82b908f 100644
--- a/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/resolver/impl/ModelResolverImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/resolver/impl/ModelResolverImpl.java
diff --git a/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ArtifactTypeDescriberImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ArtifactTypeDescriberImpl.java
index 174a09a0c6..174a09a0c6 100644
--- a/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ArtifactTypeDescriberImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ArtifactTypeDescriberImpl.java
diff --git a/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionMetadataLoaderImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionMetadataLoaderImpl.java
index a089756308..a089756308 100644
--- a/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionMetadataLoaderImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionMetadataLoaderImpl.java
diff --git a/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryImpl.java
index e2dc89782d..e2dc89782d 100644
--- a/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryImpl.java
diff --git a/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
index 196c9bc15a..196c9bc15a 100644
--- a/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
diff --git a/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/InvalidContributionMetadataException.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/InvalidContributionMetadataException.java
index a7e0e2f2f5..a7e0e2f2f5 100644
--- a/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/InvalidContributionMetadataException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/InvalidContributionMetadataException.java
diff --git a/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/InvalidContributionURIException.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/InvalidContributionURIException.java
index e3109e795b..e3109e795b 100644
--- a/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/InvalidContributionURIException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/InvalidContributionURIException.java
diff --git a/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/InvalidValueException.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/InvalidValueException.java
index ce0fb59476..ce0fb59476 100644
--- a/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/InvalidValueException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/InvalidValueException.java
diff --git a/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java
index 165c9d0616..165c9d0616 100644
--- a/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java
diff --git a/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/FileHelper.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/FileHelper.java
index bc63dca4a8..bc63dca4a8 100644
--- a/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/FileHelper.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/FileHelper.java
diff --git a/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java
index f8ea93ae5e..f8ea93ae5e 100644
--- a/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java
diff --git a/branches/sca-java-0.90/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java
index 6a2f2ac3cc..6a2f2ac3cc 100644
--- a/branches/sca-java-0.90/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java
diff --git a/branches/sca-java-0.90/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java
index 8765423dbe..8765423dbe 100644
--- a/branches/sca-java-0.90/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java
diff --git a/branches/sca-java-0.90/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ArtifactResolverTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ArtifactResolverTestCase.java
index ef0fd892c2..ef0fd892c2 100644
--- a/branches/sca-java-0.90/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ArtifactResolverTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ArtifactResolverTestCase.java
diff --git a/branches/sca-java-0.90/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContentTypeDescriberImplTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContentTypeDescriberImplTestCase.java
index 4f924225ae..4f924225ae 100644
--- a/branches/sca-java-0.90/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContentTypeDescriberImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContentTypeDescriberImplTestCase.java
diff --git a/branches/sca-java-0.90/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionMetadataLoaderTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionMetadataLoaderTestCase.java
index ac1d968f39..ac1d968f39 100644
--- a/branches/sca-java-0.90/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionMetadataLoaderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionMetadataLoaderTestCase.java
diff --git a/branches/sca-java-0.90/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionRepositoryTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionRepositoryTestCase.java
index 98f69b9aa1..98f69b9aa1 100644
--- a/branches/sca-java-0.90/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionRepositoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionRepositoryTestCase.java
diff --git a/branches/sca-java-0.90/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java
index 7ee873b9a3..7ee873b9a3 100644
--- a/branches/sca-java-0.90/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java
diff --git a/branches/sca-java-0.90/modules/contribution-impl/src/test/resources/deployables/sample-calculator.jar b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/test/resources/deployables/sample-calculator.jar
index 0ca3a1b781..0ca3a1b781 100644
--- a/branches/sca-java-0.90/modules/contribution-impl/src/test/resources/deployables/sample-calculator.jar
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/test/resources/deployables/sample-calculator.jar
diff --git a/branches/sca-java-0.90/modules/contribution-impl/src/test/resources/repository/sample-calculator.jar b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/test/resources/repository/sample-calculator.jar
index 9c46c679d2..9c46c679d2 100644
--- a/branches/sca-java-0.90/modules/contribution-impl/src/test/resources/repository/sample-calculator.jar
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/test/resources/repository/sample-calculator.jar
diff --git a/branches/sca-java-0.90/modules/contribution-impl/src/test/resources/test.composite b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/test/resources/test.composite
index 1e09549194..1e09549194 100644
--- a/branches/sca-java-0.90/modules/contribution-impl/src/test/resources/test.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/test/resources/test.composite
diff --git a/branches/sca-java-0.90/modules/contribution-impl/src/test/resources/test.ext b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/test/resources/test.ext
index e69de29bb2..e69de29bb2 100644
--- a/branches/sca-java-0.90/modules/contribution-impl/src/test/resources/test.ext
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution-impl/src/test/resources/test.ext
diff --git a/branches/sca-java-0.90/modules/contribution/.checkstyle b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/.checkstyle
index e3c216986d..e3c216986d 100644
--- a/branches/sca-java-0.90/modules/contribution/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/.checkstyle
diff --git a/branches/sca-java-0.90/modules/contribution/.pmd b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/.pmd
index 84af2f4d5d..84af2f4d5d 100644
--- a/branches/sca-java-0.90/modules/contribution/.pmd
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/.pmd
diff --git a/branches/sca-java-0.90/modules/contribution/.ruleset b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/.ruleset
index ac8671859d..ac8671859d 100644
--- a/branches/sca-java-0.90/modules/contribution/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/.ruleset
diff --git a/branches/sca-java-0.90/modules/contribution/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.90/modules/contribution/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/DISCLAIMER
diff --git a/branches/sca-java-0.90/modules/contribution/LICENSE b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.90/modules/contribution/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/LICENSE
diff --git a/branches/sca-java-0.90/modules/contribution/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.90/modules/contribution/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/NOTICE
diff --git a/branches/sca-java-0.90/modules/contribution/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/pom.xml
index 9adccbb90c..9adccbb90c 100644
--- a/branches/sca-java-0.90/modules/contribution/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/pom.xml
diff --git a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java
index c57054cfd0..c57054cfd0 100644
--- a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java
diff --git a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java
index 2e9eb203ad..2e9eb203ad 100644
--- a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java
diff --git a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java
index 4775fba4e4..4775fba4e4 100644
--- a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java
diff --git a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionExport.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionExport.java
index 914788a8c7..914788a8c7 100644
--- a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionExport.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionExport.java
diff --git a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java
index 8e1ce6e8ec..8e1ce6e8ec 100644
--- a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java
diff --git a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionImport.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionImport.java
index e42d65947b..e42d65947b 100644
--- a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionImport.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionImport.java
diff --git a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DeployedArtifact.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DeployedArtifact.java
index 4b0fb1cc08..4b0fb1cc08 100644
--- a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DeployedArtifact.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DeployedArtifact.java
diff --git a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java
index 014c187733..014c187733 100644
--- a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java
diff --git a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java
index 029df61f0f..029df61f0f 100644
--- a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionPostProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionPostProcessor.java
index 5475fe3b06..5475fe3b06 100644
--- a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionPostProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionPostProcessor.java
diff --git a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionPostProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionPostProcessorExtensionPoint.java
index 4aa866b6f2..4aa866b6f2 100644
--- a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionPostProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionPostProcessorExtensionPoint.java
diff --git a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java
index 1c2faf9503..1c2faf9503 100644
--- a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java
index 15fb1d838f..15fb1d838f 100644
--- a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java
diff --git a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
index 8b9333666c..8b9333666c 100644
--- a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
index 47c81fd04d..47c81fd04d 100644
--- a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java
index ac8fd6f272..ac8fd6f272 100644
--- a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java
diff --git a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
index 40575960f4..40575960f4 100644
--- a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
diff --git a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java
index 40917861da..40917861da 100644
--- a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java
diff --git a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessor.java
index 28b268301f..28b268301f 100644
--- a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessor.java
diff --git a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessorExtensionPoint.java
index 27499b5847..27499b5847 100644
--- a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessorExtensionPoint.java
diff --git a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java
index 89c063a65e..89c063a65e 100644
--- a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java
diff --git a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java
index 9a6388119e..9a6388119e 100644
--- a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java
index ca95036912..ca95036912 100644
--- a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java
diff --git a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java
index 95213f9dd1..95213f9dd1 100644
--- a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java
index da216983ea..da216983ea 100644
--- a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java
diff --git a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java
index 850f79fdea..850f79fdea 100644
--- a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java
diff --git a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/AbstractContributionException.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/AbstractContributionException.java
index 7b58a9c2c3..7b58a9c2c3 100644
--- a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/AbstractContributionException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/AbstractContributionException.java
diff --git a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionException.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionException.java
index 84dcdc19c5..84dcdc19c5 100644
--- a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionException.java
diff --git a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionMetadataLoader.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionMetadataLoader.java
index e41b13a567..e41b13a567 100644
--- a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionMetadataLoader.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionMetadataLoader.java
diff --git a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionMetadataLoaderException.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionMetadataLoaderException.java
index 7dd52c6c1a..7dd52c6c1a 100644
--- a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionMetadataLoaderException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionMetadataLoaderException.java
diff --git a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionReadException.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionReadException.java
index f84fd98f0b..f84fd98f0b 100644
--- a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionReadException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionReadException.java
diff --git a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRepository.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRepository.java
index d4c69bede3..d4c69bede3 100644
--- a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRepository.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRepository.java
diff --git a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionResolveException.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionResolveException.java
index e9392f55eb..e9392f55eb 100644
--- a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionResolveException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionResolveException.java
diff --git a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRuntimeException.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRuntimeException.java
index 90dae0018c..90dae0018c 100644
--- a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRuntimeException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRuntimeException.java
diff --git a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionService.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionService.java
index 1b21e60fbe..1b21e60fbe 100644
--- a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionService.java
diff --git a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWireException.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWireException.java
index 6d13a0dfb7..6d13a0dfb7 100644
--- a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWireException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWireException.java
diff --git a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWriteException.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWriteException.java
index db078ebdf3..db078ebdf3 100644
--- a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWriteException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWriteException.java
diff --git a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/InvalidConfigurationException.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/InvalidConfigurationException.java
index a3ff0072a1..a3ff0072a1 100644
--- a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/InvalidConfigurationException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/InvalidConfigurationException.java
diff --git a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/TypeDescriber.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/TypeDescriber.java
index 46ad89fc78..46ad89fc78 100644
--- a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/TypeDescriber.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/TypeDescriber.java
diff --git a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnrecognizedElementException.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnrecognizedElementException.java
index 42d74e5e22..42d74e5e22 100644
--- a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnrecognizedElementException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnrecognizedElementException.java
diff --git a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java
index 737362eb97..737362eb97 100644
--- a/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java
diff --git a/branches/sca-java-0.90/modules/core-databinding/.checkstyle b/sca-java-1.x/branches/sca-java-0.90/modules/core-databinding/.checkstyle
index c7b30ffd5e..c7b30ffd5e 100644
--- a/branches/sca-java-0.90/modules/core-databinding/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-databinding/.checkstyle
diff --git a/branches/sca-java-0.90/modules/core-databinding/.pmd b/sca-java-1.x/branches/sca-java-0.90/modules/core-databinding/.pmd
index 2db10d6a6a..2db10d6a6a 100644
--- a/branches/sca-java-0.90/modules/core-databinding/.pmd
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-databinding/.pmd
diff --git a/branches/sca-java-0.90/modules/core-databinding/.ruleset b/sca-java-1.x/branches/sca-java-0.90/modules/core-databinding/.ruleset
index ba9b5ce886..ba9b5ce886 100644
--- a/branches/sca-java-0.90/modules/core-databinding/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-databinding/.ruleset
diff --git a/branches/sca-java-0.90/modules/core-databinding/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/modules/core-databinding/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.90/modules/core-databinding/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-databinding/DISCLAIMER
diff --git a/branches/sca-java-0.90/modules/core-databinding/LICENSE b/sca-java-1.x/branches/sca-java-0.90/modules/core-databinding/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.90/modules/core-databinding/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-databinding/LICENSE
diff --git a/branches/sca-java-0.90/modules/core-databinding/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/core-databinding/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.90/modules/core-databinding/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-databinding/NOTICE
diff --git a/branches/sca-java-0.90/modules/core-databinding/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/core-databinding/pom.xml
index be77b02907..be77b02907 100644
--- a/branches/sca-java-0.90/modules/core-databinding/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-databinding/pom.xml
diff --git a/branches/sca-java-0.90/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/module/DataBindingModuleActivator.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/module/DataBindingModuleActivator.java
index 32666174b2..32666174b2 100644
--- a/branches/sca-java-0.90/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/module/DataBindingModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/module/DataBindingModuleActivator.java
diff --git a/branches/sca-java-0.90/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/processor/DataBindingJavaInterfaceProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
index b26846c682..b26846c682 100644
--- a/branches/sca-java-0.90/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
diff --git a/branches/sca-java-0.90/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Exception2ExceptionTransformer.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Exception2ExceptionTransformer.java
index 9711fe881a..9711fe881a 100644
--- a/branches/sca-java-0.90/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Exception2ExceptionTransformer.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Exception2ExceptionTransformer.java
diff --git a/branches/sca-java-0.90/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Input2InputTransformer.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Input2InputTransformer.java
index 3b4a189193..3b4a189193 100644
--- a/branches/sca-java-0.90/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Input2InputTransformer.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Input2InputTransformer.java
diff --git a/branches/sca-java-0.90/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Output2OutputTransformer.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Output2OutputTransformer.java
index bf52cedbc2..bf52cedbc2 100644
--- a/branches/sca-java-0.90/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Output2OutputTransformer.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Output2OutputTransformer.java
diff --git a/branches/sca-java-0.90/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/wire/DataBindingRuntimeWireProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/wire/DataBindingRuntimeWireProcessor.java
index feaf48f501..feaf48f501 100644
--- a/branches/sca-java-0.90/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/wire/DataBindingRuntimeWireProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/wire/DataBindingRuntimeWireProcessor.java
diff --git a/branches/sca-java-0.90/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/wire/DataTransformationInteceptor.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/wire/DataTransformationInteceptor.java
index 39bc6cf913..39bc6cf913 100644
--- a/branches/sca-java-0.90/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/wire/DataTransformationInteceptor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/wire/DataTransformationInteceptor.java
diff --git a/branches/sca-java-0.90/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-0.90/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 60f6de3b96..60f6de3b96 100644
--- a/branches/sca-java-0.90/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-0.90/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java
index 1c521af842..1c521af842 100644
--- a/branches/sca-java-0.90/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java
diff --git a/branches/sca-java-0.90/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/transformers/IDLTransformerTestCase.java.fixme b/sca-java-1.x/branches/sca-java-0.90/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/transformers/IDLTransformerTestCase.java.fixme
index ecae54188c..ecae54188c 100644
--- a/branches/sca-java-0.90/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/transformers/IDLTransformerTestCase.java.fixme
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/transformers/IDLTransformerTestCase.java.fixme
diff --git a/branches/sca-java-0.90/modules/core-spi/.checkstyle b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/.checkstyle
index 3e57539570..3e57539570 100644
--- a/branches/sca-java-0.90/modules/core-spi/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/.checkstyle
diff --git a/branches/sca-java-0.90/modules/core-spi/.pmd b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/.pmd
index 4abfdec2b5..4abfdec2b5 100644
--- a/branches/sca-java-0.90/modules/core-spi/.pmd
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/.pmd
diff --git a/branches/sca-java-0.90/modules/core-spi/.ruleset b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/.ruleset
index 3886f07f2d..3886f07f2d 100644
--- a/branches/sca-java-0.90/modules/core-spi/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/.ruleset
diff --git a/branches/sca-java-0.90/modules/core-spi/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.90/modules/core-spi/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/DISCLAIMER
diff --git a/branches/sca-java-0.90/modules/core-spi/LICENSE b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.90/modules/core-spi/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/LICENSE
diff --git a/branches/sca-java-0.90/modules/core-spi/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.90/modules/core-spi/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/NOTICE
diff --git a/branches/sca-java-0.90/modules/core-spi/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/pom.xml
index 50e04075b9..50e04075b9 100644
--- a/branches/sca-java-0.90/modules/core-spi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/pom.xml
diff --git a/branches/sca-java-0.90/modules/core-spi/src/doc/Context Model.emx b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/doc/Context Model.emx
index 0445ea5a6b..0445ea5a6b 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/doc/Context Model.emx
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/doc/Context Model.emx
diff --git a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
index 7a42300098..7a42300098 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
diff --git a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultModelFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultModelFactoryExtensionPoint.java
index 6765a6c8f1..6765a6c8f1 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultModelFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultModelFactoryExtensionPoint.java
diff --git a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
index 9609487080..9609487080 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
diff --git a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModelFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModelFactoryExtensionPoint.java
index 64706c6efc..64706c6efc 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModelFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModelFactoryExtensionPoint.java
diff --git a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
index 0244862309..0244862309 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
diff --git a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java
index 6a0c44a404..6a0c44a404 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java
diff --git a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java
index c116be921c..c116be921c 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java
diff --git a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java
index b0debc36c4..b0debc36c4 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java
diff --git a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java
index b34dceee62..b34dceee62 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java
diff --git a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java
index ca0f4889a5..ca0f4889a5 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java
diff --git a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
index a5f221fc11..a5f221fc11 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
diff --git a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
index cd75d06ab3..cd75d06ab3 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
diff --git a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
index 2748bbed9a..2748bbed9a 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
diff --git a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
index ef23118e78..ef23118e78 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
diff --git a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
index c2a9c488b8..c2a9c488b8 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
diff --git a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
index 3626e16425..3626e16425 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
diff --git a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
index 0f6a932c51..0f6a932c51 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
diff --git a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
index 1adb9287f1..1adb9287f1 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
diff --git a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
index a680277b99..a680277b99 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
diff --git a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
index 6a37d1e951..6a37d1e951 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
diff --git a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
index 2102806881..2102806881 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
diff --git a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
index 5e781dd5b3..5e781dd5b3 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
diff --git a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
index 4da4108168..4da4108168 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
diff --git a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
index d2646d8d00..d2646d8d00 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
diff --git a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
index 851afee3c1..851afee3c1 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
diff --git a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java
index 627180b2d1..627180b2d1 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java
diff --git a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
index ddb5ae746c..ddb5ae746c 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
diff --git a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
index 18166d8c1d..18166d8c1d 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
diff --git a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
index 19327321a6..19327321a6 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
diff --git a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
index d6b56d822e..d6b56d822e 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
diff --git a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
index fbb7aae467..fbb7aae467 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
diff --git a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
index 4b2c71b397..4b2c71b397 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
diff --git a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java
index 3cf82982dc..3cf82982dc 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java
diff --git a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java
index 9d965a3369..9d965a3369 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java
diff --git a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java
index b15cde066a..b15cde066a 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java
diff --git a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java
index 647eba33aa..647eba33aa 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java
diff --git a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java
index 5c1a3ca79d..5c1a3ca79d 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java
diff --git a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java
index 66bbae684d..66bbae684d 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java
diff --git a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java
index 3a563b9fb5..3a563b9fb5 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java
diff --git a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java
index ad55ce386b..ad55ce386b 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java
diff --git a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
index 5701a04ed1..5701a04ed1 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
diff --git a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
index 99cb601107..99cb601107 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
diff --git a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
index f3d32e376b..f3d32e376b 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
diff --git a/branches/sca-java-0.90/modules/core-spi/src/test/resources/org/apache/tuscany/spi/util/stax/test.composite b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/test/resources/org/apache/tuscany/spi/util/stax/test.composite
index 337ec02f06..337ec02f06 100644
--- a/branches/sca-java-0.90/modules/core-spi/src/test/resources/org/apache/tuscany/spi/util/stax/test.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spi/src/test/resources/org/apache/tuscany/spi/util/stax/test.composite
diff --git a/branches/sca-java-0.90/modules/core-spring/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.90/modules/core-spring/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/DISCLAIMER
diff --git a/branches/sca-java-0.90/modules/core-spring/LICENSE b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.90/modules/core-spring/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/LICENSE
diff --git a/branches/sca-java-0.90/modules/core-spring/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.90/modules/core-spring/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/NOTICE
diff --git a/branches/sca-java-0.90/modules/core-spring/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/pom.xml
index f59ca7691c..f59ca7691c 100644
--- a/branches/sca-java-0.90/modules/core-spring/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/pom.xml
diff --git a/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanAssemblyFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanAssemblyFactory.java
index 5b04d9e363..5b04d9e363 100644
--- a/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanAssemblyFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanAssemblyFactory.java
diff --git a/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java
index 85c5e7ec43..85c5e7ec43 100644
--- a/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java
diff --git a/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanReferenceImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanReferenceImpl.java
index bc139a3ef3..bc139a3ef3 100644
--- a/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanReferenceImpl.java
diff --git a/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java
index ba2d5045f2..ba2d5045f2 100644
--- a/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java
diff --git a/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java
index 24bc719e6a..24bc719e6a 100644
--- a/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java
diff --git a/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java
index 8a88ba28d9..8a88ba28d9 100644
--- a/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java
diff --git a/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationFactory.java
index c9cd0f8892..c9cd0f8892 100644
--- a/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationFactory.java
diff --git a/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationImpl.java
index 5d787d2fd2..5d787d2fd2 100644
--- a/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationImpl.java
diff --git a/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceContractImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceContractImpl.java
index 17a7e9084c..17a7e9084c 100644
--- a/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceContractImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceContractImpl.java
diff --git a/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceFactory.java
index 6557d23f27..6557d23f27 100644
--- a/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceFactory.java
diff --git a/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java
index 3d2c4b3e4d..3d2c4b3e4d 100644
--- a/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java
diff --git a/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/AddService.java
index 4eeb30a9c2..4eeb30a9c2 100644
--- a/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/AddService.java
diff --git a/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/AddServiceImpl.java
index ea3e5341d5..ea3e5341d5 100644
--- a/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/CalculatorClient.java
index 56e737e3ab..56e737e3ab 100644
--- a/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/CalculatorServiceImpl.java
index 11e8974657..11e8974657 100644
--- a/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/DivideService.java
index 131c5a8014..131c5a8014 100644
--- a/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/DivideService.java
diff --git a/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/DivideServiceImpl.java
index 9c7e96a668..9c7e96a668 100644
--- a/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/MultiplyService.java
index a917896aeb..a917896aeb 100644
--- a/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/MultiplyServiceImpl.java
index 4892481203..4892481203 100644
--- a/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/NestedCalculatorClient.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/NestedCalculatorClient.java
index 27430b7f5d..27430b7f5d 100644
--- a/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/NestedCalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/NestedCalculatorClient.java
diff --git a/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/SubtractService.java
index e328f024ea..e328f024ea 100644
--- a/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/SubtractService.java
diff --git a/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/SubtractServiceImpl.java
index ee1d7c3457..ee1d7c3457 100644
--- a/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/test/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-0.90/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/CalculatorTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/CalculatorTestCase.java
index 97a44258a8..97a44258a8 100644
--- a/branches/sca-java-0.90/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/CalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/CalculatorTestCase.java
diff --git a/branches/sca-java-0.90/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/NestedCalculatorTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/NestedCalculatorTestCase.java
index 5ef16a91d8..5ef16a91d8 100644
--- a/branches/sca-java-0.90/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/NestedCalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/NestedCalculatorTestCase.java
diff --git a/branches/sca-java-0.90/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/Calculator.composite b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/Calculator.composite
index 6d998ba035..6d998ba035 100644
--- a/branches/sca-java-0.90/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/Calculator.composite
diff --git a/branches/sca-java-0.90/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerCalculator.composite b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerCalculator.composite
index 8b043f2b4f..8b043f2b4f 100644
--- a/branches/sca-java-0.90/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerCalculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerCalculator.composite
diff --git a/branches/sca-java-0.90/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerOperations.composite b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerOperations.composite
index d7d1124050..d7d1124050 100644
--- a/branches/sca-java-0.90/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerOperations.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerOperations.composite
diff --git a/branches/sca-java-0.90/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/OuterCalculator.composite b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/OuterCalculator.composite
index c2b6cced36..c2b6cced36 100644
--- a/branches/sca-java-0.90/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/OuterCalculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/OuterCalculator.composite
diff --git a/branches/sca-java-0.90/modules/core/.checkstyle b/sca-java-1.x/branches/sca-java-0.90/modules/core/.checkstyle
index 3e57539570..3e57539570 100644
--- a/branches/sca-java-0.90/modules/core/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/.checkstyle
diff --git a/branches/sca-java-0.90/modules/core/.pmd b/sca-java-1.x/branches/sca-java-0.90/modules/core/.pmd
index ffc4fe2bbb..ffc4fe2bbb 100644
--- a/branches/sca-java-0.90/modules/core/.pmd
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/.pmd
diff --git a/branches/sca-java-0.90/modules/core/.ruleset b/sca-java-1.x/branches/sca-java-0.90/modules/core/.ruleset
index ba9b5ce886..ba9b5ce886 100644
--- a/branches/sca-java-0.90/modules/core/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/.ruleset
diff --git a/branches/sca-java-0.90/modules/core/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/modules/core/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.90/modules/core/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/DISCLAIMER
diff --git a/branches/sca-java-0.90/modules/core/LICENSE b/sca-java-1.x/branches/sca-java-0.90/modules/core/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.90/modules/core/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/LICENSE
diff --git a/branches/sca-java-0.90/modules/core/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/core/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.90/modules/core/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/NOTICE
diff --git a/branches/sca-java-0.90/modules/core/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/core/pom.xml
index 0db49e7726..0db49e7726 100644
--- a/branches/sca-java-0.90/modules/core/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/pom.xml
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/component/CallableReferenceImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/component/CallableReferenceImpl.java
index f0f0049056..f0f0049056 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/component/CallableReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/component/CallableReferenceImpl.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/component/CallbackReferenceImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/component/CallbackReferenceImpl.java
index 45a48730d3..45a48730d3 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/component/CallbackReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/component/CallbackReferenceImpl.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/component/ComponentContextImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/component/ComponentContextImpl.java
index abcd17f505..abcd17f505 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/component/ComponentContextImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/component/ComponentContextImpl.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/component/ComponentContextProvider.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/component/ComponentContextProvider.java
index 3999d0d5b4..3999d0d5b4 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/component/ComponentContextProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/component/ComponentContextProvider.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/component/RequestContextImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/component/RequestContextImpl.java
index 3a219b9cd9..3a219b9cd9 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/component/RequestContextImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/component/RequestContextImpl.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/component/ServiceReferenceImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/component/ServiceReferenceImpl.java
index e268f5750f..e268f5750f 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/component/ServiceReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/component/ServiceReferenceImpl.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java
index 517e5579a4..517e5579a4 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java
index 8e90c953e5..8e90c953e5 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java
index d879182e14..d879182e14 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java
index cd14710880..cd14710880 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java
index a4cc49204e..a4cc49204e 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java
index 4c3fd8b397..4c3fd8b397 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java
index 67b922b99c..67b922b99c 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java
index 8b5c512cf2..8b5c512cf2 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java
index 974563b57c..974563b57c 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AbstractInvocationHandler.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AbstractInvocationHandler.java
index 6c1f38e4c2..6c1f38e4c2 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AbstractInvocationHandler.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AbstractInvocationHandler.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
index 219dc55536..219dc55536 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
index dae4ed708b..dae4ed708b 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
index 934f2f7aa0..934f2f7aa0 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java
index e04148e374..e04148e374 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
index 5a028e6e22..5a028e6e22 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
index c22481cb73..c22481cb73 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyService.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyService.java
index 371f9bedb8..371f9bedb8 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyService.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java
index 6e182a6a14..6e182a6a14 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
index a1b2963cf5..a1b2963cf5 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java
index cbeedc086d..cbeedc086d 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
index be6f364271..be6f364271 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
index 4900ae9a7e..4900ae9a7e 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
index 381844ffc5..381844ffc5 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
index 52bea91341..52bea91341 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
index e6e41e8f85..e6e41e8f85 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/ActivationException.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/ActivationException.java
index 987a8288b0..987a8288b0 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/ActivationException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/ActivationException.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/CompositeActivator.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/CompositeActivator.java
index a390fdebfe..a390fdebfe 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/CompositeActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/CompositeActivator.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/CompositeActivatorImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/CompositeActivatorImpl.java
index 5308c6e0f9..5308c6e0f9 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/CompositeActivatorImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/CompositeActivatorImpl.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/EndpointReferenceImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/EndpointReferenceImpl.java
index 233f81ccae..233f81ccae 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/EndpointReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/EndpointReferenceImpl.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeAssemblyFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeAssemblyFactory.java
index ec0cdadde6..ec0cdadde6 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeAssemblyFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeAssemblyFactory.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentImpl.java
index aacce904b5..aacce904b5 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentImpl.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentReferenceImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentReferenceImpl.java
index 128ae29b81..128ae29b81 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentReferenceImpl.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentServiceImpl.java
index 0bb8e2c457..0bb8e2c457 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentServiceImpl.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeSCABindingProvider.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeSCABindingProvider.java
index ad055731f3..ad055731f3 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeSCABindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeSCABindingProvider.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeSCABindingProviderFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeSCABindingProviderFactory.java
index 06b7b3d40e..06b7b3d40e 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeSCABindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeSCABindingProviderFactory.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeWireImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeWireImpl.java
index cdf7ec01c0..cdf7ec01c0 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeWireImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeWireImpl.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
index 1d776b729c..1d776b729c 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
index 520d3ab48c..520d3ab48c 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java
index 7078903b8b..7078903b8b 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
index 61f7d51c29..61f7d51c29 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
index 4fdda90bc2..4fdda90bc2 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
index bcbf3cdf3c..bcbf3cdf3c 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java
index e275bb56b9..e275bb56b9 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
index aaafb4603c..aaafb4603c 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java
index 3851637220..3851637220 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
index 774c1edf37..774c1edf37 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
index dd481fa062..dd481fa062 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java
index e0eff710e9..e0eff710e9 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java
index 5b838116c5..5b838116c5 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/util/IOHelper.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/util/IOHelper.java
index 2058397fb0..2058397fb0 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/util/IOHelper.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/util/IOHelper.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java
index 6fe883157f..6fe883157f 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java
index c8a5dd7afe..c8a5dd7afe 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
index 0bc6f1b336..0bc6f1b336 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java
index 62ebeea1fb..62ebeea1fb 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java
index fae3f1aae3..fae3f1aae3 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/factory/ObjectCreationException.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/factory/ObjectCreationException.java
index 3432c61c76..3432c61c76 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/factory/ObjectCreationException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/factory/ObjectCreationException.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/factory/ObjectFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/factory/ObjectFactory.java
index c5e0dad4e7..c5e0dad4e7 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/factory/ObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/factory/ObjectFactory.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/factory/SingletonObjectFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/factory/SingletonObjectFactory.java
index 074a1121c9..074a1121c9 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/factory/SingletonObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/factory/SingletonObjectFactory.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/AbstractLifecycle.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/AbstractLifecycle.java
index e5f88d91c6..e5f88d91c6 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/AbstractLifecycle.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/AbstractLifecycle.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/CoreRuntimeException.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/CoreRuntimeException.java
index ac3e51a982..ac3e51a982 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/CoreRuntimeException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/CoreRuntimeException.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/InstanceWrapper.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/InstanceWrapper.java
index a952e2e72b..a952e2e72b 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/InstanceWrapper.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/InstanceWrapper.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/Lifecycle.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/Lifecycle.java
index 02075cad01..02075cad01 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/Lifecycle.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/Lifecycle.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/PersistenceException.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/PersistenceException.java
index 54fba1ee03..54fba1ee03 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/PersistenceException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/PersistenceException.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/Scope.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/Scope.java
index 9b3f208cb3..9b3f208cb3 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/Scope.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/Scope.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeContainer.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeContainer.java
index 30482fae90..30482fae90 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeContainer.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeContainerFactory.java
index b6acae7382..b6acae7382 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeContainerFactory.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeIdentifier.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeIdentifier.java
index 77e7d76842..77e7d76842 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeIdentifier.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeIdentifier.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeNotFoundException.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeNotFoundException.java
index 40a251c6f2..40a251c6f2 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeNotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeNotFoundException.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeRegistry.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeRegistry.java
index f3319ee093..f3319ee093 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeRegistry.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeRegistry.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopedImplementationProvider.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopedImplementationProvider.java
index 8b9c50b070..8b9c50b070 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopedImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopedImplementationProvider.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopedRuntimeComponent.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopedRuntimeComponent.java
index 6c33683bde..6c33683bde 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopedRuntimeComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopedRuntimeComponent.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetDestructionException.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetDestructionException.java
index 6b251295f5..6b251295f5 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetDestructionException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetDestructionException.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetInitializationException.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetInitializationException.java
index 17cd21967f..17cd21967f 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetInitializationException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetInitializationException.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetInvocationException.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetInvocationException.java
index f9bfa0a788..f9bfa0a788 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetInvocationException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetInvocationException.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetInvokerCreationException.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetInvokerCreationException.java
index a20d030ee8..a20d030ee8 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetInvokerCreationException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetInvokerCreationException.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetNotFoundException.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetNotFoundException.java
index 4dd63f58f0..4dd63f58f0 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetNotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetNotFoundException.java
diff --git a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetResolutionException.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetResolutionException.java
index 284ab8b6c7..284ab8b6c7 100644
--- a/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetResolutionException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetResolutionException.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
index 40a146e129..40a146e129 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java
index d2050523eb..d2050523eb 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java
index bf95d640c5..bf95d640c5 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/AsyncTarget.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/AsyncTarget.java
index c30e19de88..c30e19de88 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/AsyncTarget.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/AsyncTarget.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/BadContextPojo.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/BadContextPojo.java
index f9ae94f152..f9ae94f152 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/BadContextPojo.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/BadContextPojo.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/BadNamePojo.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/BadNamePojo.java
index c4074484b9..c4074484b9 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/BadNamePojo.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/BadNamePojo.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/BasicInterface.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/BasicInterface.java
index ca305b9ef0..ca305b9ef0 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/BasicInterface.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/BasicInterface.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/BasicInterfaceImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/BasicInterfaceImpl.java
index ea32d1f6b9..ea32d1f6b9 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/BasicInterfaceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/BasicInterfaceImpl.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/CompositeScopeComponent.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/CompositeScopeComponent.java
index 6d320df145..6d320df145 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/CompositeScopeComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/CompositeScopeComponent.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/CompositeScopeComponentImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/CompositeScopeComponentImpl.java
index 9ff289a502..9ff289a502 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/CompositeScopeComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/CompositeScopeComponentImpl.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/CompositeScopeDestroyOnlyComponent.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/CompositeScopeDestroyOnlyComponent.java
index 832055a084..832055a084 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/CompositeScopeDestroyOnlyComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/CompositeScopeDestroyOnlyComponent.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/CompositeScopeInitDestroyComponent.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/CompositeScopeInitDestroyComponent.java
index e8b76e13c0..e8b76e13c0 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/CompositeScopeInitDestroyComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/CompositeScopeInitDestroyComponent.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/CompositeScopeInitOnlyComponent.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/CompositeScopeInitOnlyComponent.java
index 057580be7a..057580be7a 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/CompositeScopeInitOnlyComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/CompositeScopeInitOnlyComponent.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/ConversationalScopeComponent.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/ConversationalScopeComponent.java
index 79f48a57c5..79f48a57c5 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/ConversationalScopeComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/ConversationalScopeComponent.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/ConversationalScopeComponentImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/ConversationalScopeComponentImpl.java
index 5b42d92191..5b42d92191 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/ConversationalScopeComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/ConversationalScopeComponentImpl.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/ConversationalScopeDestroyOnlyComponent.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/ConversationalScopeDestroyOnlyComponent.java
index c64556e754..c64556e754 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/ConversationalScopeDestroyOnlyComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/ConversationalScopeDestroyOnlyComponent.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/ConversationalScopeInitDestroyComponent.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/ConversationalScopeInitDestroyComponent.java
index 6f930ef750..6f930ef750 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/ConversationalScopeInitDestroyComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/ConversationalScopeInitDestroyComponent.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/ConversationalScopeInitOnlyComponent.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/ConversationalScopeInitOnlyComponent.java
index 70733f4d99..70733f4d99 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/ConversationalScopeInitOnlyComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/ConversationalScopeInitOnlyComponent.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderException.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderException.java
index 4bb9cde958..4bb9cde958 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderException.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderedDependentPojo.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderedDependentPojo.java
index df59029884..df59029884 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderedDependentPojo.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderedDependentPojo.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderedDependentPojoImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderedDependentPojoImpl.java
index 1b51c2772d..1b51c2772d 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderedDependentPojoImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderedDependentPojoImpl.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderedEagerInitPojo.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderedEagerInitPojo.java
index 139086bf0d..139086bf0d 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderedEagerInitPojo.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderedEagerInitPojo.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderedInitPojo.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderedInitPojo.java
index 1c3615fcd0..1c3615fcd0 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderedInitPojo.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderedInitPojo.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderedInitPojoImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderedInitPojoImpl.java
index b65ead9b19..b65ead9b19 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderedInitPojoImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderedInitPojoImpl.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OtherTarget.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OtherTarget.java
index 963c31a4ca..963c31a4ca 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OtherTarget.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OtherTarget.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OtherTargetImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OtherTargetImpl.java
index 91ccc9e772..91ccc9e772 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OtherTargetImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OtherTargetImpl.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/RequestScopeComponent.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/RequestScopeComponent.java
index 7d03c4372d..7d03c4372d 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/RequestScopeComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/RequestScopeComponent.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/RequestScopeDestroyOnlyComponent.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/RequestScopeDestroyOnlyComponent.java
index f94f071086..f94f071086 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/RequestScopeDestroyOnlyComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/RequestScopeDestroyOnlyComponent.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/RequestScopeInitDestroyComponent.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/RequestScopeInitDestroyComponent.java
index f2de2d9afa..f2de2d9afa 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/RequestScopeInitDestroyComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/RequestScopeInitDestroyComponent.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/RequestScopeInitOnlyComponent.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/RequestScopeInitOnlyComponent.java
index 9bcef40834..9bcef40834 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/RequestScopeInitOnlyComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/RequestScopeInitOnlyComponent.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SessionScopeComponent.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SessionScopeComponent.java
index 8318333feb..8318333feb 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SessionScopeComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SessionScopeComponent.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SessionScopeComponentImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SessionScopeComponentImpl.java
index 0494d587aa..0494d587aa 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SessionScopeComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SessionScopeComponentImpl.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SessionScopeInitDestroyComponent.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SessionScopeInitDestroyComponent.java
index fdc11a80af..fdc11a80af 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SessionScopeInitDestroyComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SessionScopeInitDestroyComponent.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SessionScopeInitOnlyComponent.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SessionScopeInitOnlyComponent.java
index 4e849895f8..4e849895f8 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SessionScopeInitOnlyComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SessionScopeInitOnlyComponent.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SimpleTarget.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SimpleTarget.java
index 44eb94260e..44eb94260e 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SimpleTarget.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SimpleTarget.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SimpleTargetImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SimpleTargetImpl.java
index 662b21116a..662b21116a 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SimpleTargetImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SimpleTargetImpl.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/Source.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/Source.java
index aa3b5be528..aa3b5be528 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/Source.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/Source.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SourceImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SourceImpl.java
index 81e39a9fe9..81e39a9fe9 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SourceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SourceImpl.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/StatelessComponent.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/StatelessComponent.java
index 89d0be7a53..89d0be7a53 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/StatelessComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/StatelessComponent.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/StatelessComponentImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/StatelessComponentImpl.java
index 28eb28e76d..28eb28e76d 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/StatelessComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/StatelessComponentImpl.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/Target.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/Target.java
index 5e85ed48b0..5e85ed48b0 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/Target.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/Target.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/TargetImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/TargetImpl.java
index 169b38a8d0..169b38a8d0 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/TargetImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/TargetImpl.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java
index 5be8fe21b3..5be8fe21b3 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java
index 2f5c182f45..2f5c182f45 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java
index 58503fd852..58503fd852 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java
index 83f7bdd887..83f7bdd887 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java
index c5f93edeb6..c5f93edeb6 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/factory/AssertionTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/factory/AssertionTestCase.java
index 77d0e01dc9..77d0e01dc9 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/factory/AssertionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/factory/AssertionTestCase.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/factory/SingletonObjectFactoryTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/factory/SingletonObjectFactoryTestCase.java
index 4d38c447ea..4d38c447ea 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/factory/SingletonObjectFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/factory/SingletonObjectFactoryTestCase.java
diff --git a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
index 1b95c6ff63..1b95c6ff63 100644
--- a/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
diff --git a/branches/sca-java-0.90/modules/databinding-axiom/.ruleset b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/.ruleset
index 27b9ab847c..27b9ab847c 100644
--- a/branches/sca-java-0.90/modules/databinding-axiom/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/.ruleset
diff --git a/branches/sca-java-0.90/modules/databinding-axiom/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.90/modules/databinding-axiom/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/DISCLAIMER
diff --git a/branches/sca-java-0.90/modules/databinding-axiom/LICENSE b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.90/modules/databinding-axiom/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/LICENSE
diff --git a/branches/sca-java-0.90/modules/databinding-axiom/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.90/modules/databinding-axiom/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/NOTICE
diff --git a/branches/sca-java-0.90/modules/databinding-axiom/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/pom.xml
index 923778d29f..923778d29f 100755
--- a/branches/sca-java-0.90/modules/databinding-axiom/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/pom.xml
diff --git a/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java
index 72fc90d187..72fc90d187 100644
--- a/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java
diff --git a/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomExceptionHandler.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomExceptionHandler.java
index dd4553fc6a..dd4553fc6a 100644
--- a/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomExceptionHandler.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomExceptionHandler.java
diff --git a/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java
index 28141cd144..28141cd144 100644
--- a/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java
diff --git a/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java
index 4d2bc2b4d6..4d2bc2b4d6 100644
--- a/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java
diff --git a/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java
index 3eb5878de3..3eb5878de3 100755
--- a/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java
diff --git a/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java
index c72bee62e2..c72bee62e2 100755
--- a/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java
diff --git a/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java
index 91d00c4c79..91d00c4c79 100644
--- a/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java
diff --git a/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java
index 50ac0ecae6..50ac0ecae6 100644
--- a/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java
diff --git a/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java
index b2549029f2..b2549029f2 100755
--- a/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java
diff --git a/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java
index ffb31aae0b..ffb31aae0b 100755
--- a/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java
diff --git a/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/module/AxiomDataBindingModuleActivator.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/module/AxiomDataBindingModuleActivator.java
index 8dd3cb0f51..8dd3cb0f51 100644
--- a/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/module/AxiomDataBindingModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/module/AxiomDataBindingModuleActivator.java
diff --git a/branches/sca-java-0.90/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 394d11304d..394d11304d 100644
--- a/branches/sca-java-0.90/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-0.90/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/AxiomExceptionHandlerTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/AxiomExceptionHandlerTestCase.java
index d75d729294..d75d729294 100644
--- a/branches/sca-java-0.90/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/AxiomExceptionHandlerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/AxiomExceptionHandlerTestCase.java
diff --git a/branches/sca-java-0.90/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java
index 7c04a98859..7c04a98859 100755
--- a/branches/sca-java-0.90/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java
diff --git a/branches/sca-java-0.90/modules/databinding-axiom/src/test/resources/ipo.xml b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/src/test/resources/ipo.xml
index df901d183d..df901d183d 100755
--- a/branches/sca-java-0.90/modules/databinding-axiom/src/test/resources/ipo.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/src/test/resources/ipo.xml
diff --git a/branches/sca-java-0.90/modules/databinding-axiom/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/src/test/resources/ipo.xsd
index af1e73172d..af1e73172d 100755
--- a/branches/sca-java-0.90/modules/databinding-axiom/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-0.90/modules/databinding-axiom/src/test/resources/order.wsdl b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/src/test/resources/order.wsdl
index a5ead60382..a5ead60382 100644
--- a/branches/sca-java-0.90/modules/databinding-axiom/src/test/resources/order.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-axiom/src/test/resources/order.wsdl
diff --git a/branches/sca-java-0.90/modules/databinding-jaxb/.ruleset b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/.ruleset
index 27b9ab847c..27b9ab847c 100644
--- a/branches/sca-java-0.90/modules/databinding-jaxb/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/.ruleset
diff --git a/branches/sca-java-0.90/modules/databinding-jaxb/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.90/modules/databinding-jaxb/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/DISCLAIMER
diff --git a/branches/sca-java-0.90/modules/databinding-jaxb/LICENSE b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.90/modules/databinding-jaxb/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/LICENSE
diff --git a/branches/sca-java-0.90/modules/databinding-jaxb/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.90/modules/databinding-jaxb/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/NOTICE
diff --git a/branches/sca-java-0.90/modules/databinding-jaxb/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/pom.xml
index aebff2bd7e..aebff2bd7e 100755
--- a/branches/sca-java-0.90/modules/databinding-jaxb/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/pom.xml
diff --git a/branches/sca-java-0.90/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java
index c1d3c36076..c1d3c36076 100755
--- a/branches/sca-java-0.90/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java
diff --git a/branches/sca-java-0.90/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java
index 93a7a5da0f..93a7a5da0f 100644
--- a/branches/sca-java-0.90/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java
diff --git a/branches/sca-java-0.90/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
index 9706ffdc21..9706ffdc21 100644
--- a/branches/sca-java-0.90/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
diff --git a/branches/sca-java-0.90/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBExceptionHandler.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBExceptionHandler.java
index c2ca78e018..c2ca78e018 100644
--- a/branches/sca-java-0.90/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBExceptionHandler.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBExceptionHandler.java
diff --git a/branches/sca-java-0.90/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java
index 528d6fd703..528d6fd703 100644
--- a/branches/sca-java-0.90/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java
diff --git a/branches/sca-java-0.90/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXWSJavaInterfaceProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXWSJavaInterfaceProcessor.java
index 60ed6f2f81..60ed6f2f81 100644
--- a/branches/sca-java-0.90/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXWSJavaInterfaceProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXWSJavaInterfaceProcessor.java
diff --git a/branches/sca-java-0.90/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java
index 31beb344f1..31beb344f1 100755
--- a/branches/sca-java-0.90/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java
diff --git a/branches/sca-java-0.90/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java
index e0bb0e189c..e0bb0e189c 100644
--- a/branches/sca-java-0.90/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java
diff --git a/branches/sca-java-0.90/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java
index 061f488a01..061f488a01 100755
--- a/branches/sca-java-0.90/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java
diff --git a/branches/sca-java-0.90/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/module/JAXBDataBindingModuleActivator.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/module/JAXBDataBindingModuleActivator.java
index 3e98bf652d..3e98bf652d 100644
--- a/branches/sca-java-0.90/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/module/JAXBDataBindingModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/module/JAXBDataBindingModuleActivator.java
diff --git a/branches/sca-java-0.90/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 2998cf93e0..2998cf93e0 100644
--- a/branches/sca-java-0.90/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-0.90/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBDataBindingTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBDataBindingTestCase.java
index aa191c20b5..aa191c20b5 100644
--- a/branches/sca-java-0.90/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBDataBindingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBDataBindingTestCase.java
diff --git a/branches/sca-java-0.90/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBExceptionHandlerTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBExceptionHandlerTestCase.java
index 5b85f9096d..5b85f9096d 100644
--- a/branches/sca-java-0.90/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBExceptionHandlerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBExceptionHandlerTestCase.java
diff --git a/branches/sca-java-0.90/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBTestCase.java
index f1caf42fcf..f1caf42fcf 100755
--- a/branches/sca-java-0.90/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBTestCase.java
diff --git a/branches/sca-java-0.90/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBWrapperHandlerTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBWrapperHandlerTestCase.java
index 355acd619c..355acd619c 100644
--- a/branches/sca-java-0.90/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBWrapperHandlerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBWrapperHandlerTestCase.java
diff --git a/branches/sca-java-0.90/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/fault/InvalidSymbolFault.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/fault/InvalidSymbolFault.java
index fd21d72337..fd21d72337 100644
--- a/branches/sca-java-0.90/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/fault/InvalidSymbolFault.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/fault/InvalidSymbolFault.java
diff --git a/branches/sca-java-0.90/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/fault/InvalidSymbolFault_Exception.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/fault/InvalidSymbolFault_Exception.java
index 19ce1dca23..19ce1dca23 100644
--- a/branches/sca-java-0.90/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/fault/InvalidSymbolFault_Exception.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/fault/InvalidSymbolFault_Exception.java
diff --git a/branches/sca-java-0.90/modules/databinding-jaxb/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/src/test/resources/ipo.xsd
index 241ec15d36..241ec15d36 100755
--- a/branches/sca-java-0.90/modules/databinding-jaxb/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-jaxb/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-0.90/modules/databinding-sdo-axiom/.checkstyle b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo-axiom/.checkstyle
index c7b30ffd5e..c7b30ffd5e 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo-axiom/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo-axiom/.checkstyle
diff --git a/branches/sca-java-0.90/modules/databinding-sdo-axiom/.ruleset b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo-axiom/.ruleset
index 27b9ab847c..27b9ab847c 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo-axiom/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo-axiom/.ruleset
diff --git a/branches/sca-java-0.90/modules/databinding-sdo-axiom/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo-axiom/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo-axiom/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo-axiom/DISCLAIMER
diff --git a/branches/sca-java-0.90/modules/databinding-sdo-axiom/LICENSE b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo-axiom/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo-axiom/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo-axiom/LICENSE
diff --git a/branches/sca-java-0.90/modules/databinding-sdo-axiom/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo-axiom/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo-axiom/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo-axiom/NOTICE
diff --git a/branches/sca-java-0.90/modules/databinding-sdo-axiom/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo-axiom/pom.xml
index ea9ad42d54..ea9ad42d54 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo-axiom/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo-axiom/pom.xml
diff --git a/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java
index 4060fd8e5b..4060fd8e5b 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java
diff --git a/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObjectSerializer.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObjectSerializer.java
index 4301ba09e3..4301ba09e3 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObjectSerializer.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObjectSerializer.java
diff --git a/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java
index 96d0ee563c..96d0ee563c 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java
diff --git a/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java
index d6ae818f31..d6ae818f31 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java
diff --git a/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/module/SDOAxiomModuleActivator.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/module/SDOAxiomModuleActivator.java
index dc9ecdafae..dc9ecdafae 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/module/SDOAxiomModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/module/SDOAxiomModuleActivator.java
diff --git a/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index a16317431c..a16317431c 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java
index 9d32991bf9..9d32991bf9 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java
diff --git a/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java
index 7485910db6..7485910db6 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java
diff --git a/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java
index e141e27098..e141e27098 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java
diff --git a/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd
index 241ec15d36..241ec15d36 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/test/resources/stock.xsd b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/test/resources/stock.xsd
index a0a6717371..a0a6717371 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/test/resources/stock.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo-axiom/src/test/resources/stock.xsd
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/.checkstyle b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/.checkstyle
index c7b30ffd5e..c7b30ffd5e 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/.checkstyle
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/.ruleset b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/.ruleset
index 27b9ab847c..27b9ab847c 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/.ruleset
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/DISCLAIMER
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/LICENSE b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/LICENSE
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/NOTICE
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/pom.xml
index 4a244a0a58..4a244a0a58 100755
--- a/branches/sca-java-0.90/modules/databinding-sdo/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/pom.xml
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java
index 405de57ab3..405de57ab3 100755
--- a/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
index 5b258b5429..5b258b5429 100755
--- a/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DuplicateHelperContextException.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DuplicateHelperContextException.java
index c83e93dc4e..c83e93dc4e 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DuplicateHelperContextException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DuplicateHelperContextException.java
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/HelperContextProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/HelperContextProcessor.java
index 561e5f3b39..561e5f3b39 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/HelperContextProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/HelperContextProcessor.java
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/HelperContextRegistry.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/HelperContextRegistry.java
index 75d9d33cbb..75d9d33cbb 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/HelperContextRegistry.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/HelperContextRegistry.java
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/HelperContextRegistryImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/HelperContextRegistryImpl.java
index 429946f78d..429946f78d 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/HelperContextRegistryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/HelperContextRegistryImpl.java
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java
index 30a3e1c3a9..30a3e1c3a9 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java
index 87b6cb3e4a..87b6cb3e4a 100755
--- a/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java
index 78058a5969..78058a5969 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
index 2736d4bbde..2736d4bbde 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOExceptionHandler.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOExceptionHandler.java
index 1056d2ec38..1056d2ec38 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOExceptionHandler.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOExceptionHandler.java
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java
index f4e2044aa2..f4e2044aa2 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java
index d89627da71..d89627da71 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java
index 01ec74bb30..01ec74bb30 100755
--- a/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java
index d11e6e46d9..d11e6e46d9 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
index 9e888258f0..9e888258f0 100755
--- a/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
index 8797ed1f28..8797ed1f28 100755
--- a/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
index 43b05d9cb8..43b05d9cb8 100755
--- a/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/api/HelperContext.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/api/HelperContext.java
index 9b6beead14..9b6beead14 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/api/HelperContext.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/api/HelperContext.java
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/module/SDODataBindingModuleActivator.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/module/SDODataBindingModuleActivator.java
index 4f6caa6ec0..4f6caa6ec0 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/module/SDODataBindingModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/module/SDODataBindingModuleActivator.java
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index b39b5ae567..b39b5ae567 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java
index 8c4f243df5..8c4f243df5 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java
index 3665434cee..3665434cee 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
index 369912f115..369912f115 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/HelperContextProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/HelperContextProcessorTestCase.java
index c6fc6813e0..c6fc6813e0 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/HelperContextProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/HelperContextProcessorTestCase.java
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
index cd7a02cb88..cd7a02cb88 100755
--- a/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java
index 17e4901cc2..17e4901cc2 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOExceptionHandlerTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOExceptionHandlerTestCase.java
index f8373cfd1c..f8373cfd1c 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOExceptionHandlerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOExceptionHandlerTestCase.java
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java
index ff1ac633a8..ff1ac633a8 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java
index 1c3358a4d5..1c3358a4d5 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java
index f1caa4e8a7..f1caa4e8a7 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
index 78bc62eb3a..78bc62eb3a 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/test/resources/ipo.xsd
index 241ec15d36..241ec15d36 100755
--- a/branches/sca-java-0.90/modules/databinding-sdo/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/src/test/resources/model/sca-core.xsd b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/test/resources/model/sca-core.xsd
index 56c6977254..56c6977254 100755
--- a/branches/sca-java-0.90/modules/databinding-sdo/src/test/resources/model/sca-core.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/test/resources/model/sca-core.xsd
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd
index bbaf58f00c..bbaf58f00c 100755
--- a/branches/sca-java-0.90/modules/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/src/test/resources/stock.xsd b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/test/resources/stock.xsd
index a0a6717371..a0a6717371 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo/src/test/resources/stock.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/test/resources/stock.xsd
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/src/test/resources/wrapper.xml b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/test/resources/wrapper.xml
index 2526629409..2526629409 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo/src/test/resources/wrapper.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/test/resources/wrapper.xml
diff --git a/branches/sca-java-0.90/modules/databinding-sdo/src/test/resources/wrapper.xsd b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/test/resources/wrapper.xsd
index ea4dc5f7f3..ea4dc5f7f3 100644
--- a/branches/sca-java-0.90/modules/databinding-sdo/src/test/resources/wrapper.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding-sdo/src/test/resources/wrapper.xsd
diff --git a/branches/sca-java-0.90/modules/databinding/.checkstyle b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/.checkstyle
index c7b30ffd5e..c7b30ffd5e 100644
--- a/branches/sca-java-0.90/modules/databinding/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/.checkstyle
diff --git a/branches/sca-java-0.90/modules/databinding/.pmd b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/.pmd
index 2db10d6a6a..2db10d6a6a 100644
--- a/branches/sca-java-0.90/modules/databinding/.pmd
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/.pmd
diff --git a/branches/sca-java-0.90/modules/databinding/.ruleset b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/.ruleset
index ba9b5ce886..ba9b5ce886 100644
--- a/branches/sca-java-0.90/modules/databinding/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/.ruleset
diff --git a/branches/sca-java-0.90/modules/databinding/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.90/modules/databinding/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/DISCLAIMER
diff --git a/branches/sca-java-0.90/modules/databinding/LICENSE b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.90/modules/databinding/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/LICENSE
diff --git a/branches/sca-java-0.90/modules/databinding/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.90/modules/databinding/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/NOTICE
diff --git a/branches/sca-java-0.90/modules/databinding/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/pom.xml
index 81a1fd6443..81a1fd6443 100644
--- a/branches/sca-java-0.90/modules/databinding/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/pom.xml
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java
index e8f5317a25..e8f5317a25 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java
index 471b4b715f..471b4b715f 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java
index a6f747996d..a6f747996d 100755
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
index cce57cb2ae..cce57cb2ae 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
index 8c37ce2d89..8c37ce2d89 100755
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/ExceptionHandler.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/ExceptionHandler.java
index 131e8a3114..131e8a3114 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/ExceptionHandler.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/ExceptionHandler.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java
index 168a1052b3..168a1052b3 100755
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java
index feed87e45f..feed87e45f 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java
index 80e5e4f0a3..80e5e4f0a3 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java
index 70ea431d57..70ea431d57 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java
index 27818dc24f..27818dc24f 100755
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java
index 8d2b36482d..8d2b36482d 100755
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java
index 062f087a15..062f087a15 100755
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java
index 1abae06754..1abae06754 100755
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java
index a94e986755..a94e986755 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java
index 1d0e117d34..1d0e117d34 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java
index 377984a1cc..377984a1cc 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java
index 5d68324f31..5d68324f31 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java
index 2fe4cc44cf..2fe4cc44cf 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java
index d99fe488de..d99fe488de 100755
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java
index 52917aaf50..52917aaf50 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
index 2403600389..2403600389 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java
index b39a944f32..b39a944f32 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
index adff1718de..adff1718de 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java
index 9a1385f193..9a1385f193 100755
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java
index 009c7f2272..009c7f2272 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java
index 9c23efe091..9c23efe091 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java
index 6a11f4fcb3..6a11f4fcb3 100755
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java
index 7c92c365cf..7c92c365cf 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java
index 34ddc4d268..34ddc4d268 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java
index 050c4288c3..050c4288c3 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java
index c363a36d95..c363a36d95 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReader.java
index a41d853958..a41d853958 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReader.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java
index 56910582c0..56910582c0 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java
index 966fc48bb8..966fc48bb8 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java
index 2bf16a5b86..2bf16a5b86 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java
index b7dee262c0..b7dee262c0 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanUtil.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanUtil.java
index 3ada634375..3ada634375 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanUtil.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanUtil.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
index 605d769fda..605d769fda 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java
index 1bb6277934..1bb6277934 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXMLStreamReader.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXMLStreamReader.java
index e377dd1d8b..e377dd1d8b 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXMLStreamReader.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java
index 2f63f932ea..2f63f932ea 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java
index 2d85d9bfb2..2d85d9bfb2 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java
index a652114977..a652114977 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java
index 4a0a697c5c..4a0a697c5c 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java
index e3af07d707..e3af07d707 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValueArrayStreamReader.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValueArrayStreamReader.java
index 157a95025d..157a95025d 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValueArrayStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValueArrayStreamReader.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValuePairStreamReader.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValuePairStreamReader.java
index 71af7519e7..71af7519e7 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValuePairStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValuePairStreamReader.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NamedProperty.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NamedProperty.java
index 04d7d65a0d..04d7d65a0d 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NamedProperty.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NamedProperty.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NilElementStreamReader.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NilElementStreamReader.java
index abc4bf3785..abc4bf3785 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NilElementStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NilElementStreamReader.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java
index 31207ebf68..31207ebf68 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java
index 60be7dbfd3..60be7dbfd3 100755
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java
index 4973319fc3..4973319fc3 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java
index 539e0d7da2..539e0d7da2 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java
index 556f0ef398..556f0ef398 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java
index da0dad15cc..da0dad15cc 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java
index e6fab7caf0..e6fab7caf0 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java
index 0f454b8e81..0f454b8e81 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java
index 7b562096a8..7b562096a8 100755
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAX2SAXAdapter.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAX2SAXAdapter.java
index 6257681091..6257681091 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAX2SAXAdapter.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAX2SAXAdapter.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
index e5fb47dab3..e5fb47dab3 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXHelper.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXHelper.java
index 103ecbd7d1..103ecbd7d1 100755
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXHelper.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXHelper.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java
index ef1cdd809a..ef1cdd809a 100755
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java
index 0e78d7bb8f..0e78d7bb8f 100755
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java
index 82ab958c15..82ab958c15 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java
index 275462d266..275462d266 100755
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/WrappingXMLStreamReader.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/WrappingXMLStreamReader.java
index dbf5de55cd..dbf5de55cd 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/WrappingXMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/WrappingXMLStreamReader.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java
index 66369adf28..66369adf28 100755
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java
index e2bebd0eb0..e2bebd0eb0 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReader.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReader.java
index a42d6acc9a..a42d6acc9a 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReader.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java
index 6d8687c89e..6d8687c89e 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java
index 08bfed9545..08bfed9545 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java
index 86a9a0912b..86a9a0912b 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java
index 1ffda0f681..1ffda0f681 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java
index a4bb97fb24..a4bb97fb24 100755
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamSerializer.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamSerializer.java
index 93939c5cd7..93939c5cd7 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamSerializer.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamSerializer.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamable.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamable.java
index f32f93d098..f32f93d098 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamable.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamable.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
index bbb88b8bb3..bbb88b8bb3 100644
--- a/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java
index 1039b824ac..1039b824ac 100644
--- a/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java
index 25f9a07aa2..25f9a07aa2 100644
--- a/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java
index 9a5fc21e3f..9a5fc21e3f 100644
--- a/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java
index e5c5e6dd64..e5c5e6dd64 100644
--- a/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java
index 9bcc535e99..9bcc535e99 100644
--- a/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java
index ae237b249c..ae237b249c 100644
--- a/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java
index 1dc91374ea..1dc91374ea 100644
--- a/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java
index 5e9fb52ccc..5e9fb52ccc 100755
--- a/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java
index 6fb022b2f7..6fb022b2f7 100644
--- a/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java
index 5e4f6a72df..5e4f6a72df 100644
--- a/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java
index d5e90f0450..d5e90f0450 100644
--- a/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java
index 5c67fa5d2d..5c67fa5d2d 100644
--- a/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java
index 06bd0f5af6..06bd0f5af6 100644
--- a/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java
index 3627b2d094..3627b2d094 100755
--- a/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java
index 30814bfc85..30814bfc85 100644
--- a/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java
index df04936dae..df04936dae 100644
--- a/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java
index fec4df7621..fec4df7621 100644
--- a/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java
diff --git a/branches/sca-java-0.90/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd
index 92a576fb98..92a576fb98 100644
--- a/branches/sca-java-0.90/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd
diff --git a/branches/sca-java-0.90/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl
index 100890e10b..100890e10b 100644
--- a/branches/sca-java-0.90/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl
diff --git a/branches/sca-java-0.90/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml
index 0ba8ade1e0..0ba8ade1e0 100644
--- a/branches/sca-java-0.90/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml
diff --git a/branches/sca-java-0.90/modules/host-embedded/.checkstyle b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/.checkstyle
index ea05637a07..ea05637a07 100644
--- a/branches/sca-java-0.90/modules/host-embedded/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/.checkstyle
diff --git a/branches/sca-java-0.90/modules/host-embedded/.pmd b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/.pmd
index aa1ce3e754..aa1ce3e754 100644
--- a/branches/sca-java-0.90/modules/host-embedded/.pmd
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/.pmd
diff --git a/branches/sca-java-0.90/modules/host-embedded/.ruleset b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/.ruleset
index a7ff3be272..a7ff3be272 100644
--- a/branches/sca-java-0.90/modules/host-embedded/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/.ruleset
diff --git a/branches/sca-java-0.90/modules/host-embedded/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.90/modules/host-embedded/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/DISCLAIMER
diff --git a/branches/sca-java-0.90/modules/host-embedded/LICENSE b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.90/modules/host-embedded/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/LICENSE
diff --git a/branches/sca-java-0.90/modules/host-embedded/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.90/modules/host-embedded/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/NOTICE
diff --git a/branches/sca-java-0.90/modules/host-embedded/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/pom.xml
index b712bff7ec..b712bff7ec 100644
--- a/branches/sca-java-0.90/modules/host-embedded/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/pom.xml
diff --git a/branches/sca-java-0.90/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java
index dac8d6ce7b..dac8d6ce7b 100644
--- a/branches/sca-java-0.90/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java
diff --git a/branches/sca-java-0.90/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java
index 5dd3803ed2..5dd3803ed2 100644
--- a/branches/sca-java-0.90/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java
diff --git a/branches/sca-java-0.90/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java
index c133bad38e..c133bad38e 100644
--- a/branches/sca-java-0.90/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java
diff --git a/branches/sca-java-0.90/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
index b2c33f81db..b2c33f81db 100644
--- a/branches/sca-java-0.90/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
diff --git a/branches/sca-java-0.90/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java
index 66de330321..66de330321 100644
--- a/branches/sca-java-0.90/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java
diff --git a/branches/sca-java-0.90/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
index 6e2da9cd6b..6e2da9cd6b 100644
--- a/branches/sca-java-0.90/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
diff --git a/branches/sca-java-0.90/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
index 7bf868f3fc..7bf868f3fc 100644
--- a/branches/sca-java-0.90/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
diff --git a/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/CRUD.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/CRUD.java
index e33396adfc..e33396adfc 100644
--- a/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/CRUD.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/CRUD.java
diff --git a/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/CRUDImplementation.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/CRUDImplementation.java
index 1f156c3261..1f156c3261 100644
--- a/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/CRUDImplementation.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/CRUDImplementation.java
diff --git a/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/CRUDImplementationFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/CRUDImplementationFactory.java
index 430754a8b1..430754a8b1 100644
--- a/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/CRUDImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/CRUDImplementationFactory.java
diff --git a/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/DefaultCRUDImplementationFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/DefaultCRUDImplementationFactory.java
index 3cc3482bd7..3cc3482bd7 100644
--- a/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/DefaultCRUDImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/DefaultCRUDImplementationFactory.java
diff --git a/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/backend/ResourceManager.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/backend/ResourceManager.java
index fc6bffa9d5..fc6bffa9d5 100644
--- a/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/backend/ResourceManager.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/backend/ResourceManager.java
diff --git a/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/impl/CRUDImplementationImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/impl/CRUDImplementationImpl.java
index 5bc3a0204c..5bc3a0204c 100644
--- a/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/impl/CRUDImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/impl/CRUDImplementationImpl.java
diff --git a/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/impl/CRUDImplementationProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/impl/CRUDImplementationProcessor.java
index 32b9a6be84..32b9a6be84 100644
--- a/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/impl/CRUDImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/impl/CRUDImplementationProcessor.java
diff --git a/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/module/CRUDModuleActivator.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/module/CRUDModuleActivator.java
index 1a5e2ca8a6..1a5e2ca8a6 100644
--- a/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/module/CRUDModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/module/CRUDModuleActivator.java
diff --git a/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/provider/CRUDImplementationProvider.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/provider/CRUDImplementationProvider.java
index f81165f564..f81165f564 100644
--- a/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/provider/CRUDImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/provider/CRUDImplementationProvider.java
diff --git a/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/provider/CRUDImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/provider/CRUDImplementationProviderFactory.java
index 9eb5fdeb61..9eb5fdeb61 100644
--- a/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/provider/CRUDImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/provider/CRUDImplementationProviderFactory.java
diff --git a/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/provider/CRUDInvoker.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/provider/CRUDInvoker.java
index 2299ce8b0c..2299ce8b0c 100644
--- a/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/provider/CRUDInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/test/java/crud/provider/CRUDInvoker.java
diff --git a/branches/sca-java-0.90/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java
index 817a151374..817a151374 100644
--- a/branches/sca-java-0.90/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java
diff --git a/branches/sca-java-0.90/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java
index 297858ea9b..297858ea9b 100644
--- a/branches/sca-java-0.90/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java
diff --git a/branches/sca-java-0.90/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java
index 9ad6fd3920..9ad6fd3920 100644
--- a/branches/sca-java-0.90/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java
diff --git a/branches/sca-java-0.90/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java
index dfc1d718b9..dfc1d718b9 100644
--- a/branches/sca-java-0.90/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java
diff --git a/branches/sca-java-0.90/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java
index 6969cba054..6969cba054 100644
--- a/branches/sca-java-0.90/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java
diff --git a/branches/sca-java-0.90/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 266d53ffc8..266d53ffc8 100644
--- a/branches/sca-java-0.90/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-0.90/modules/host-embedded/src/test/resources/crud.composite b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/test/resources/crud.composite
index 65f24ec93c..65f24ec93c 100644
--- a/branches/sca-java-0.90/modules/host-embedded/src/test/resources/crud.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/test/resources/crud.composite
diff --git a/branches/sca-java-0.90/modules/host-embedded/src/test/resources/test.txt b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/test/resources/test.txt
index 287f9b1f65..287f9b1f65 100644
--- a/branches/sca-java-0.90/modules/host-embedded/src/test/resources/test.txt
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-embedded/src/test/resources/test.txt
diff --git a/branches/sca-java-0.90/modules/host-http/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/modules/host-http/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.90/modules/host-http/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-http/DISCLAIMER
diff --git a/branches/sca-java-0.90/modules/host-http/LICENSE b/sca-java-1.x/branches/sca-java-0.90/modules/host-http/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.90/modules/host-http/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-http/LICENSE
diff --git a/branches/sca-java-0.90/modules/host-http/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/host-http/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.90/modules/host-http/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-http/NOTICE
diff --git a/branches/sca-java-0.90/modules/host-http/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/host-http/pom.xml
index 8c7a971f2f..8c7a971f2f 100644
--- a/branches/sca-java-0.90/modules/host-http/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-http/pom.xml
diff --git a/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/DefaultServletHostExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/DefaultServletHostExtensionPoint.java
index b3132438eb..b3132438eb 100644
--- a/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/DefaultServletHostExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/DefaultServletHostExtensionPoint.java
diff --git a/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ExtensibleServletHost.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ExtensibleServletHost.java
index af28b6241c..af28b6241c 100644
--- a/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ExtensibleServletHost.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ExtensibleServletHost.java
diff --git a/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ServletHost.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ServletHost.java
index eeab5d02eb..eeab5d02eb 100644
--- a/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ServletHost.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ServletHost.java
diff --git a/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ServletHostExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ServletHostExtensionPoint.java
index 8c13844a5f..8c13844a5f 100644
--- a/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ServletHostExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ServletHostExtensionPoint.java
diff --git a/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ServletMappingException.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ServletMappingException.java
index 2247d5f66c..2247d5f66c 100644
--- a/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ServletMappingException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ServletMappingException.java
diff --git a/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/module/HTTPRuntimeModuleActivator.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/module/HTTPRuntimeModuleActivator.java
index f5e6896b05..f5e6896b05 100644
--- a/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/module/HTTPRuntimeModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/module/HTTPRuntimeModuleActivator.java
diff --git a/branches/sca-java-0.90/modules/host-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-0.90/modules/host-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 7aa9e94f0a..7aa9e94f0a 100644
--- a/branches/sca-java-0.90/modules/host-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-0.90/modules/host-rmi/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/modules/host-rmi/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.90/modules/host-rmi/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-rmi/DISCLAIMER
diff --git a/branches/sca-java-0.90/modules/host-rmi/LICENSE b/sca-java-1.x/branches/sca-java-0.90/modules/host-rmi/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.90/modules/host-rmi/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-rmi/LICENSE
diff --git a/branches/sca-java-0.90/modules/host-rmi/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/host-rmi/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.90/modules/host-rmi/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-rmi/NOTICE
diff --git a/branches/sca-java-0.90/modules/host-rmi/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/host-rmi/pom.xml
index fe8d05ae99..fe8d05ae99 100644
--- a/branches/sca-java-0.90/modules/host-rmi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-rmi/pom.xml
diff --git a/branches/sca-java-0.90/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/DefaultRMIHost.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/DefaultRMIHost.java
index 82c2a01e6a..82c2a01e6a 100644
--- a/branches/sca-java-0.90/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/DefaultRMIHost.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/DefaultRMIHost.java
diff --git a/branches/sca-java-0.90/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHost.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHost.java
index 751db8ccff..751db8ccff 100644
--- a/branches/sca-java-0.90/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHost.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHost.java
diff --git a/branches/sca-java-0.90/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHostException.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHostException.java
index c8ec11ef4d..c8ec11ef4d 100644
--- a/branches/sca-java-0.90/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHostException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHostException.java
diff --git a/branches/sca-java-0.90/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHostRuntimeException.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHostRuntimeException.java
index 1b7e9cc4be..1b7e9cc4be 100644
--- a/branches/sca-java-0.90/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHostRuntimeException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHostRuntimeException.java
diff --git a/branches/sca-java-0.90/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/module/RMIRuntimeModuleActivator.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/module/RMIRuntimeModuleActivator.java
index 15e3a6c628..15e3a6c628 100644
--- a/branches/sca-java-0.90/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/module/RMIRuntimeModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/module/RMIRuntimeModuleActivator.java
diff --git a/branches/sca-java-0.90/modules/host-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-0.90/modules/host-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index adef00d555..adef00d555 100644
--- a/branches/sca-java-0.90/modules/host-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-0.90/modules/host-rmi/src/test/java/org/apache/tuscany/sca/rmi/RMIHostImplTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-rmi/src/test/java/org/apache/tuscany/sca/rmi/RMIHostImplTestCase.java
index 9bce64ecfc..9bce64ecfc 100644
--- a/branches/sca-java-0.90/modules/host-rmi/src/test/java/org/apache/tuscany/sca/rmi/RMIHostImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-rmi/src/test/java/org/apache/tuscany/sca/rmi/RMIHostImplTestCase.java
diff --git a/branches/sca-java-0.90/modules/host-webapp/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/modules/host-webapp/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.90/modules/host-webapp/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-webapp/DISCLAIMER
diff --git a/branches/sca-java-0.90/modules/host-webapp/LICENSE b/sca-java-1.x/branches/sca-java-0.90/modules/host-webapp/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.90/modules/host-webapp/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-webapp/LICENSE
diff --git a/branches/sca-java-0.90/modules/host-webapp/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/host-webapp/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.90/modules/host-webapp/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-webapp/NOTICE
diff --git a/branches/sca-java-0.90/modules/host-webapp/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/host-webapp/pom.xml
index 03df94925c..03df94925c 100644
--- a/branches/sca-java-0.90/modules/host-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-webapp/pom.xml
diff --git a/branches/sca-java-0.90/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/SCADomainHelper.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/SCADomainHelper.java
index 61a7b54a0c..61a7b54a0c 100644
--- a/branches/sca-java-0.90/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/SCADomainHelper.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/SCADomainHelper.java
diff --git a/branches/sca-java-0.90/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/TuscanyContextListener.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/TuscanyContextListener.java
index e88ace8d32..e88ace8d32 100644
--- a/branches/sca-java-0.90/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/TuscanyContextListener.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/TuscanyContextListener.java
diff --git a/branches/sca-java-0.90/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/TuscanyServlet.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/TuscanyServlet.java
index ae2cb59e35..ae2cb59e35 100644
--- a/branches/sca-java-0.90/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/TuscanyServlet.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/TuscanyServlet.java
diff --git a/branches/sca-java-0.90/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/WebAppModuleActivator.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/WebAppModuleActivator.java
index 2dee6f3ae2..2dee6f3ae2 100644
--- a/branches/sca-java-0.90/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/WebAppModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/WebAppModuleActivator.java
diff --git a/branches/sca-java-0.90/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/WebAppServletHost.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/WebAppServletHost.java
index 29c54b3153..29c54b3153 100644
--- a/branches/sca-java-0.90/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/WebAppServletHost.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/WebAppServletHost.java
diff --git a/branches/sca-java-0.90/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-0.90/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index ad19f0464d..ad19f0464d 100644
--- a/branches/sca-java-0.90/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-0.90/modules/http-jetty/.ruleset b/sca-java-1.x/branches/sca-java-0.90/modules/http-jetty/.ruleset
index 3886f07f2d..3886f07f2d 100644
--- a/branches/sca-java-0.90/modules/http-jetty/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/http-jetty/.ruleset
diff --git a/branches/sca-java-0.90/modules/http-jetty/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/modules/http-jetty/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.90/modules/http-jetty/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/http-jetty/DISCLAIMER
diff --git a/branches/sca-java-0.90/modules/http-jetty/LICENSE b/sca-java-1.x/branches/sca-java-0.90/modules/http-jetty/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.90/modules/http-jetty/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/http-jetty/LICENSE
diff --git a/branches/sca-java-0.90/modules/http-jetty/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/http-jetty/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.90/modules/http-jetty/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/http-jetty/NOTICE
diff --git a/branches/sca-java-0.90/modules/http-jetty/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/http-jetty/pom.xml
index dfcd621e72..dfcd621e72 100644
--- a/branches/sca-java-0.90/modules/http-jetty/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/http-jetty/pom.xml
diff --git a/branches/sca-java-0.90/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java b/sca-java-1.x/branches/sca-java-0.90/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java
index 1ecf1bca1b..1ecf1bca1b 100644
--- a/branches/sca-java-0.90/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java
diff --git a/branches/sca-java-0.90/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java b/sca-java-1.x/branches/sca-java-0.90/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java
index 09f4036ccc..09f4036ccc 100644
--- a/branches/sca-java-0.90/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java
diff --git a/branches/sca-java-0.90/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java b/sca-java-1.x/branches/sca-java-0.90/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java
index dfc2c18a53..dfc2c18a53 100644
--- a/branches/sca-java-0.90/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java
diff --git a/branches/sca-java-0.90/modules/http-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-0.90/modules/http-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index f61708de90..f61708de90 100644
--- a/branches/sca-java-0.90/modules/http-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/http-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-0.90/modules/http-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/http-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java
index 2a9be0a62f..2a9be0a62f 100644
--- a/branches/sca-java-0.90/modules/http-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/http-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java
diff --git a/branches/sca-java-0.90/modules/http-tomcat/.ruleset b/sca-java-1.x/branches/sca-java-0.90/modules/http-tomcat/.ruleset
index 3886f07f2d..3886f07f2d 100644
--- a/branches/sca-java-0.90/modules/http-tomcat/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/http-tomcat/.ruleset
diff --git a/branches/sca-java-0.90/modules/http-tomcat/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/modules/http-tomcat/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.90/modules/http-tomcat/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/http-tomcat/DISCLAIMER
diff --git a/branches/sca-java-0.90/modules/http-tomcat/LICENSE b/sca-java-1.x/branches/sca-java-0.90/modules/http-tomcat/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.90/modules/http-tomcat/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/http-tomcat/LICENSE
diff --git a/branches/sca-java-0.90/modules/http-tomcat/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/http-tomcat/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.90/modules/http-tomcat/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/http-tomcat/NOTICE
diff --git a/branches/sca-java-0.90/modules/http-tomcat/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/http-tomcat/pom.xml
index 3ab2784bbd..3ab2784bbd 100644
--- a/branches/sca-java-0.90/modules/http-tomcat/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/http-tomcat/pom.xml
diff --git a/branches/sca-java-0.90/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java b/sca-java-1.x/branches/sca-java-0.90/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java
index a92b2bcd60..a92b2bcd60 100644
--- a/branches/sca-java-0.90/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java
diff --git a/branches/sca-java-0.90/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java b/sca-java-1.x/branches/sca-java-0.90/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java
index 3ead50c8e4..3ead50c8e4 100644
--- a/branches/sca-java-0.90/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java
diff --git a/branches/sca-java-0.90/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/module/TomcatRuntimeModuleActivator.java b/sca-java-1.x/branches/sca-java-0.90/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/module/TomcatRuntimeModuleActivator.java
index 3d59813608..3d59813608 100644
--- a/branches/sca-java-0.90/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/module/TomcatRuntimeModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/module/TomcatRuntimeModuleActivator.java
diff --git a/branches/sca-java-0.90/modules/http-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-0.90/modules/http-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index f0f4e17507..f0f4e17507 100644
--- a/branches/sca-java-0.90/modules/http-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/http-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-0.90/modules/http-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/http-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java
index 915267848d..915267848d 100644
--- a/branches/sca-java-0.90/modules/http-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/http-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/.checkstyle b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/.checkstyle
index 3e57539570..3e57539570 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/.checkstyle
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/.pmd b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/.pmd
index 4abfdec2b5..4abfdec2b5 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/.pmd
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/.pmd
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/.ruleset b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/.ruleset
index ba9b5ce886..ba9b5ce886 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/.ruleset
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/DISCLAIMER
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/LICENSE b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/LICENSE
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/NOTICE
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/pom.xml
index 35401a54ad..35401a54ad 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/pom.xml
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java
index a803311a78..a803311a78 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java
index 07f0f93690..07f0f93690 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/JavaPropertyValueObjectFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/JavaPropertyValueObjectFactory.java
index e6176503f7..e6176503f7 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/JavaPropertyValueObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/JavaPropertyValueObjectFactory.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java
index d763c03545..d763c03545 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java
index 31547b3e18..31547b3e18 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/TargetMethodNotFoundException.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/TargetMethodNotFoundException.java
index d987489114..d987489114 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/TargetMethodNotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/TargetMethodNotFoundException.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java
index 963e5f6e7a..963e5f6e7a 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java
index aba8f1a901..aba8f1a901 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java
index 62958c81de..62958c81de 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/EventInvoker.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/EventInvoker.java
index c2335163d6..c2335163d6 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/EventInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/EventInvoker.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java
index 85caad103f..85caad103f 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java
index 4a8c8f31b8..4a8c8f31b8 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java
index e580f5c2c4..e580f5c2c4 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java
index d157a1319f..d157a1319f 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidResourceTypeException.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidResourceTypeException.java
index 382925ed30..382925ed30 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidResourceTypeException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidResourceTypeException.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JNDIObjectFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JNDIObjectFactory.java
index 750e9202a4..750e9202a4 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JNDIObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JNDIObjectFactory.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java
index d474d9e781..d474d9e781 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvoker.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvoker.java
index 0072d12a60..0072d12a60 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvoker.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java
index 1e22a0adce..1e22a0adce 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/NoAccessorException.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/NoAccessorException.java
index f45faa8b52..f45faa8b52 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/NoAccessorException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/NoAccessorException.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/NoMultiplicityTypeException.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/NoMultiplicityTypeException.java
index c1d998e811..c1d998e811 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/NoMultiplicityTypeException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/NoMultiplicityTypeException.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ObjectCallbackException.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ObjectCallbackException.java
index 7d9e4e6615..7d9e4e6615 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ObjectCallbackException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ObjectCallbackException.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/PojoObjectFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/PojoObjectFactory.java
index ccf06cf569..ccf06cf569 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/PojoObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/PojoObjectFactory.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java
index 49424bb1d6..49424bb1d6 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java
index 70c368a0e6..70c368a0e6 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java
index c124f278da..c124f278da 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java
index 000b1eb533..000b1eb533 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java
index f94b24762a..f94b24762a 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java
index cc9e59b16d..cc9e59b16d 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java
index eb8bf8d0c9..eb8bf8d0c9 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentInfo.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentInfo.java
index c544f90af7..c544f90af7 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentInfo.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentInfo.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
index 61f44dd9b9..61f44dd9b9 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java
index 1be465cc51..1be465cc51 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaTargetInvoker.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaTargetInvoker.java
index 03eca2ff6b..03eca2ff6b 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaTargetInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaTargetInvoker.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java
index a7b175cf9b..a7b175cf9b 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PassByValueInvoker.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PassByValueInvoker.java
index e9e12b9b7b..e9e12b9b7b 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PassByValueInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PassByValueInvoker.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PojoComponentContextFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PojoComponentContextFactory.java
index 612262ffb4..612262ffb4 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PojoComponentContextFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PojoComponentContextFactory.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PojoConfiguration.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PojoConfiguration.java
index bd8c66f914..bd8c66f914 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PojoConfiguration.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PojoConfiguration.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/TargetInvoker.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/TargetInvoker.java
index 5e390f1c45..5e390f1c45 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/TargetInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/TargetInvoker.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/TargetInvokerInvoker.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/TargetInvokerInvoker.java
index 3842f0ba52..3842f0ba52 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/TargetInvokerInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/TargetInvokerInvoker.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java
index 626737ceb7..626737ceb7 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/monitor/ExceptionFormatter.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/monitor/ExceptionFormatter.java
index dc34153389..dc34153389 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/monitor/ExceptionFormatter.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/monitor/ExceptionFormatter.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/monitor/ExceptionFormatterImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/monitor/ExceptionFormatterImpl.java
index 3fa86109a0..3fa86109a0 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/monitor/ExceptionFormatterImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/monitor/ExceptionFormatterImpl.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/monitor/FormatterRegistry.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/monitor/FormatterRegistry.java
index 91a8223385..91a8223385 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/monitor/FormatterRegistry.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/monitor/FormatterRegistry.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/monitor/InvalidLevelException.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/monitor/InvalidLevelException.java
index 636451bc36..636451bc36 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/monitor/InvalidLevelException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/monitor/InvalidLevelException.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/monitor/JavaLoggingMonitorFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/monitor/JavaLoggingMonitorFactory.java
index fdfd43be95..fdfd43be95 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/monitor/JavaLoggingMonitorFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/monitor/JavaLoggingMonitorFactory.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/monitor/MonitorFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/monitor/MonitorFactory.java
index 9337e72dcb..9337e72dcb 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/monitor/MonitorFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/monitor/MonitorFactory.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/monitor/MonitorFactoryUtil.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/monitor/MonitorFactoryUtil.java
index 529ceee5ec..529ceee5ec 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/monitor/MonitorFactoryUtil.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/monitor/MonitorFactoryUtil.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/monitor/NullMonitorFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/monitor/NullMonitorFactory.java
index efabb2ef9c..efabb2ef9c 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/monitor/NullMonitorFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/monitor/NullMonitorFactory.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/monitor/ProxyMonitorFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/monitor/ProxyMonitorFactory.java
index b26ba6ca8b..b26ba6ca8b 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/monitor/ProxyMonitorFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/monitor/ProxyMonitorFactory.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 0871ddf4be..0871ddf4be 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ModelHelper.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ModelHelper.java
index 9b65af0ab1..9b65af0ab1 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ModelHelper.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ModelHelper.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java
index ba8da101c6..ba8da101c6 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java
index c098062bc8..c098062bc8 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java
index 29dcfa8169..29dcfa8169 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java
index cef5cd4788..cef5cd4788 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/JNDIObjectFactoryTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/JNDIObjectFactoryTestCase.java
index 69d2696944..69d2696944 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/JNDIObjectFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/JNDIObjectFactoryTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java
index 47fb224c1e..47fb224c1e 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java
index f2b8b97e5a..f2b8b97e5a 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/PojoObjectFactoryTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/PojoObjectFactoryTestCase.java
index 6bf0658284..6bf0658284 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/PojoObjectFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/PojoObjectFactoryTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java
index d8b981e952..d8b981e952 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java
index ed7a0e7d03..ed7a0e7d03 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java
index 40ad1b1e95..40ad1b1e95 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/integration/AbstractConversationTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/integration/AbstractConversationTestCase.java
index 738775b9a3..738775b9a3 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/integration/AbstractConversationTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/integration/AbstractConversationTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/integration/ConversationIdleExpireTestCase.java.FIXME b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/integration/ConversationIdleExpireTestCase.java.FIXME
index 47fa0f0bc5..47fa0f0bc5 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/integration/ConversationIdleExpireTestCase.java.FIXME
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/integration/ConversationIdleExpireTestCase.java.FIXME
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/integration/ConversationMaxAgeExpireTestCase.java.FIXME b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/integration/ConversationMaxAgeExpireTestCase.java.FIXME
index 36e221a1e9..36e221a1e9 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/integration/ConversationMaxAgeExpireTestCase.java.FIXME
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/integration/ConversationMaxAgeExpireTestCase.java.FIXME
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/integration/ConversationStartStopEndTestCase.java.FIXME b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/integration/ConversationStartStopEndTestCase.java.FIXME
index 1872eea709..1872eea709 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/integration/ConversationStartStopEndTestCase.java.FIXME
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/integration/ConversationStartStopEndTestCase.java.FIXME
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/integration/ReferenceInjectionTestCase.java.FIXME b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/integration/ReferenceInjectionTestCase.java.FIXME
index 17a832b117..17a832b117 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/integration/ReferenceInjectionTestCase.java.FIXME
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/integration/ReferenceInjectionTestCase.java.FIXME
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/AsyncTarget.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/AsyncTarget.java
index 65681550c0..65681550c0 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/AsyncTarget.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/AsyncTarget.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/BadContextPojo.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/BadContextPojo.java
index 319d965960..319d965960 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/BadContextPojo.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/BadContextPojo.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/BadNamePojo.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/BadNamePojo.java
index 1a93254f2b..1a93254f2b 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/BadNamePojo.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/BadNamePojo.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/BasicInterface.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/BasicInterface.java
index 716a70b007..716a70b007 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/BasicInterface.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/BasicInterface.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/BasicInterfaceImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/BasicInterfaceImpl.java
index 5f3dc8e5fb..5f3dc8e5fb 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/BasicInterfaceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/BasicInterfaceImpl.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/CompositeScopeComponent.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/CompositeScopeComponent.java
index 1014dd3e1f..1014dd3e1f 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/CompositeScopeComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/CompositeScopeComponent.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/CompositeScopeComponentImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/CompositeScopeComponentImpl.java
index 2b654111f3..2b654111f3 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/CompositeScopeComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/CompositeScopeComponentImpl.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/CompositeScopeDestroyOnlyComponent.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/CompositeScopeDestroyOnlyComponent.java
index 7c5751578a..7c5751578a 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/CompositeScopeDestroyOnlyComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/CompositeScopeDestroyOnlyComponent.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/CompositeScopeInitDestroyComponent.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/CompositeScopeInitDestroyComponent.java
index 4e08b7157b..4e08b7157b 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/CompositeScopeInitDestroyComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/CompositeScopeInitDestroyComponent.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/CompositeScopeInitOnlyComponent.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/CompositeScopeInitOnlyComponent.java
index a9c8bf1566..a9c8bf1566 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/CompositeScopeInitOnlyComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/CompositeScopeInitOnlyComponent.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/ConversationalScopeComponent.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/ConversationalScopeComponent.java
index 39e8c4ca11..39e8c4ca11 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/ConversationalScopeComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/ConversationalScopeComponent.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/ConversationalScopeComponentImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/ConversationalScopeComponentImpl.java
index caf5b292f6..caf5b292f6 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/ConversationalScopeComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/ConversationalScopeComponentImpl.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/ConversationalScopeDestroyOnlyComponent.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/ConversationalScopeDestroyOnlyComponent.java
index 9fe019010d..9fe019010d 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/ConversationalScopeDestroyOnlyComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/ConversationalScopeDestroyOnlyComponent.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/ConversationalScopeInitDestroyComponent.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/ConversationalScopeInitDestroyComponent.java
index 77f9855fe0..77f9855fe0 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/ConversationalScopeInitDestroyComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/ConversationalScopeInitDestroyComponent.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/ConversationalScopeInitOnlyComponent.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/ConversationalScopeInitOnlyComponent.java
index d45d1a3def..d45d1a3def 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/ConversationalScopeInitOnlyComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/ConversationalScopeInitOnlyComponent.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/MockFactory.java.FIXME b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/MockFactory.java.FIXME
index 56bccd8f09..56bccd8f09 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/MockFactory.java.FIXME
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/MockFactory.java.FIXME
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/MockStaticInvoker.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/MockStaticInvoker.java
index 23822bec74..23822bec74 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/MockStaticInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/MockStaticInvoker.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/MockSyncInterceptor.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/MockSyncInterceptor.java
index 1e2f89cdf6..1e2f89cdf6 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/MockSyncInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/MockSyncInterceptor.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/OrderException.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/OrderException.java
index 1d337de93f..1d337de93f 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/OrderException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/OrderException.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/OrderedDependentPojo.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/OrderedDependentPojo.java
index 09b58497fe..09b58497fe 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/OrderedDependentPojo.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/OrderedDependentPojo.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/OrderedDependentPojoImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/OrderedDependentPojoImpl.java
index 0fc5a88925..0fc5a88925 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/OrderedDependentPojoImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/OrderedDependentPojoImpl.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/OrderedEagerInitPojo.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/OrderedEagerInitPojo.java
index 0907bf3e8b..0907bf3e8b 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/OrderedEagerInitPojo.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/OrderedEagerInitPojo.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/OrderedInitPojo.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/OrderedInitPojo.java
index 0c4f65e904..0c4f65e904 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/OrderedInitPojo.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/OrderedInitPojo.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/OrderedInitPojoImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/OrderedInitPojoImpl.java
index e67a1b807b..e67a1b807b 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/OrderedInitPojoImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/OrderedInitPojoImpl.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/OtherTarget.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/OtherTarget.java
index 61802beaea..61802beaea 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/OtherTarget.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/OtherTarget.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/OtherTargetImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/OtherTargetImpl.java
index 3b8c4842f1..3b8c4842f1 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/OtherTargetImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/OtherTargetImpl.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/RequestScopeComponent.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/RequestScopeComponent.java
index b10b1e7648..b10b1e7648 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/RequestScopeComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/RequestScopeComponent.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/RequestScopeDestroyOnlyComponent.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/RequestScopeDestroyOnlyComponent.java
index f504e284ab..f504e284ab 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/RequestScopeDestroyOnlyComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/RequestScopeDestroyOnlyComponent.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/RequestScopeInitDestroyComponent.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/RequestScopeInitDestroyComponent.java
index 5a0f15a54f..5a0f15a54f 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/RequestScopeInitDestroyComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/RequestScopeInitDestroyComponent.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/RequestScopeInitOnlyComponent.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/RequestScopeInitOnlyComponent.java
index b72cf2f1a3..b72cf2f1a3 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/RequestScopeInitOnlyComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/RequestScopeInitOnlyComponent.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/SessionScopeComponent.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/SessionScopeComponent.java
index 7dcfd4acda..7dcfd4acda 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/SessionScopeComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/SessionScopeComponent.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/SessionScopeComponentImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/SessionScopeComponentImpl.java
index bb0da51475..bb0da51475 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/SessionScopeComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/SessionScopeComponentImpl.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/SessionScopeInitDestroyComponent.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/SessionScopeInitDestroyComponent.java
index 5dc7d82a8d..5dc7d82a8d 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/SessionScopeInitDestroyComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/SessionScopeInitDestroyComponent.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/SessionScopeInitOnlyComponent.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/SessionScopeInitOnlyComponent.java
index 9a212c927f..9a212c927f 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/SessionScopeInitOnlyComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/SessionScopeInitOnlyComponent.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/SimpleTarget.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/SimpleTarget.java
index d8b6be1de0..d8b6be1de0 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/SimpleTarget.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/SimpleTarget.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/SimpleTargetImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/SimpleTargetImpl.java
index 27cb9a7617..27cb9a7617 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/SimpleTargetImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/SimpleTargetImpl.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/Source.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/Source.java
index 630809bcad..630809bcad 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/Source.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/Source.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/SourceImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/SourceImpl.java
index bd1abf6577..bd1abf6577 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/SourceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/SourceImpl.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/StatelessComponent.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/StatelessComponent.java
index 7eb9172f28..7eb9172f28 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/StatelessComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/StatelessComponent.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/StatelessComponentImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/StatelessComponentImpl.java
index b1e0d33b63..b1e0d33b63 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/StatelessComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/StatelessComponentImpl.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/Target.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/Target.java
index fd175bdbc5..fd175bdbc5 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/Target.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/Target.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/TargetImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/TargetImpl.java
index 5f5a11028f..5f5a11028f 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/TargetImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/mock/TargetImpl.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/monitor/ExceptionFormatterTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/monitor/ExceptionFormatterTestCase.java
index 7598b4f968..7598b4f968 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/monitor/ExceptionFormatterTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/monitor/ExceptionFormatterTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/monitor/JavaLoggingTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/monitor/JavaLoggingTestCase.java
index 2f7ed80030..2f7ed80030 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/monitor/JavaLoggingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/monitor/JavaLoggingTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java
index 40cf2e27cf..40cf2e27cf 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java
index a00b9e7109..a00b9e7109 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
index 1c8f1caa93..1c8f1caa93 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java
index 408cedb8be..408cedb8be 100644
--- a/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/.checkstyle b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/.checkstyle
index e3c216986d..e3c216986d 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/.checkstyle
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/.pmd b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/.pmd
index 2db10d6a6a..2db10d6a6a 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/.pmd
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/.pmd
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/.ruleset b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/.ruleset
index ba9b5ce886..ba9b5ce886 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/.ruleset
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/DISCLAIMER
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/LICENSE b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/LICENSE
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/NOTICE
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/pom.xml
index 829f2433b1..829f2433b1 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/pom.xml
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/api/annotation/LogLevel.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/api/annotation/LogLevel.java
index 47e205f074..47e205f074 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/api/annotation/LogLevel.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/api/annotation/LogLevel.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/api/annotation/Monitor.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/api/annotation/Monitor.java
index dea9489e5b..dea9489e5b 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/api/annotation/Monitor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/api/annotation/Monitor.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/api/annotation/Resource.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/api/annotation/Resource.java
index a7158ab6b8..a7158ab6b8 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/api/annotation/Resource.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/api/annotation/Resource.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/DefaultJavaClassIntrospectorExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/DefaultJavaClassIntrospectorExtensionPoint.java
index 5442bdd377..5442bdd377 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/DefaultJavaClassIntrospectorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/DefaultJavaClassIntrospectorExtensionPoint.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/DuplicatePropertyException.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/DuplicatePropertyException.java
index 43ebf79b91..43ebf79b91 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/DuplicatePropertyException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/DuplicatePropertyException.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/ExtensibleJavaClassIntrospector.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/ExtensibleJavaClassIntrospector.java
index 332eb96206..332eb96206 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/ExtensibleJavaClassIntrospector.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/ExtensibleJavaClassIntrospector.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/IllegalPropertyException.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/IllegalPropertyException.java
index c6494b3d74..c6494b3d74 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/IllegalPropertyException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/IllegalPropertyException.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/IntrospectionException.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/IntrospectionException.java
index 45eaf0235b..45eaf0235b 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/IntrospectionException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/IntrospectionException.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassIntrospector.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassIntrospector.java
index 7fec71a709..7fec71a709 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassIntrospector.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassIntrospector.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassIntrospectorExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassIntrospectorExtensionPoint.java
index 5da3c1ff11..5da3c1ff11 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassIntrospectorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassIntrospectorExtensionPoint.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java
index f4b7446225..f4b7446225 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
index f4c78d34ca..f4c78d34ca 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
index ab39106521..ab39106521 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java
index 329a4ae4be..329a4ae4be 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/BaseJavaClassVisitor.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/BaseJavaClassVisitor.java
index cdc9e68996..cdc9e68996 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/BaseJavaClassVisitor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/BaseJavaClassVisitor.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
index e28bf21d81..e28bf21d81 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java
index 823f4c6bda..823f4c6bda 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
index adc3802e99..adc3802e99 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
index bd6ae041a9..bd6ae041a9 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java
index 46f1556b7e..46f1556b7e 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java
index e32a3a3d5b..e32a3a3d5b 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java
index 0967ef6309..0967ef6309 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java
index 72f417244c..72f417244c 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java
index db1b81e556..db1b81e556 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
index 6f4d0d5194..6f4d0d5194 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
index 7a12d833c2..7a12d833c2 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java
index fd8df4e838..fd8df4e838 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java
index 9b548159db..9b548159db 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java
index 4e5620119b..4e5620119b 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java
index bec7c29c54..bec7c29c54 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java
index 94ea3d1c0b..94ea3d1c0b 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java
index 44ba25c460..44ba25c460 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java
index 14079b2b1d..14079b2b1d 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
index 0d2ac820a1..0d2ac820a1 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java
index 0435cdee67..0435cdee67 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java
index fdc6f1dd34..fdc6f1dd34 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java
index dc1cc2e0e9..dc1cc2e0e9 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java
index 79b81afcb7..79b81afcb7 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java
index 1b47090e55..1b47090e55 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java
index a7e4b0d827..a7e4b0d827 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java
index e0f1a0d52a..e0f1a0d52a 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java
index 2caa4b8bde..2caa4b8bde 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
index a674197b6f..a674197b6f 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java
index e3c7ad03df..e3c7ad03df 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
index 2bd6ce20ba..2bd6ce20ba 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java
index 2930e5f8d9..2930e5f8d9 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java
index 592a65b4b3..592a65b4b3 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
index 0ca1aefba0..0ca1aefba0 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java
index 30b9af2ed5..30b9af2ed5 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java
index 57d224b2bf..57d224b2bf 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
index 0e14a2a689..0e14a2a689 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
index e702a3f682..e702a3f682 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/calculator/AddService.java
index 4eeb30a9c2..4eeb30a9c2 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/calculator/AddService.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java
index ea3e5341d5..ea3e5341d5 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java
index 11e8974657..11e8974657 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/calculator/DivideService.java
index 131c5a8014..131c5a8014 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/calculator/DivideService.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java
index 9c7e96a668..9c7e96a668 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/calculator/MultiplyService.java
index a917896aeb..a917896aeb 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java
index 4892481203..4892481203 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/calculator/SubtractService.java
index e328f024ea..e328f024ea 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/calculator/SubtractService.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java
index ee1d7c3457..ee1d7c3457 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/DefaultJavaClassIntrospectorTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/DefaultJavaClassIntrospectorTestCase.java
index 9ecd439611..9ecd439611 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/DefaultJavaClassIntrospectorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/DefaultJavaClassIntrospectorTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java
index adefc4f7fc..adefc4f7fc 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java
index df316b3623..df316b3623 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java
index 9b3437b07a..9b3437b07a 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
index ce236c1d10..ce236c1d10 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
index aef565b3e4..aef565b3e4 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
index 9d4204d114..9d4204d114 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
index 2e56a2a812..2e56a2a812 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java
index 5f0e189f69..5f0e189f69 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java
index 239012d468..239012d468 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java
index 1c00df8e04..1c00df8e04 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
index 657ad757e5..657ad757e5 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java
index 9ece6cd164..9ece6cd164 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
index d125366707..d125366707 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
index de90130295..de90130295 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
index 323daf52d0..323daf52d0 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
index 8499e344ce..8499e344ce 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java
index be2b5aa56e..be2b5aa56e 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java
index aad6b96cf9..aad6b96cf9 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
index 25d37a6eca..25d37a6eca 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java
index ccac012138..ccac012138 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java
index f70cef6090..f70cef6090 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java
index 87ac37fea9..87ac37fea9 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java
index 8faaf6949f..8faaf6949f 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java
index 0c98c0655e..0c98c0655e 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
index f905be7dc8..f905be7dc8 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
index 64ba0667f5..64ba0667f5 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java
index a19c7def04..a19c7def04 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java
index bbac819bc9..bbac819bc9 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
index 7d2f71176b..7d2f71176b 100644
--- a/branches/sca-java-0.90/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
diff --git a/branches/sca-java-0.90/modules/implementation-java/.checkstyle b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java/.checkstyle
index e3c216986d..e3c216986d 100644
--- a/branches/sca-java-0.90/modules/implementation-java/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java/.checkstyle
diff --git a/branches/sca-java-0.90/modules/implementation-java/.pmd b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java/.pmd
index aa1ce3e754..aa1ce3e754 100644
--- a/branches/sca-java-0.90/modules/implementation-java/.pmd
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java/.pmd
diff --git a/branches/sca-java-0.90/modules/implementation-java/.ruleset b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java/.ruleset
index ba9b5ce886..ba9b5ce886 100644
--- a/branches/sca-java-0.90/modules/implementation-java/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java/.ruleset
diff --git a/branches/sca-java-0.90/modules/implementation-java/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.90/modules/implementation-java/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java/DISCLAIMER
diff --git a/branches/sca-java-0.90/modules/implementation-java/LICENSE b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.90/modules/implementation-java/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java/LICENSE
diff --git a/branches/sca-java-0.90/modules/implementation-java/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.90/modules/implementation-java/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java/NOTICE
diff --git a/branches/sca-java-0.90/modules/implementation-java/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java/pom.xml
index 58ad08b739..58ad08b739 100644
--- a/branches/sca-java-0.90/modules/implementation-java/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java/pom.xml
diff --git a/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java
index e67fa9a691..e67fa9a691 100644
--- a/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java
diff --git a/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java
index 7b849f9b47..7b849f9b47 100644
--- a/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java
diff --git a/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
index 7cda27be66..7cda27be66 100644
--- a/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
diff --git a/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java
index a63e03f832..a63e03f832 100644
--- a/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java
diff --git a/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
index b21c300f37..b21c300f37 100644
--- a/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
diff --git a/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java
index c0b04b4b4e..c0b04b4b4e 100644
--- a/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java
diff --git a/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java
index 61c9a4bd43..61c9a4bd43 100644
--- a/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java
diff --git a/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java
index f7174e3868..f7174e3868 100644
--- a/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java
diff --git a/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
index e3de20b2de..e3de20b2de 100644
--- a/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
diff --git a/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java
index c4c528f4f2..c4c528f4f2 100644
--- a/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java
diff --git a/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java
index 1aca15ebb8..1aca15ebb8 100644
--- a/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java
diff --git a/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java
index 7683bbb154..7683bbb154 100644
--- a/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java
diff --git a/branches/sca-java-0.90/modules/implementation-script/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.90/modules/implementation-script/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/DISCLAIMER
diff --git a/branches/sca-java-0.90/modules/implementation-script/LICENSE b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/LICENSE
index 4b5ab74408..4b5ab74408 100644
--- a/branches/sca-java-0.90/modules/implementation-script/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/LICENSE
diff --git a/branches/sca-java-0.90/modules/implementation-script/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/NOTICE
index 9a03eabdab..9a03eabdab 100644
--- a/branches/sca-java-0.90/modules/implementation-script/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/NOTICE
diff --git a/branches/sca-java-0.90/modules/implementation-script/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/pom.xml
index 23b2ed27d7..23b2ed27d7 100644
--- a/branches/sca-java-0.90/modules/implementation-script/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/pom.xml
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/spi/AbstractImplementation.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/spi/AbstractImplementation.java
index 3b7b7fdbdb..3b7b7fdbdb 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/spi/AbstractImplementation.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/spi/AbstractImplementation.java
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/spi/AbstractStAXArtifactProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/spi/AbstractStAXArtifactProcessor.java
index 275b0ff0a3..275b0ff0a3 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/spi/AbstractStAXArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/spi/AbstractStAXArtifactProcessor.java
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/spi/PropertyValueObjectFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/spi/PropertyValueObjectFactory.java
index 53385f55b5..53385f55b5 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/spi/PropertyValueObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/spi/PropertyValueObjectFactory.java
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/spi/ResourceHelper.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/spi/ResourceHelper.java
index ed2efb64bb..ed2efb64bb 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/spi/ResourceHelper.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/spi/ResourceHelper.java
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptArtifactProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptArtifactProcessor.java
index 731ab2f5d0..731ab2f5d0 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptArtifactProcessor.java
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java
index 3b127e2d41..3b127e2d41 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationProvider.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationProvider.java
index b15247033b..b15247033b 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationProvider.java
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationProviderFactory.java
index a41f8ce3e2..a41f8ce3e2 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationProviderFactory.java
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvoker.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvoker.java
index 4b75cf3a92..4b75cf3a92 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvoker.java
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptModuleActivator.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptModuleActivator.java
index 9a928a9065..9a928a9065 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptModuleActivator.java
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/engines/TuscanyJRubyScriptEngine.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/engines/TuscanyJRubyScriptEngine.java
index b1a1b05052..b1a1b05052 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/engines/TuscanyJRubyScriptEngine.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/engines/TuscanyJRubyScriptEngine.java
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 21c8ad9c32..21c8ad9c32 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java
index e050cd7083..e050cd7083 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/AbstractHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/AbstractHelloWorldTestCase.java
index dedc8bce09..dedc8bce09 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/AbstractHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/AbstractHelloWorldTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorldTestCase.java
index 39161a447b..39161a447b 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorldTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorld.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorld.java
index e86119b72e..e86119b72e 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorld.java
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java
index 9485f39faa..9485f39faa 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorldTestCase.java
index 56015b5f7c..56015b5f7c 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorldTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorldTestCase.java
index 2ccbd4d4b4..2ccbd4d4b4 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorldTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorldTestCase.java
index 79c204c759..79c204c759 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorldTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/AbstractHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/AbstractHelloWorldTestCase.java
index 8d9e7b119f..8d9e7b119f 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/AbstractHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/AbstractHelloWorldTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorldTestCase.java
index 996978e196..996978e196 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorldTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorld.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorld.java
index 73fcd77b44..73fcd77b44 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorld.java
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java
index bd18153be8..bd18153be8 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorldTestCase.java
index 8220fcade8..8220fcade8 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorldTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorldTestCase.java
index abd3ff311d..abd3ff311d 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorldTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorldTestCase.java
index c2f1ce811d..c2f1ce811d 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorldTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReferenceTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReferenceTestCase.java
index 3f72c6cf45..3f72c6cf45 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReferenceTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/HelloWorldTarget.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/HelloWorldTarget.java
index 454843ea6c..454843ea6c 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/HelloWorldTarget.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/HelloWorldTarget.java
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReferenceTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReferenceTestCase.java
index 3c8b77e39f..3c8b77e39f 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReferenceTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReferenceTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReferenceTestCase.java
index 9caf7a715f..9caf7a715f 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReferenceTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JythonReferenceTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JythonReferenceTestCase.java
index 26c970a56b..26c970a56b 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JythonReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JythonReferenceTestCase.java
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite
index e1cf7746d8..e1cf7746d8 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite
index a50fa8d01c..a50fa8d01c 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite
index 2ae739789e..2ae739789e 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite
index 9b86752993..9b86752993 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType
index bb0ddd002f..bb0ddd002f 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.groovy b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.groovy
index 9f89bd373e..9f89bd373e 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.groovy
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.groovy
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.js b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.js
index eac2ab283f..eac2ab283f 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.js
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.js
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.py b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.py
index f5dd0f8fcf..f5dd0f8fcf 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.py
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.py
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.rb b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.rb
index cd2d3bcaea..cd2d3bcaea 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.rb
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.rb
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite
index 08277e117c..08277e117c 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite
index 9eeffe09b0..9eeffe09b0 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite
index 1a733f9ae8..1a733f9ae8 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite
index b03aa0ae14..b03aa0ae14 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType
index 06f261015e..06f261015e 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.groovy b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.groovy
index a7eb446d37..a7eb446d37 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.groovy
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.groovy
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.js b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.js
index 64df3ebbef..64df3ebbef 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.js
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.js
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.py b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.py
index 868cfa9eeb..868cfa9eeb 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.py
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.py
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.rb b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.rb
index 2844f8b8d9..2844f8b8d9 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.rb
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.rb
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite
index cbcd11549d..cbcd11549d 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite
index 9b8bd45837..9b8bd45837 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite
index a74cdfb9e3..a74cdfb9e3 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite
index 4d6f9ab27c..4d6f9ab27c 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType
index 3edd075126..3edd075126 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.groovy b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.groovy
index 5d2216d583..5d2216d583 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.groovy
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.groovy
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.js b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.js
index ad0a932d26..ad0a932d26 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.js
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.js
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.py b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.py
index aee8bf991d..aee8bf991d 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.py
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.py
diff --git a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.rb b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.rb
index 87f0f56082..87f0f56082 100644
--- a/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.rb
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.rb
diff --git a/branches/sca-java-0.90/modules/interface-java-runtime/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-runtime/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.90/modules/interface-java-runtime/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-runtime/DISCLAIMER
diff --git a/branches/sca-java-0.90/modules/interface-java-runtime/LICENSE b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.90/modules/interface-java-runtime/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-runtime/LICENSE
diff --git a/branches/sca-java-0.90/modules/interface-java-runtime/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-runtime/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.90/modules/interface-java-runtime/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-runtime/NOTICE
diff --git a/branches/sca-java-0.90/modules/interface-java-runtime/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-runtime/pom.xml
index f3ac87041e..f3ac87041e 100644
--- a/branches/sca-java-0.90/modules/interface-java-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-runtime/pom.xml
diff --git a/branches/sca-java-0.90/modules/interface-java-runtime/src/main/java/org/apache/tuscany/sca/interfacedef/java/module/JavaInterfaceRuntimeModuleActivator.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-runtime/src/main/java/org/apache/tuscany/sca/interfacedef/java/module/JavaInterfaceRuntimeModuleActivator.java
index 4a7642f23a..4a7642f23a 100644
--- a/branches/sca-java-0.90/modules/interface-java-runtime/src/main/java/org/apache/tuscany/sca/interfacedef/java/module/JavaInterfaceRuntimeModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-runtime/src/main/java/org/apache/tuscany/sca/interfacedef/java/module/JavaInterfaceRuntimeModuleActivator.java
diff --git a/branches/sca-java-0.90/modules/interface-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index bfa96800bb..bfa96800bb 100644
--- a/branches/sca-java-0.90/modules/interface-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-0.90/modules/interface-java-xml/.checkstyle b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-xml/.checkstyle
index e3c216986d..e3c216986d 100644
--- a/branches/sca-java-0.90/modules/interface-java-xml/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-xml/.checkstyle
diff --git a/branches/sca-java-0.90/modules/interface-java-xml/.pmd b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-xml/.pmd
index 2db10d6a6a..2db10d6a6a 100644
--- a/branches/sca-java-0.90/modules/interface-java-xml/.pmd
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-xml/.pmd
diff --git a/branches/sca-java-0.90/modules/interface-java-xml/.ruleset b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-xml/.ruleset
index ba9b5ce886..ba9b5ce886 100644
--- a/branches/sca-java-0.90/modules/interface-java-xml/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-xml/.ruleset
diff --git a/branches/sca-java-0.90/modules/interface-java-xml/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-xml/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.90/modules/interface-java-xml/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-xml/DISCLAIMER
diff --git a/branches/sca-java-0.90/modules/interface-java-xml/LICENSE b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.90/modules/interface-java-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-xml/LICENSE
diff --git a/branches/sca-java-0.90/modules/interface-java-xml/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-xml/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.90/modules/interface-java-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-xml/NOTICE
diff --git a/branches/sca-java-0.90/modules/interface-java-xml/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-xml/pom.xml
index 29fc36d36e..29fc36d36e 100644
--- a/branches/sca-java-0.90/modules/interface-java-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-xml/pom.xml
diff --git a/branches/sca-java-0.90/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/DefaultJavaInterfaceIntrospectorExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/DefaultJavaInterfaceIntrospectorExtensionPoint.java
index fc35ef76b7..fc35ef76b7 100644
--- a/branches/sca-java-0.90/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/DefaultJavaInterfaceIntrospectorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/DefaultJavaInterfaceIntrospectorExtensionPoint.java
diff --git a/branches/sca-java-0.90/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/ExtensibleJavaInterfaceIntrospector.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/ExtensibleJavaInterfaceIntrospector.java
index 9ceb194fd1..9ceb194fd1 100644
--- a/branches/sca-java-0.90/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/ExtensibleJavaInterfaceIntrospector.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/ExtensibleJavaInterfaceIntrospector.java
diff --git a/branches/sca-java-0.90/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceIntrospector.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceIntrospector.java
index eb107aff7c..eb107aff7c 100644
--- a/branches/sca-java-0.90/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceIntrospector.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceIntrospector.java
diff --git a/branches/sca-java-0.90/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceIntrospectorExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceIntrospectorExtensionPoint.java
index 1a68e006a7..1a68e006a7 100644
--- a/branches/sca-java-0.90/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceIntrospectorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceIntrospectorExtensionPoint.java
diff --git a/branches/sca-java-0.90/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java
index 3bc03a528e..3bc03a528e 100644
--- a/branches/sca-java-0.90/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java
diff --git a/branches/sca-java-0.90/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
index 852f3dc3b5..852f3dc3b5 100644
--- a/branches/sca-java-0.90/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
diff --git a/branches/sca-java-0.90/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
index cc27d88ba8..cc27d88ba8 100644
--- a/branches/sca-java-0.90/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
diff --git a/branches/sca-java-0.90/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java
index 72a493c47c..72a493c47c 100644
--- a/branches/sca-java-0.90/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java
diff --git a/branches/sca-java-0.90/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java
index f804dfb48c..f804dfb48c 100644
--- a/branches/sca-java-0.90/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java
diff --git a/branches/sca-java-0.90/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java
index b1756224ba..b1756224ba 100644
--- a/branches/sca-java-0.90/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java
diff --git a/branches/sca-java-0.90/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java
index 464812da9a..464812da9a 100644
--- a/branches/sca-java-0.90/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java
diff --git a/branches/sca-java-0.90/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite
index 3de6410596..3de6410596 100644
--- a/branches/sca-java-0.90/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite
diff --git a/branches/sca-java-0.90/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType
index dca38c9224..dca38c9224 100644
--- a/branches/sca-java-0.90/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType
diff --git a/branches/sca-java-0.90/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType
index 23ebf576e5..23ebf576e5 100644
--- a/branches/sca-java-0.90/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType
diff --git a/branches/sca-java-0.90/modules/interface-java/.checkstyle b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java/.checkstyle
index e3c216986d..e3c216986d 100644
--- a/branches/sca-java-0.90/modules/interface-java/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java/.checkstyle
diff --git a/branches/sca-java-0.90/modules/interface-java/.pmd b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java/.pmd
index 2db10d6a6a..2db10d6a6a 100644
--- a/branches/sca-java-0.90/modules/interface-java/.pmd
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java/.pmd
diff --git a/branches/sca-java-0.90/modules/interface-java/.ruleset b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java/.ruleset
index ba9b5ce886..ba9b5ce886 100644
--- a/branches/sca-java-0.90/modules/interface-java/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java/.ruleset
diff --git a/branches/sca-java-0.90/modules/interface-java/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.90/modules/interface-java/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java/DISCLAIMER
diff --git a/branches/sca-java-0.90/modules/interface-java/LICENSE b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.90/modules/interface-java/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java/LICENSE
diff --git a/branches/sca-java-0.90/modules/interface-java/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.90/modules/interface-java/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java/NOTICE
diff --git a/branches/sca-java-0.90/modules/interface-java/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java/pom.xml
index 1c9c949680..1c9c949680 100644
--- a/branches/sca-java-0.90/modules/interface-java/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java/pom.xml
diff --git a/branches/sca-java-0.90/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
index d639c112b6..d639c112b6 100644
--- a/branches/sca-java-0.90/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
diff --git a/branches/sca-java-0.90/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java
index 700b3192f9..700b3192f9 100644
--- a/branches/sca-java-0.90/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java
diff --git a/branches/sca-java-0.90/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java
index e3a84c63f0..e3a84c63f0 100644
--- a/branches/sca-java-0.90/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java
diff --git a/branches/sca-java-0.90/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java
index 671a0b8fe2..671a0b8fe2 100644
--- a/branches/sca-java-0.90/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java
diff --git a/branches/sca-java-0.90/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java
index dadae792a8..dadae792a8 100644
--- a/branches/sca-java-0.90/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java
diff --git a/branches/sca-java-0.90/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java
index 4b7628dfb5..4b7628dfb5 100644
--- a/branches/sca-java-0.90/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java
diff --git a/branches/sca-java-0.90/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
index 513f95f841..513f95f841 100644
--- a/branches/sca-java-0.90/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
diff --git a/branches/sca-java-0.90/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java
index 78476af077..78476af077 100644
--- a/branches/sca-java-0.90/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java
diff --git a/branches/sca-java-0.90/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java
index 936e6f8cfb..936e6f8cfb 100644
--- a/branches/sca-java-0.90/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java
diff --git a/branches/sca-java-0.90/modules/interface-wsdl-runtime/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-runtime/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl-runtime/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-runtime/DISCLAIMER
diff --git a/branches/sca-java-0.90/modules/interface-wsdl-runtime/LICENSE b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl-runtime/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-runtime/LICENSE
diff --git a/branches/sca-java-0.90/modules/interface-wsdl-runtime/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-runtime/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl-runtime/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-runtime/NOTICE
diff --git a/branches/sca-java-0.90/modules/interface-wsdl-runtime/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-runtime/pom.xml
index 34090e0318..34090e0318 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-runtime/pom.xml
diff --git a/branches/sca-java-0.90/modules/interface-wsdl-runtime/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/module/WSDLInterfaceRuntimeModuleActivator.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-runtime/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/module/WSDLInterfaceRuntimeModuleActivator.java
index 6885ef05a9..6885ef05a9 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl-runtime/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/module/WSDLInterfaceRuntimeModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-runtime/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/module/WSDLInterfaceRuntimeModuleActivator.java
diff --git a/branches/sca-java-0.90/modules/interface-wsdl-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 90bbc8954d..90bbc8954d 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-0.90/modules/interface-wsdl-xml/.checkstyle b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/.checkstyle
index e3c216986d..e3c216986d 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl-xml/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/.checkstyle
diff --git a/branches/sca-java-0.90/modules/interface-wsdl-xml/.pmd b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/.pmd
index 2db10d6a6a..2db10d6a6a 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl-xml/.pmd
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/.pmd
diff --git a/branches/sca-java-0.90/modules/interface-wsdl-xml/.ruleset b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/.ruleset
index ba9b5ce886..ba9b5ce886 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl-xml/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/.ruleset
diff --git a/branches/sca-java-0.90/modules/interface-wsdl-xml/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl-xml/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/DISCLAIMER
diff --git a/branches/sca-java-0.90/modules/interface-wsdl-xml/LICENSE b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/LICENSE
diff --git a/branches/sca-java-0.90/modules/interface-wsdl-xml/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/NOTICE
diff --git a/branches/sca-java-0.90/modules/interface-wsdl-xml/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/pom.xml
index 75f80d53b2..75f80d53b2 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/pom.xml
diff --git a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/DefaultWSDLInterfaceIntrospector.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/DefaultWSDLInterfaceIntrospector.java
index 5d77d458ce..5d77d458ce 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/DefaultWSDLInterfaceIntrospector.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/DefaultWSDLInterfaceIntrospector.java
diff --git a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/InvalidWSDLException.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/InvalidWSDLException.java
index 20780df23e..20780df23e 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/InvalidWSDLException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/InvalidWSDLException.java
diff --git a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospector.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospector.java
index 075c41b3b5..075c41b3b5 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospector.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospector.java
diff --git a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperation.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperation.java
index 70f56ff8a0..70f56ff8a0 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperation.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperation.java
diff --git a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
index 7de5d5349f..7de5d5349f 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
diff --git a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java
index 782340982a..782340982a 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java
diff --git a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
index 9f5c83cda6..9f5c83cda6 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
diff --git a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDDocumentProcessor.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDDocumentProcessor.java
index d80f24b74a..d80f24b74a 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XSDDocumentProcessor.java
diff --git a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/DefaultWSDLInterfaceIntrospectorTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/DefaultWSDLInterfaceIntrospectorTestCase.java
index 55a9b1a068..55a9b1a068 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/DefaultWSDLInterfaceIntrospectorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/DefaultWSDLInterfaceIntrospectorTestCase.java
diff --git a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/TestModelResolver.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/TestModelResolver.java
index b9a9ba8cfa..b9a9ba8cfa 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/TestModelResolver.java
diff --git a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationTestCase.java
index 6bf9628390..6bf9628390 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationTestCase.java
diff --git a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java
index ea95537bd1..ea95537bd1 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java
diff --git a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java
index 56355afb2b..56355afb2b 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java
diff --git a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java
index fb71175931..fb71175931 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java
diff --git a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java
index 99fca23b7a..99fca23b7a 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java
diff --git a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite
index 875fdf35d2..875fdf35d2 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite
diff --git a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorComponent.constrainingType b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorComponent.constrainingType
index 3eb81b61bd..3eb81b61bd 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorComponent.constrainingType
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorComponent.constrainingType
diff --git a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType
index aea7046a3d..aea7046a3d 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType
diff --git a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/example.wsdl b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/example.wsdl
index 5e8e5dad0d..5e8e5dad0d 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/example.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/example.wsdl
diff --git a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/invalid-stockquote.wsdl b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/invalid-stockquote.wsdl
index ad81fc7867..ad81fc7867 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/invalid-stockquote.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/invalid-stockquote.wsdl
diff --git a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd
index 241ec15d36..241ec15d36 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd
diff --git a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/stockquote.wsdl b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/stockquote.wsdl
index 39cd5547d9..39cd5547d9 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/stockquote.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/stockquote.wsdl
diff --git a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl
index 06bdc5510c..06bdc5510c 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl
diff --git a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.xsd b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.xsd
index c2210f4a94..c2210f4a94 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.xsd
diff --git a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test2.wsdl b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test2.wsdl
index 529b395fd5..529b395fd5 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test2.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test2.wsdl
diff --git a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/unwrapped-stockquote.wsdl b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/unwrapped-stockquote.wsdl
index 666a7e4069..666a7e4069 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/unwrapped-stockquote.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/unwrapped-stockquote.wsdl
diff --git a/branches/sca-java-0.90/modules/interface-wsdl/.checkstyle b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl/.checkstyle
index e3c216986d..e3c216986d 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl/.checkstyle
diff --git a/branches/sca-java-0.90/modules/interface-wsdl/.pmd b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl/.pmd
index 2db10d6a6a..2db10d6a6a 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl/.pmd
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl/.pmd
diff --git a/branches/sca-java-0.90/modules/interface-wsdl/.ruleset b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl/.ruleset
index ba9b5ce886..ba9b5ce886 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl/.ruleset
diff --git a/branches/sca-java-0.90/modules/interface-wsdl/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl/DISCLAIMER
diff --git a/branches/sca-java-0.90/modules/interface-wsdl/LICENSE b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl/LICENSE
diff --git a/branches/sca-java-0.90/modules/interface-wsdl/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl/NOTICE
diff --git a/branches/sca-java-0.90/modules/interface-wsdl/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl/pom.xml
index 3993470efb..3993470efb 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl/pom.xml
diff --git a/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/DefaultWSDLFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/DefaultWSDLFactory.java
index 8f75de59e2..8f75de59e2 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/DefaultWSDLFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/DefaultWSDLFactory.java
diff --git a/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java
index 2cbc04bd54..2cbc04bd54 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java
diff --git a/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLFactory.java
index dfaf06b0be..dfaf06b0be 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLFactory.java
diff --git a/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterface.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterface.java
index 92bebed7de..92bebed7de 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterface.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterface.java
diff --git a/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterfaceContract.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterfaceContract.java
index 59db17116b..59db17116b 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterfaceContract.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterfaceContract.java
diff --git a/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/XSDefinition.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/XSDefinition.java
index 99bd23de25..99bd23de25 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/XSDefinition.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/XSDefinition.java
diff --git a/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java
index d5d61d2bf1..d5d61d2bf1 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java
diff --git a/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLFactoryImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLFactoryImpl.java
index 4639d2187e..4639d2187e 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLFactoryImpl.java
diff --git a/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.java
index a34cbe35b1..a34cbe35b1 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.java
diff --git a/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceImpl.java
index 31286147aa..31286147aa 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceImpl.java
diff --git a/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/XSDefinitionImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/XSDefinitionImpl.java
index d4ed9538e7..d4ed9538e7 100644
--- a/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/XSDefinitionImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/XSDefinitionImpl.java
diff --git a/branches/sca-java-0.90/modules/interface/.checkstyle b/sca-java-1.x/branches/sca-java-0.90/modules/interface/.checkstyle
index e3c216986d..e3c216986d 100644
--- a/branches/sca-java-0.90/modules/interface/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface/.checkstyle
diff --git a/branches/sca-java-0.90/modules/interface/.pmd b/sca-java-1.x/branches/sca-java-0.90/modules/interface/.pmd
index 2db10d6a6a..2db10d6a6a 100644
--- a/branches/sca-java-0.90/modules/interface/.pmd
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface/.pmd
diff --git a/branches/sca-java-0.90/modules/interface/.ruleset b/sca-java-1.x/branches/sca-java-0.90/modules/interface/.ruleset
index ba9b5ce886..ba9b5ce886 100644
--- a/branches/sca-java-0.90/modules/interface/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface/.ruleset
diff --git a/branches/sca-java-0.90/modules/interface/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/modules/interface/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.90/modules/interface/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface/DISCLAIMER
diff --git a/branches/sca-java-0.90/modules/interface/LICENSE b/sca-java-1.x/branches/sca-java-0.90/modules/interface/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.90/modules/interface/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface/LICENSE
diff --git a/branches/sca-java-0.90/modules/interface/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/interface/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.90/modules/interface/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface/NOTICE
diff --git a/branches/sca-java-0.90/modules/interface/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/interface/pom.xml
index a5a5f90fe5..a5a5f90fe5 100644
--- a/branches/sca-java-0.90/modules/interface/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface/pom.xml
diff --git a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java
index ce00834572..ce00834572 100644
--- a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java
diff --git a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java
index 2503c80f86..2503c80f86 100644
--- a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java
diff --git a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java
index cce99b4674..cce99b4674 100644
--- a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java
diff --git a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
index 4919ffcb2b..4919ffcb2b 100644
--- a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
diff --git a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java
index 9821a461d7..9821a461d7 100644
--- a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java
diff --git a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java
index 54edd3015a..54edd3015a 100644
--- a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java
diff --git a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java
index f952a86478..f952a86478 100644
--- a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java
diff --git a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java
index c4b2dd240d..c4b2dd240d 100644
--- a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java
diff --git a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java
index b19805c5b1..b19805c5b1 100644
--- a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java
diff --git a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
index f127b3cbaa..f127b3cbaa 100644
--- a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
diff --git a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java
index 424303a4c7..424303a4c7 100644
--- a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java
diff --git a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java
index 3343ce4367..3343ce4367 100644
--- a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java
diff --git a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java
index 3fd46ea7b2..3fd46ea7b2 100644
--- a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java
diff --git a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
index b525f70fb8..b525f70fb8 100644
--- a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
diff --git a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
index 77d2c8a6ab..77d2c8a6ab 100644
--- a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
diff --git a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
index 064798f36e..064798f36e 100644
--- a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
diff --git a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java
index b1e7857fec..b1e7857fec 100644
--- a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java
diff --git a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java
index 1775e065aa..1775e065aa 100644
--- a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java
diff --git a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java
index 5efa8ab15f..5efa8ab15f 100644
--- a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java
diff --git a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java
index 348c8cffd8..348c8cffd8 100644
--- a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java
diff --git a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java
index 73aa244bbd..73aa244bbd 100644
--- a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java
diff --git a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java
index aeafe15df1..aeafe15df1 100644
--- a/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java
diff --git a/branches/sca-java-0.90/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java
index 424d9327ff..424d9327ff 100644
--- a/branches/sca-java-0.90/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java
diff --git a/branches/sca-java-0.90/modules/java2wsdl/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.90/modules/java2wsdl/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/DISCLAIMER
diff --git a/branches/sca-java-0.90/modules/java2wsdl/LICENSE b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.90/modules/java2wsdl/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/LICENSE
diff --git a/branches/sca-java-0.90/modules/java2wsdl/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.90/modules/java2wsdl/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/NOTICE
diff --git a/branches/sca-java-0.90/modules/java2wsdl/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/pom.xml
index df2fe09e5a..df2fe09e5a 100644
--- a/branches/sca-java-0.90/modules/java2wsdl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/pom.xml
diff --git a/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java
index 3cb699681c..3cb699681c 100644
--- a/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java
diff --git a/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java
index 8855c3f6e9..8855c3f6e9 100644
--- a/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java
diff --git a/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java
index 3323113af4..3323113af4 100644
--- a/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java
diff --git a/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorFactory.java
index e8f3db95b0..e8f3db95b0 100644
--- a/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorFactory.java
diff --git a/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
index 0ba21f5147..0ba21f5147 100644
--- a/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
diff --git a/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
index 67609445ae..67609445ae 100644
--- a/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
diff --git a/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java
index e58d729981..e58d729981 100644
--- a/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java
diff --git a/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java
index b23726f6fa..b23726f6fa 100644
--- a/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java
diff --git a/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLConstants.java b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLConstants.java
index cde870fff4..cde870fff4 100644
--- a/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLConstants.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLConstants.java
diff --git a/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java
index 6411327abf..6411327abf 100644
--- a/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java
diff --git a/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java
index 4f3371126d..4f3371126d 100644
--- a/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java
diff --git a/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java
index 4abd7a7ce7..4abd7a7ce7 100644
--- a/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java
diff --git a/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyWSDLTypesGenerator.java b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyWSDLTypesGenerator.java
index a742e8913d..a742e8913d 100644
--- a/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyWSDLTypesGenerator.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyWSDLTypesGenerator.java
diff --git a/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java
index 26b3d092de..26b3d092de 100644
--- a/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java
diff --git a/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java
index 788d162f34..788d162f34 100644
--- a/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java
diff --git a/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/util/XMLNameUtil.java b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/util/XMLNameUtil.java
index b30b8cd62b..b30b8cd62b 100644
--- a/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/util/XMLNameUtil.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/util/XMLNameUtil.java
diff --git a/branches/sca-java-0.90/modules/java2wsdl/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/main/resources/META-INF/LICENSE.txt
index 0084319535..0084319535 100644
--- a/branches/sca-java-0.90/modules/java2wsdl/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/sca-java-0.90/modules/java2wsdl/src/main/resources/META-INF/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/main/resources/META-INF/NOTICE
index d83ebbe236..d83ebbe236 100644
--- a/branches/sca-java-0.90/modules/java2wsdl/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/main/resources/META-INF/NOTICE
diff --git a/branches/sca-java-0.90/modules/java2wsdl/src/main/resources/META-INF/README.txt b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/main/resources/META-INF/README.txt
index 9b26d1690a..9b26d1690a 100644
--- a/branches/sca-java-0.90/modules/java2wsdl/src/main/resources/META-INF/README.txt
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/main/resources/META-INF/README.txt
diff --git a/branches/sca-java-0.90/modules/java2wsdl/src/main/resources/RemotableInterfaceTemplate.xsl b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/main/resources/RemotableInterfaceTemplate.xsl
index e3da5da20f..e3da5da20f 100644
--- a/branches/sca-java-0.90/modules/java2wsdl/src/main/resources/RemotableInterfaceTemplate.xsl
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/main/resources/RemotableInterfaceTemplate.xsl
diff --git a/branches/sca-java-0.90/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java
index e679496509..e679496509 100644
--- a/branches/sca-java-0.90/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java
diff --git a/branches/sca-java-0.90/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java
index 4b5a795f2c..4b5a795f2c 100644
--- a/branches/sca-java-0.90/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java
diff --git a/branches/sca-java-0.90/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java
index a72321c9b1..a72321c9b1 100644
--- a/branches/sca-java-0.90/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java
diff --git a/branches/sca-java-0.90/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/account/Account.java b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/account/Account.java
index 84d59164ee..84d59164ee 100644
--- a/branches/sca-java-0.90/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/account/Account.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/account/Account.java
diff --git a/branches/sca-java-0.90/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/customer/Customer.java b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/customer/Customer.java
index a28399e7fe..a28399e7fe 100644
--- a/branches/sca-java-0.90/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/customer/Customer.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/customer/Customer.java
diff --git a/branches/sca-java-0.90/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/extra/GoldCustomer.java b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/extra/GoldCustomer.java
index afc68a3217..afc68a3217 100644
--- a/branches/sca-java-0.90/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/extra/GoldCustomer.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/extra/GoldCustomer.java
diff --git a/branches/sca-java-0.90/modules/java2wsdl/src/test/java/org/soapinterop/CreditScoreDocLit.java b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/test/java/org/soapinterop/CreditScoreDocLit.java
index e9e8aa882a..e9e8aa882a 100644
--- a/branches/sca-java-0.90/modules/java2wsdl/src/test/java/org/soapinterop/CreditScoreDocLit.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/test/java/org/soapinterop/CreditScoreDocLit.java
diff --git a/branches/sca-java-0.90/modules/java2wsdl/src/test/resources/AccountService.wsdl b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/test/resources/AccountService.wsdl
index e7be3ce5ba..e7be3ce5ba 100644
--- a/branches/sca-java-0.90/modules/java2wsdl/src/test/resources/AccountService.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/test/resources/AccountService.wsdl
diff --git a/branches/sca-java-0.90/modules/java2wsdl/src/test/resources/CreditScoreDocLit.wsdl b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/test/resources/CreditScoreDocLit.wsdl
index 09d1a58589..09d1a58589 100644
--- a/branches/sca-java-0.90/modules/java2wsdl/src/test/resources/CreditScoreDocLit.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/test/resources/CreditScoreDocLit.wsdl
diff --git a/branches/sca-java-0.90/modules/java2wsdl/src/test/resources/helloworld.wsdl b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/test/resources/helloworld.wsdl
index 051f604bb2..051f604bb2 100644
--- a/branches/sca-java-0.90/modules/java2wsdl/src/test/resources/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/test/resources/helloworld.wsdl
diff --git a/branches/sca-java-0.90/modules/java2wsdl/src/test/resources/interopdoc.wsdl b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/test/resources/interopdoc.wsdl
index 820c26ca34..820c26ca34 100644
--- a/branches/sca-java-0.90/modules/java2wsdl/src/test/resources/interopdoc.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/test/resources/interopdoc.wsdl
diff --git a/branches/sca-java-0.90/modules/java2wsdl/src/test/resources/sequences.xsd b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/test/resources/sequences.xsd
index a565f3fa65..a565f3fa65 100644
--- a/branches/sca-java-0.90/modules/java2wsdl/src/test/resources/sequences.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/java2wsdl/src/test/resources/sequences.xsd
diff --git a/branches/sca-java-0.90/modules/maven-java2wsdl/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/modules/maven-java2wsdl/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.90/modules/maven-java2wsdl/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/maven-java2wsdl/DISCLAIMER
diff --git a/branches/sca-java-0.90/modules/maven-java2wsdl/LICENSE b/sca-java-1.x/branches/sca-java-0.90/modules/maven-java2wsdl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.90/modules/maven-java2wsdl/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/maven-java2wsdl/LICENSE
diff --git a/branches/sca-java-0.90/modules/maven-java2wsdl/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/maven-java2wsdl/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.90/modules/maven-java2wsdl/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/maven-java2wsdl/NOTICE
diff --git a/branches/sca-java-0.90/modules/maven-java2wsdl/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/maven-java2wsdl/pom.xml
index 5ddfa360b4..5ddfa360b4 100644
--- a/branches/sca-java-0.90/modules/maven-java2wsdl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/maven-java2wsdl/pom.xml
diff --git a/branches/sca-java-0.90/modules/maven-java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/plugin/Java2WSDLGeneratorMojo.java b/sca-java-1.x/branches/sca-java-0.90/modules/maven-java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/plugin/Java2WSDLGeneratorMojo.java
index a5f6158dcd..a5f6158dcd 100644
--- a/branches/sca-java-0.90/modules/maven-java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/plugin/Java2WSDLGeneratorMojo.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/maven-java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/plugin/Java2WSDLGeneratorMojo.java
diff --git a/branches/sca-java-0.90/modules/maven-wsdl2java/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/modules/maven-wsdl2java/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.90/modules/maven-wsdl2java/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/maven-wsdl2java/DISCLAIMER
diff --git a/branches/sca-java-0.90/modules/maven-wsdl2java/LICENSE b/sca-java-1.x/branches/sca-java-0.90/modules/maven-wsdl2java/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.90/modules/maven-wsdl2java/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/maven-wsdl2java/LICENSE
diff --git a/branches/sca-java-0.90/modules/maven-wsdl2java/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/maven-wsdl2java/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.90/modules/maven-wsdl2java/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/maven-wsdl2java/NOTICE
diff --git a/branches/sca-java-0.90/modules/maven-wsdl2java/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/maven-wsdl2java/pom.xml
index beac0727b3..beac0727b3 100644
--- a/branches/sca-java-0.90/modules/maven-wsdl2java/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/maven-wsdl2java/pom.xml
diff --git a/branches/sca-java-0.90/modules/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDL2JavaGeneratorMojo.java b/sca-java-1.x/branches/sca-java-0.90/modules/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDL2JavaGeneratorMojo.java
index 2d08c31326..2d08c31326 100644
--- a/branches/sca-java-0.90/modules/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDL2JavaGeneratorMojo.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDL2JavaGeneratorMojo.java
diff --git a/branches/sca-java-0.90/modules/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDLFileOption.java b/sca-java-1.x/branches/sca-java-0.90/modules/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDLFileOption.java
index 3e6ebf0acc..3e6ebf0acc 100644
--- a/branches/sca-java-0.90/modules/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDLFileOption.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDLFileOption.java
diff --git a/branches/sca-java-0.90/modules/policy/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/modules/policy/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.90/modules/policy/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/policy/DISCLAIMER
diff --git a/branches/sca-java-0.90/modules/policy/LICENSE b/sca-java-1.x/branches/sca-java-0.90/modules/policy/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.90/modules/policy/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/policy/LICENSE
diff --git a/branches/sca-java-0.90/modules/policy/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/policy/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.90/modules/policy/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/policy/NOTICE
diff --git a/branches/sca-java-0.90/modules/policy/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/policy/pom.xml
index 1baa756868..1baa756868 100644
--- a/branches/sca-java-0.90/modules/policy/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/policy/pom.xml
diff --git a/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
index 2da41675a1..2da41675a1 100644
--- a/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
diff --git a/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java b/sca-java-1.x/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java
index de975cb2d4..de975cb2d4 100644
--- a/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java
diff --git a/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java b/sca-java-1.x/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java
index b7e430094e..b7e430094e 100644
--- a/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java
diff --git a/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java b/sca-java-1.x/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
index 9dd0be314b..9dd0be314b 100644
--- a/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
diff --git a/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java b/sca-java-1.x/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
index 97818a0d63..97818a0d63 100644
--- a/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
diff --git a/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java b/sca-java-1.x/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
index 9413cbef78..9413cbef78 100644
--- a/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
diff --git a/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java b/sca-java-1.x/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java
index 42e6fab199..42e6fab199 100644
--- a/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java
diff --git a/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
index a41b18b056..a41b18b056 100644
--- a/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
diff --git a/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
index aab03281ba..aab03281ba 100644
--- a/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
diff --git a/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
index 07a539e471..07a539e471 100644
--- a/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
diff --git a/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java b/sca-java-1.x/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
index 80a7af5de5..80a7af5de5 100644
--- a/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
diff --git a/branches/sca-java-0.90/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java
index 6732ca238d..6732ca238d 100644
--- a/branches/sca-java-0.90/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java
diff --git a/branches/sca-java-0.90/modules/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/pom.xml
index 1933187798..1933187798 100644
--- a/branches/sca-java-0.90/modules/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/pom.xml
diff --git a/branches/sca-java-0.90/modules/sca-api/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.90/modules/sca-api/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/DISCLAIMER
diff --git a/branches/sca-java-0.90/modules/sca-api/LICENSE b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.90/modules/sca-api/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/LICENSE
diff --git a/branches/sca-java-0.90/modules/sca-api/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.90/modules/sca-api/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/NOTICE
diff --git a/branches/sca-java-0.90/modules/sca-api/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/pom.xml
index 044d6dce9c..044d6dce9c 100644
--- a/branches/sca-java-0.90/modules/sca-api/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/pom.xml
diff --git a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java
index c32d229a76..c32d229a76 100644
--- a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java
diff --git a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java
index 616d4c6338..616d4c6338 100644
--- a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java
diff --git a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/Constants.java b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/Constants.java
index b1b2af8048..b1b2af8048 100644
--- a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/Constants.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/Constants.java
diff --git a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java
index 64423a4aa2..64423a4aa2 100644
--- a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java
diff --git a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java
index 63e3907cff..63e3907cff 100644
--- a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java
diff --git a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java
index 7c067a3a43..7c067a3a43 100644
--- a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java
diff --git a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java
index 900d5eecc1..900d5eecc1 100644
--- a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java
diff --git a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java
index 8790aac4fb..8790aac4fb 100644
--- a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java
diff --git a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java
index 1c6b436afa..1c6b436afa 100644
--- a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java
diff --git a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java
index d3543799ed..d3543799ed 100644
--- a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java
diff --git a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java
index bab9713026..bab9713026 100644
--- a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java
diff --git a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java
index 1d1ecdbc13..1d1ecdbc13 100644
--- a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java
diff --git a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java
index a9fc36f769..a9fc36f769 100644
--- a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java
diff --git a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java
index 477053670a..477053670a 100644
--- a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java
diff --git a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java
index f54e421c81..f54e421c81 100644
--- a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java
diff --git a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java
index 86d2d6560d..86d2d6560d 100644
--- a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java
diff --git a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java
index 37f767c1f4..37f767c1f4 100644
--- a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java
diff --git a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java
index 51d5ae76ca..51d5ae76ca 100644
--- a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java
diff --git a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java
index 13ca9a2931..13ca9a2931 100644
--- a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java
diff --git a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java
index f16bf44808..f16bf44808 100644
--- a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java
diff --git a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java
index 7d3da46ea9..7d3da46ea9 100644
--- a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java
diff --git a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java
index b9483bc9a8..b9483bc9a8 100644
--- a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java
diff --git a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java
index 9e6942651b..9e6942651b 100644
--- a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java
diff --git a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java
index 32654fea17..32654fea17 100644
--- a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java
diff --git a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java
index 1a9288934c..1a9288934c 100644
--- a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java
diff --git a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java
index 0769a94fbb..0769a94fbb 100644
--- a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java
diff --git a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java
index fbc7398da4..fbc7398da4 100644
--- a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java
diff --git a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java
index 57247cd8a3..57247cd8a3 100644
--- a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java
diff --git a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java
index 864a69b19a..864a69b19a 100644
--- a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java
diff --git a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java
index a0abe16068..a0abe16068 100644
--- a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java
diff --git a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java
index e07f70c2fe..e07f70c2fe 100644
--- a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java
diff --git a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java
index 1021f6e37f..1021f6e37f 100644
--- a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java
diff --git a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java
index aa439cabab..aa439cabab 100644
--- a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java
diff --git a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java
index 6fded2dec8..6fded2dec8 100644
--- a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java
diff --git a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java
index 1e475cd4c8..1e475cd4c8 100644
--- a/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java
diff --git a/branches/sca-java-0.90/modules/wsdl2java/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.90/modules/wsdl2java/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/DISCLAIMER
diff --git a/branches/sca-java-0.90/modules/wsdl2java/LICENSE b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.90/modules/wsdl2java/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/LICENSE
diff --git a/branches/sca-java-0.90/modules/wsdl2java/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.90/modules/wsdl2java/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/NOTICE
diff --git a/branches/sca-java-0.90/modules/wsdl2java/pom.xml b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/pom.xml
index ec66cd1db2..ec66cd1db2 100644
--- a/branches/sca-java-0.90/modules/wsdl2java/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/pom.xml
diff --git a/branches/sca-java-0.90/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java
index f24cd7e0b2..f24cd7e0b2 100644
--- a/branches/sca-java-0.90/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java
diff --git a/branches/sca-java-0.90/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java
index 5dc62fefdd..5dc62fefdd 100644
--- a/branches/sca-java-0.90/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java
diff --git a/branches/sca-java-0.90/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/RemotableInterfaceWritter.java b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/RemotableInterfaceWritter.java
index cb413bca50..cb413bca50 100644
--- a/branches/sca-java-0.90/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/RemotableInterfaceWritter.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/RemotableInterfaceWritter.java
diff --git a/branches/sca-java-0.90/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java
index 80e8f94dbf..80e8f94dbf 100644
--- a/branches/sca-java-0.90/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java
diff --git a/branches/sca-java-0.90/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingTypeMappingEntry.java b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingTypeMappingEntry.java
index 2d81ef12bf..2d81ef12bf 100644
--- a/branches/sca-java-0.90/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingTypeMappingEntry.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingTypeMappingEntry.java
diff --git a/branches/sca-java-0.90/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java
index 8f3f7447b2..8f3f7447b2 100644
--- a/branches/sca-java-0.90/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java
diff --git a/branches/sca-java-0.90/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/util/XMLNameUtil.java b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/util/XMLNameUtil.java
index d0b325982c..d0b325982c 100644
--- a/branches/sca-java-0.90/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/util/XMLNameUtil.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/util/XMLNameUtil.java
diff --git a/branches/sca-java-0.90/modules/wsdl2java/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/src/main/resources/META-INF/LICENSE.txt
index 0084319535..0084319535 100644
--- a/branches/sca-java-0.90/modules/wsdl2java/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/sca-java-0.90/modules/wsdl2java/src/main/resources/META-INF/NOTICE b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/src/main/resources/META-INF/NOTICE
index d83ebbe236..d83ebbe236 100644
--- a/branches/sca-java-0.90/modules/wsdl2java/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/src/main/resources/META-INF/NOTICE
diff --git a/branches/sca-java-0.90/modules/wsdl2java/src/main/resources/META-INF/README.txt b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/src/main/resources/META-INF/README.txt
index 9b26d1690a..9b26d1690a 100644
--- a/branches/sca-java-0.90/modules/wsdl2java/src/main/resources/META-INF/README.txt
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/src/main/resources/META-INF/README.txt
diff --git a/branches/sca-java-0.90/modules/wsdl2java/src/main/resources/RemotableInterfaceTemplate.xsl b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/src/main/resources/RemotableInterfaceTemplate.xsl
index e3da5da20f..e3da5da20f 100644
--- a/branches/sca-java-0.90/modules/wsdl2java/src/main/resources/RemotableInterfaceTemplate.xsl
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/src/main/resources/RemotableInterfaceTemplate.xsl
diff --git a/branches/sca-java-0.90/modules/wsdl2java/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java
index c3467cbabc..c3467cbabc 100644
--- a/branches/sca-java-0.90/modules/wsdl2java/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java
diff --git a/branches/sca-java-0.90/modules/wsdl2java/src/test/java/org/soapinterop/CreditScoreDocLit.java b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/src/test/java/org/soapinterop/CreditScoreDocLit.java
index e9e8aa882a..e9e8aa882a 100644
--- a/branches/sca-java-0.90/modules/wsdl2java/src/test/java/org/soapinterop/CreditScoreDocLit.java
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/src/test/java/org/soapinterop/CreditScoreDocLit.java
diff --git a/branches/sca-java-0.90/modules/wsdl2java/src/test/resources/AccountService.wsdl b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/src/test/resources/AccountService.wsdl
index e7be3ce5ba..e7be3ce5ba 100644
--- a/branches/sca-java-0.90/modules/wsdl2java/src/test/resources/AccountService.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/src/test/resources/AccountService.wsdl
diff --git a/branches/sca-java-0.90/modules/wsdl2java/src/test/resources/CreditScoreDocLit.wsdl b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/src/test/resources/CreditScoreDocLit.wsdl
index 09d1a58589..09d1a58589 100644
--- a/branches/sca-java-0.90/modules/wsdl2java/src/test/resources/CreditScoreDocLit.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/src/test/resources/CreditScoreDocLit.wsdl
diff --git a/branches/sca-java-0.90/modules/wsdl2java/src/test/resources/helloworld.wsdl b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/src/test/resources/helloworld.wsdl
index 051f604bb2..051f604bb2 100644
--- a/branches/sca-java-0.90/modules/wsdl2java/src/test/resources/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/src/test/resources/helloworld.wsdl
diff --git a/branches/sca-java-0.90/modules/wsdl2java/src/test/resources/interopdoc.wsdl b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/src/test/resources/interopdoc.wsdl
index 820c26ca34..820c26ca34 100644
--- a/branches/sca-java-0.90/modules/wsdl2java/src/test/resources/interopdoc.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/src/test/resources/interopdoc.wsdl
diff --git a/branches/sca-java-0.90/modules/wsdl2java/src/test/resources/sequences.xsd b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/src/test/resources/sequences.xsd
index a565f3fa65..a565f3fa65 100644
--- a/branches/sca-java-0.90/modules/wsdl2java/src/test/resources/sequences.xsd
+++ b/sca-java-1.x/branches/sca-java-0.90/modules/wsdl2java/src/test/resources/sequences.xsd
diff --git a/branches/sca-java-0.90/pom.xml b/sca-java-1.x/branches/sca-java-0.90/pom.xml
index 4eb3881677..4eb3881677 100644
--- a/branches/sca-java-0.90/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/pom.xml
diff --git a/branches/sca-java-0.90/samples/README b/sca-java-1.x/branches/sca-java-0.90/samples/README
index 029afaa855..029afaa855 100644
--- a/branches/sca-java-0.90/samples/README
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/README
diff --git a/branches/sca-java-0.90/samples/binding-echo-appl/README b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo-appl/README
index 59f6aef0ff..59f6aef0ff 100644
--- a/branches/sca-java-0.90/samples/binding-echo-appl/README
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo-appl/README
diff --git a/branches/sca-java-0.90/samples/binding-echo-appl/binding-echo.png b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo-appl/binding-echo.png
index a38d985363..a38d985363 100644
--- a/branches/sca-java-0.90/samples/binding-echo-appl/binding-echo.png
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo-appl/binding-echo.png
diff --git a/branches/sca-java-0.90/samples/binding-echo-appl/binding-echo.svg b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo-appl/binding-echo.svg
index 5b5051bef5..5b5051bef5 100644
--- a/branches/sca-java-0.90/samples/binding-echo-appl/binding-echo.svg
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo-appl/binding-echo.svg
diff --git a/branches/sca-java-0.90/samples/binding-echo-appl/build.xml b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo-appl/build.xml
index 3ae7dce9f6..3ae7dce9f6 100644
--- a/branches/sca-java-0.90/samples/binding-echo-appl/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo-appl/build.xml
diff --git a/branches/sca-java-0.90/samples/binding-echo-appl/pom.xml b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo-appl/pom.xml
index a4f6622d0e..a4f6622d0e 100644
--- a/branches/sca-java-0.90/samples/binding-echo-appl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo-appl/pom.xml
diff --git a/branches/sca-java-0.90/samples/binding-echo-appl/src/main/java/echo/appl/Echo.java b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo-appl/src/main/java/echo/appl/Echo.java
index b3c5580fd1..b3c5580fd1 100644
--- a/branches/sca-java-0.90/samples/binding-echo-appl/src/main/java/echo/appl/Echo.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo-appl/src/main/java/echo/appl/Echo.java
diff --git a/branches/sca-java-0.90/samples/binding-echo-appl/src/main/java/echo/appl/EchoComponentImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo-appl/src/main/java/echo/appl/EchoComponentImpl.java
index 25d53129eb..25d53129eb 100644
--- a/branches/sca-java-0.90/samples/binding-echo-appl/src/main/java/echo/appl/EchoComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo-appl/src/main/java/echo/appl/EchoComponentImpl.java
diff --git a/branches/sca-java-0.90/samples/binding-echo-appl/src/main/java/echo/client/EchoBindingClient.java b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo-appl/src/main/java/echo/client/EchoBindingClient.java
index 0666c282b4..0666c282b4 100644
--- a/branches/sca-java-0.90/samples/binding-echo-appl/src/main/java/echo/client/EchoBindingClient.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo-appl/src/main/java/echo/client/EchoBindingClient.java
diff --git a/branches/sca-java-0.90/samples/binding-echo-appl/src/main/resources/EchoBinding.composite b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo-appl/src/main/resources/EchoBinding.composite
index 211ad1d3fa..211ad1d3fa 100644
--- a/branches/sca-java-0.90/samples/binding-echo-appl/src/main/resources/EchoBinding.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo-appl/src/main/resources/EchoBinding.composite
diff --git a/branches/sca-java-0.90/samples/binding-echo-appl/src/test/java/echo/appl/EchoApplTestCase.java b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo-appl/src/test/java/echo/appl/EchoApplTestCase.java
index ae502e4ab6..ae502e4ab6 100644
--- a/branches/sca-java-0.90/samples/binding-echo-appl/src/test/java/echo/appl/EchoApplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo-appl/src/test/java/echo/appl/EchoApplTestCase.java
diff --git a/branches/sca-java-0.90/samples/binding-echo/README b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/README
index 0644344266..0644344266 100644
--- a/branches/sca-java-0.90/samples/binding-echo/README
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/README
diff --git a/branches/sca-java-0.90/samples/binding-echo/build.xml b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/build.xml
index b17fdc6bd5..b17fdc6bd5 100644
--- a/branches/sca-java-0.90/samples/binding-echo/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/build.xml
diff --git a/branches/sca-java-0.90/samples/binding-echo/pom.xml b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/pom.xml
index 8ab5172bdb..8ab5172bdb 100644
--- a/branches/sca-java-0.90/samples/binding-echo/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/pom.xml
diff --git a/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/DefaultEchoBindingFactory.java b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/DefaultEchoBindingFactory.java
index b27b936302..b27b936302 100644
--- a/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/DefaultEchoBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/DefaultEchoBindingFactory.java
diff --git a/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/EchoBinding.java b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/EchoBinding.java
index 446f720634..446f720634 100644
--- a/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/EchoBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/EchoBinding.java
diff --git a/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/EchoBindingFactory.java b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/EchoBindingFactory.java
index d893babb18..d893babb18 100644
--- a/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/EchoBindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/EchoBindingFactory.java
diff --git a/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/impl/EchoBindingImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/impl/EchoBindingImpl.java
index ef1629d519..ef1629d519 100644
--- a/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/impl/EchoBindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/impl/EchoBindingImpl.java
diff --git a/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/impl/EchoBindingProcessor.java b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/impl/EchoBindingProcessor.java
index aba0b14d55..aba0b14d55 100644
--- a/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/impl/EchoBindingProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/impl/EchoBindingProcessor.java
diff --git a/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/module/EchoModuleActivator.java b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/module/EchoModuleActivator.java
index 268b903e54..268b903e54 100644
--- a/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/module/EchoModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/module/EchoModuleActivator.java
diff --git a/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/provider/EchoBindingInvoker.java b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/provider/EchoBindingInvoker.java
index e3d52fa703..e3d52fa703 100644
--- a/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/provider/EchoBindingInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/provider/EchoBindingInvoker.java
diff --git a/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/provider/EchoBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/provider/EchoBindingProviderFactory.java
index 623cb0e16e..623cb0e16e 100644
--- a/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/provider/EchoBindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/provider/EchoBindingProviderFactory.java
diff --git a/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/provider/EchoReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/provider/EchoReferenceBindingProvider.java
index dd1a8f42f8..dd1a8f42f8 100644
--- a/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/provider/EchoReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/provider/EchoReferenceBindingProvider.java
diff --git a/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/provider/EchoServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/provider/EchoServiceBindingProvider.java
index 896e40df8d..896e40df8d 100644
--- a/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/provider/EchoServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/provider/EchoServiceBindingProvider.java
diff --git a/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/server/EchoServer.java b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/server/EchoServer.java
index e1c88c38f9..e1c88c38f9 100644
--- a/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/server/EchoServer.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/server/EchoServer.java
diff --git a/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/server/EchoService.java b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/server/EchoService.java
index 79593b2b6c..79593b2b6c 100644
--- a/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/server/EchoService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/server/EchoService.java
diff --git a/branches/sca-java-0.90/samples/binding-echo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 13d0d6f570..13d0d6f570 100644
--- a/branches/sca-java-0.90/samples/binding-echo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-0.90/samples/binding-echo/src/test/java/echo/Echo.java b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/test/java/echo/Echo.java
index 1d5e973f33..1d5e973f33 100644
--- a/branches/sca-java-0.90/samples/binding-echo/src/test/java/echo/Echo.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/test/java/echo/Echo.java
diff --git a/branches/sca-java-0.90/samples/binding-echo/src/test/java/echo/EchoComponentImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/test/java/echo/EchoComponentImpl.java
index ba68dfe908..ba68dfe908 100644
--- a/branches/sca-java-0.90/samples/binding-echo/src/test/java/echo/EchoComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/test/java/echo/EchoComponentImpl.java
diff --git a/branches/sca-java-0.90/samples/binding-echo/src/test/java/echo/EchoReferenceTestCase.java b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/test/java/echo/EchoReferenceTestCase.java
index dc6a37c11f..dc6a37c11f 100644
--- a/branches/sca-java-0.90/samples/binding-echo/src/test/java/echo/EchoReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/test/java/echo/EchoReferenceTestCase.java
diff --git a/branches/sca-java-0.90/samples/binding-echo/src/test/java/echo/EchoServiceTestCase.java b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/test/java/echo/EchoServiceTestCase.java
index fafc112d01..fafc112d01 100644
--- a/branches/sca-java-0.90/samples/binding-echo/src/test/java/echo/EchoServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/test/java/echo/EchoServiceTestCase.java
diff --git a/branches/sca-java-0.90/samples/binding-echo/src/test/resources/EchoBinding.composite b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/test/resources/EchoBinding.composite
index 7a792343f9..7a792343f9 100644
--- a/branches/sca-java-0.90/samples/binding-echo/src/test/resources/EchoBinding.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/test/resources/EchoBinding.composite
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-reference/README b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/README
index f7c47328fa..f7c47328fa 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-reference/README
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/README
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-reference/build.xml b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/build.xml
index 30817fe6f0..30817fe6f0 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-reference/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/build.xml
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-reference/calculator-rmi-reference.png b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/calculator-rmi-reference.png
index 8c76b77a9f..8c76b77a9f 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-reference/calculator-rmi-reference.png
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/calculator-rmi-reference.png
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-reference/calculator-rmi-reference.svg b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/calculator-rmi-reference.svg
index ba802e6717..ba802e6717 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-reference/calculator-rmi-reference.svg
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/calculator-rmi-reference.svg
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-reference/pom.xml b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/pom.xml
index c82c23cddd..c82c23cddd 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-reference/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/pom.xml
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
index ec57a6a533..ec57a6a533 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
index cd1076c3f1..cd1076c3f1 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
index 08cba76467..08cba76467 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
index f28f0ca179..f28f0ca179 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
index 20dce0ec28..20dce0ec28 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
index 554872a8b0..554872a8b0 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
index d8ded42cb2..d8ded42cb2 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-service/README b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/README
index 016ebf5668..016ebf5668 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-service/README
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/README
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-service/build.xml b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/build.xml
index f98f35e4b0..f98f35e4b0 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-service/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/build.xml
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-service/calculator-rmi-service.png b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/calculator-rmi-service.png
index 574f5eb14b..574f5eb14b 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-service/calculator-rmi-service.png
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/calculator-rmi-service.png
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-service/calculator-rmi-service.svg b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/calculator-rmi-service.svg
index 9253110f98..9253110f98 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-service/calculator-rmi-service.svg
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/calculator-rmi-service.svg
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-service/pom.xml b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/pom.xml
index 280f6e03ce..280f6e03ce 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-service/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/pom.xml
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
index ec57a6a533..ec57a6a533 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
index e9c635e3c8..e9c635e3c8 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
index 2b99485b68..2b99485b68 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
index f603f914b8..f603f914b8 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
index 978d2c6f42..978d2c6f42 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
index f28f0ca179..f28f0ca179 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
index 85e2dc4135..85e2dc4135 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
diff --git a/branches/sca-java-0.90/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
index 67300bd99e..67300bd99e 100644
--- a/branches/sca-java-0.90/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
diff --git a/branches/sca-java-0.90/samples/calculator-script/README b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/README
index ce471ebddc..ce471ebddc 100644
--- a/branches/sca-java-0.90/samples/calculator-script/README
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/README
diff --git a/branches/sca-java-0.90/samples/calculator-script/build.xml b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/build.xml
index 429d638ca5..429d638ca5 100644
--- a/branches/sca-java-0.90/samples/calculator-script/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/build.xml
diff --git a/branches/sca-java-0.90/samples/calculator-script/calculator-script.png b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/calculator-script.png
index d3f8c491c3..d3f8c491c3 100644
--- a/branches/sca-java-0.90/samples/calculator-script/calculator-script.png
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/calculator-script.png
diff --git a/branches/sca-java-0.90/samples/calculator-script/calculator-script.svg b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/calculator-script.svg
index 16939f9310..16939f9310 100644
--- a/branches/sca-java-0.90/samples/calculator-script/calculator-script.svg
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/calculator-script.svg
diff --git a/branches/sca-java-0.90/samples/calculator-script/pom.xml b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/pom.xml
index d86c5c8ce4..d86c5c8ce4 100644
--- a/branches/sca-java-0.90/samples/calculator-script/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/pom.xml
diff --git a/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
index 243d1562dc..243d1562dc 100644
--- a/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
index ba897fa301..ba897fa301 100644
--- a/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-0.90/samples/calculator-script/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/resources/Calculator.composite
index fce26f940f..fce26f940f 100644
--- a/branches/sca-java-0.90/samples/calculator-script/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.componentType b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.componentType
index 8746c26a76..8746c26a76 100644
--- a/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.componentType
diff --git a/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
index 1d4d221364..1d4d221364 100644
--- a/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
diff --git a/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.componentType b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.componentType
index 76798fab3c..76798fab3c 100644
--- a/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.componentType
diff --git a/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
index c31c1e8fd6..c31c1e8fd6 100644
--- a/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
diff --git a/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.componentType b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.componentType
index 34c50c7aa5..34c50c7aa5 100644
--- a/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.componentType
diff --git a/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
index d6f27ca7f5..d6f27ca7f5 100644
--- a/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
diff --git a/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.componentType b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.componentType
index 0edf77d4fd..0edf77d4fd 100644
--- a/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.componentType
diff --git a/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
index 132a1d13b0..132a1d13b0 100644
--- a/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
diff --git a/branches/sca-java-0.90/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
index c174cf7ed9..c174cf7ed9 100644
--- a/branches/sca-java-0.90/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-java-0.90/samples/calculator-web/README b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/README
index 28f1f80abb..28f1f80abb 100644
--- a/branches/sca-java-0.90/samples/calculator-web/README
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/README
diff --git a/branches/sca-java-0.90/samples/calculator-web/build.xml b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/build.xml
index aa826ef036..aa826ef036 100644
--- a/branches/sca-java-0.90/samples/calculator-web/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/build.xml
diff --git a/branches/sca-java-0.90/samples/calculator-web/calculator-web.png b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/calculator-web.png
index 896ddc4093..896ddc4093 100644
--- a/branches/sca-java-0.90/samples/calculator-web/calculator-web.png
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/calculator-web.png
diff --git a/branches/sca-java-0.90/samples/calculator-web/calculator-web.svg b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/calculator-web.svg
index 00ed27556f..00ed27556f 100644
--- a/branches/sca-java-0.90/samples/calculator-web/calculator-web.svg
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/calculator-web.svg
diff --git a/branches/sca-java-0.90/samples/calculator-web/pom.xml b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/pom.xml
index 7a5ea1dd2d..7a5ea1dd2d 100644
--- a/branches/sca-java-0.90/samples/calculator-web/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/pom.xml
diff --git a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/AddService.java
index ec57a6a533..ec57a6a533 100644
--- a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/AddServiceImpl.java
index e9c635e3c8..e9c635e3c8 100644
--- a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/CalculatorClient.java
index 4787b728f4..4787b728f4 100644
--- a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/CalculatorService.java
index ad87375529..ad87375529 100644
--- a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/CalculatorServiceImpl.java
index bf3b0303ec..bf3b0303ec 100644
--- a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/DivideService.java
index 835e4fda6d..835e4fda6d 100644
--- a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/SubtractService.java
index 30e4e6a56a..30e4e6a56a 100644
--- a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-0.90/samples/calculator-web/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/resources/Calculator.composite
index 785984fd55..785984fd55 100644
--- a/branches/sca-java-0.90/samples/calculator-web/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-0.90/samples/calculator-web/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/webapp/META-INF/sca-contribution.xml
index 048c4c125c..048c4c125c 100644
--- a/branches/sca-java-0.90/samples/calculator-web/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-0.90/samples/calculator-web/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/webapp/WEB-INF/web.xml
index e596b2bc39..e596b2bc39 100644
--- a/branches/sca-java-0.90/samples/calculator-web/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-0.90/samples/calculator-web/src/main/webapp/calc.jsp b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/webapp/calc.jsp
index 375116e5de..375116e5de 100644
--- a/branches/sca-java-0.90/samples/calculator-web/src/main/webapp/calc.jsp
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/main/webapp/calc.jsp
diff --git a/branches/sca-java-0.90/samples/calculator-web/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/test/java/calculator/CalculatorTestCase.java
index 65b8646d4d..65b8646d4d 100644
--- a/branches/sca-java-0.90/samples/calculator-web/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator-web/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-java-0.90/samples/calculator/README b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/README
index fbc79e0383..fbc79e0383 100644
--- a/branches/sca-java-0.90/samples/calculator/README
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/README
diff --git a/branches/sca-java-0.90/samples/calculator/build.xml b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/build.xml
index c4b755ef94..c4b755ef94 100644
--- a/branches/sca-java-0.90/samples/calculator/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/build.xml
diff --git a/branches/sca-java-0.90/samples/calculator/calculator.png b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/branches/sca-java-0.90/samples/calculator/calculator.png
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/calculator.png
diff --git a/branches/sca-java-0.90/samples/calculator/calculator.svg b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/calculator.svg
index 0615925c50..0615925c50 100644
--- a/branches/sca-java-0.90/samples/calculator/calculator.svg
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/calculator.svg
diff --git a/branches/sca-java-0.90/samples/calculator/pom.xml b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/pom.xml
index 066b6ed3cb..066b6ed3cb 100644
--- a/branches/sca-java-0.90/samples/calculator/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/pom.xml
diff --git a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/AddServiceImpl.java
index 8b6fe066a6..8b6fe066a6 100644
--- a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/CalculatorClient.java
index 9d180bf52e..9d180bf52e 100644
--- a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
index 3d861f2018..3d861f2018 100644
--- a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
index 77b128ab8d..77b128ab8d 100644
--- a/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-0.90/samples/calculator/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/resources/Calculator.composite
index f8655c04fa..f8655c04fa 100644
--- a/branches/sca-java-0.90/samples/calculator/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-0.90/samples/calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
index 8da7097149..8da7097149 100644
--- a/branches/sca-java-0.90/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-java-0.90/samples/databinding-echo/README b/sca-java-1.x/branches/sca-java-0.90/samples/databinding-echo/README
index 70a98171cc..70a98171cc 100644
--- a/branches/sca-java-0.90/samples/databinding-echo/README
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/databinding-echo/README
diff --git a/branches/sca-java-0.90/samples/databinding-echo/build.xml b/sca-java-1.x/branches/sca-java-0.90/samples/databinding-echo/build.xml
index c70f429afd..c70f429afd 100644
--- a/branches/sca-java-0.90/samples/databinding-echo/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/databinding-echo/build.xml
diff --git a/branches/sca-java-0.90/samples/databinding-echo/databinding-echo.png b/sca-java-1.x/branches/sca-java-0.90/samples/databinding-echo/databinding-echo.png
index afbbfff285..afbbfff285 100644
--- a/branches/sca-java-0.90/samples/databinding-echo/databinding-echo.png
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/databinding-echo/databinding-echo.png
diff --git a/branches/sca-java-0.90/samples/databinding-echo/databinding-echo.svg b/sca-java-1.x/branches/sca-java-0.90/samples/databinding-echo/databinding-echo.svg
index 87964abf86..87964abf86 100644
--- a/branches/sca-java-0.90/samples/databinding-echo/databinding-echo.svg
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/databinding-echo/databinding-echo.svg
diff --git a/branches/sca-java-0.90/samples/databinding-echo/pom.xml b/sca-java-1.x/branches/sca-java-0.90/samples/databinding-echo/pom.xml
index c8ae344f2c..c8ae344f2c 100644
--- a/branches/sca-java-0.90/samples/databinding-echo/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/databinding-echo/pom.xml
diff --git a/branches/sca-java-0.90/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java
index a0b39ad460..a0b39ad460 100644
--- a/branches/sca-java-0.90/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java
diff --git a/branches/sca-java-0.90/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java
index ff8968837d..ff8968837d 100644
--- a/branches/sca-java-0.90/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java
diff --git a/branches/sca-java-0.90/samples/databinding-echo/src/main/java/dbecho/Echo.java b/sca-java-1.x/branches/sca-java-0.90/samples/databinding-echo/src/main/java/dbecho/Echo.java
index 25ecc90454..25ecc90454 100644
--- a/branches/sca-java-0.90/samples/databinding-echo/src/main/java/dbecho/Echo.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/databinding-echo/src/main/java/dbecho/Echo.java
diff --git a/branches/sca-java-0.90/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java b/sca-java-1.x/branches/sca-java-0.90/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java
index 9ec3819899..9ec3819899 100644
--- a/branches/sca-java-0.90/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java
diff --git a/branches/sca-java-0.90/samples/databinding-echo/src/main/java/dbecho/Interface1.java b/sca-java-1.x/branches/sca-java-0.90/samples/databinding-echo/src/main/java/dbecho/Interface1.java
index 70b450e358..70b450e358 100644
--- a/branches/sca-java-0.90/samples/databinding-echo/src/main/java/dbecho/Interface1.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/databinding-echo/src/main/java/dbecho/Interface1.java
diff --git a/branches/sca-java-0.90/samples/databinding-echo/src/main/java/dbecho/Interface2.java b/sca-java-1.x/branches/sca-java-0.90/samples/databinding-echo/src/main/java/dbecho/Interface2.java
index b62f1f425d..b62f1f425d 100644
--- a/branches/sca-java-0.90/samples/databinding-echo/src/main/java/dbecho/Interface2.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/databinding-echo/src/main/java/dbecho/Interface2.java
diff --git a/branches/sca-java-0.90/samples/databinding-echo/src/main/resources/EchoDataBinding.composite b/sca-java-1.x/branches/sca-java-0.90/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
index 931d5c756c..931d5c756c 100644
--- a/branches/sca-java-0.90/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
diff --git a/branches/sca-java-0.90/samples/databinding-echo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-0.90/samples/databinding-echo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 13d0d6f570..13d0d6f570 100644
--- a/branches/sca-java-0.90/samples/databinding-echo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/databinding-echo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-0.90/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl b/sca-java-1.x/branches/sca-java-0.90/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl
index ef2308aa73..ef2308aa73 100644
--- a/branches/sca-java-0.90/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl
diff --git a/branches/sca-java-0.90/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java b/sca-java-1.x/branches/sca-java-0.90/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java
index 43434d8cee..43434d8cee 100644
--- a/branches/sca-java-0.90/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java
diff --git a/branches/sca-java-0.90/samples/helloworld-jsonrpc/README b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-jsonrpc/README
index f57eb26920..f57eb26920 100644
--- a/branches/sca-java-0.90/samples/helloworld-jsonrpc/README
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-jsonrpc/README
diff --git a/branches/sca-java-0.90/samples/helloworld-jsonrpc/build-dojo.xml b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-jsonrpc/build-dojo.xml
index 335a10817a..335a10817a 100644
--- a/branches/sca-java-0.90/samples/helloworld-jsonrpc/build-dojo.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-jsonrpc/build-dojo.xml
diff --git a/branches/sca-java-0.90/samples/helloworld-jsonrpc/build.xml b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-jsonrpc/build.xml
index e188a47e7a..e188a47e7a 100644
--- a/branches/sca-java-0.90/samples/helloworld-jsonrpc/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-jsonrpc/build.xml
diff --git a/branches/sca-java-0.90/samples/helloworld-jsonrpc/helloworld-jsonrpc.png b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-jsonrpc/helloworld-jsonrpc.png
index 57f90aed01..57f90aed01 100644
--- a/branches/sca-java-0.90/samples/helloworld-jsonrpc/helloworld-jsonrpc.png
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-jsonrpc/helloworld-jsonrpc.png
diff --git a/branches/sca-java-0.90/samples/helloworld-jsonrpc/helloworld-jsonrpc.svg b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-jsonrpc/helloworld-jsonrpc.svg
index fe966d8c17..fe966d8c17 100644
--- a/branches/sca-java-0.90/samples/helloworld-jsonrpc/helloworld-jsonrpc.svg
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-jsonrpc/helloworld-jsonrpc.svg
diff --git a/branches/sca-java-0.90/samples/helloworld-jsonrpc/pom.xml b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-jsonrpc/pom.xml
index 0a71c4c946..0a71c4c946 100644
--- a/branches/sca-java-0.90/samples/helloworld-jsonrpc/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-jsonrpc/pom.xml
diff --git a/branches/sca-java-0.90/samples/helloworld-jsonrpc/src/main/java/helloworldjsonrpc/HelloWorldService.java b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-jsonrpc/src/main/java/helloworldjsonrpc/HelloWorldService.java
index 3d8ea24f04..3d8ea24f04 100644
--- a/branches/sca-java-0.90/samples/helloworld-jsonrpc/src/main/java/helloworldjsonrpc/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-jsonrpc/src/main/java/helloworldjsonrpc/HelloWorldService.java
diff --git a/branches/sca-java-0.90/samples/helloworld-jsonrpc/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-jsonrpc/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
index 35fd00fabd..35fd00fabd 100644
--- a/branches/sca-java-0.90/samples/helloworld-jsonrpc/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-jsonrpc/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-0.90/samples/helloworld-jsonrpc/src/main/resources/jsonrpc.composite b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-jsonrpc/src/main/resources/jsonrpc.composite
index 6ceef2041f..6ceef2041f 100644
--- a/branches/sca-java-0.90/samples/helloworld-jsonrpc/src/main/resources/jsonrpc.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-jsonrpc/src/main/resources/jsonrpc.composite
diff --git a/branches/sca-java-0.90/samples/helloworld-jsonrpc/src/main/webapp/HelloWorldJSONRPC.html b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-jsonrpc/src/main/webapp/HelloWorldJSONRPC.html
index a684143794..a684143794 100644
--- a/branches/sca-java-0.90/samples/helloworld-jsonrpc/src/main/webapp/HelloWorldJSONRPC.html
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-jsonrpc/src/main/webapp/HelloWorldJSONRPC.html
diff --git a/branches/sca-java-0.90/samples/helloworld-jsonrpc/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-jsonrpc/src/main/webapp/META-INF/sca-contribution.xml
index be750ec461..be750ec461 100644
--- a/branches/sca-java-0.90/samples/helloworld-jsonrpc/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-jsonrpc/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-0.90/samples/helloworld-jsonrpc/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-jsonrpc/src/main/webapp/WEB-INF/web.xml
index 2c0c79726d..2c0c79726d 100644
--- a/branches/sca-java-0.90/samples/helloworld-jsonrpc/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-jsonrpc/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-0.90/samples/helloworld-jsonrpc/src/main/webapp/style.css b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-jsonrpc/src/main/webapp/style.css
index 7073905b11..7073905b11 100644
--- a/branches/sca-java-0.90/samples/helloworld-jsonrpc/src/main/webapp/style.css
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-jsonrpc/src/main/webapp/style.css
diff --git a/branches/sca-java-0.90/samples/helloworld-ws-reference/README b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-reference/README
index a7a6ef2e30..a7a6ef2e30 100644
--- a/branches/sca-java-0.90/samples/helloworld-ws-reference/README
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-reference/README
diff --git a/branches/sca-java-0.90/samples/helloworld-ws-reference/build.xml b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-reference/build.xml
index 71ee66b31e..71ee66b31e 100644
--- a/branches/sca-java-0.90/samples/helloworld-ws-reference/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-reference/build.xml
diff --git a/branches/sca-java-0.90/samples/helloworld-ws-reference/helloworld-ws-reference.png b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-reference/helloworld-ws-reference.png
index bd2bba41db..bd2bba41db 100644
--- a/branches/sca-java-0.90/samples/helloworld-ws-reference/helloworld-ws-reference.png
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-reference/helloworld-ws-reference.png
diff --git a/branches/sca-java-0.90/samples/helloworld-ws-reference/helloworld-ws-reference.svg b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-reference/helloworld-ws-reference.svg
index 354ffbae8f..354ffbae8f 100644
--- a/branches/sca-java-0.90/samples/helloworld-ws-reference/helloworld-ws-reference.svg
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-reference/helloworld-ws-reference.svg
diff --git a/branches/sca-java-0.90/samples/helloworld-ws-reference/pom.xml b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-reference/pom.xml
index 38354797da..38354797da 100644
--- a/branches/sca-java-0.90/samples/helloworld-ws-reference/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-reference/pom.xml
diff --git a/branches/sca-java-0.90/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java
index 4559b282fe..4559b282fe 100644
--- a/branches/sca-java-0.90/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java
diff --git a/branches/sca-java-0.90/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java
index 433a98fd7f..433a98fd7f 100644
--- a/branches/sca-java-0.90/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-0.90/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java
index 0dee19550b..0dee19550b 100644
--- a/branches/sca-java-0.90/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-java-0.90/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite
index 1f1310cbe9..1f1310cbe9 100644
--- a/branches/sca-java-0.90/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite
diff --git a/branches/sca-java-0.90/samples/helloworld-ws-reference/src/main/resources/logging.properties b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-reference/src/main/resources/logging.properties
index 3dca310cdb..3dca310cdb 100644
--- a/branches/sca-java-0.90/samples/helloworld-ws-reference/src/main/resources/logging.properties
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-reference/src/main/resources/logging.properties
diff --git a/branches/sca-java-0.90/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl
index db4f6674aa..db4f6674aa 100644
--- a/branches/sca-java-0.90/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-0.90/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java
index c4b7d03246..c4b7d03246 100644
--- a/branches/sca-java-0.90/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java
diff --git a/branches/sca-java-0.90/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldServerTest.java b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldServerTest.java
index e19b3a0f8f..e19b3a0f8f 100644
--- a/branches/sca-java-0.90/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldServerTest.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldServerTest.java
diff --git a/branches/sca-java-0.90/samples/helloworld-ws-service/README b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-service/README
index f53c1d0afa..f53c1d0afa 100644
--- a/branches/sca-java-0.90/samples/helloworld-ws-service/README
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-service/README
diff --git a/branches/sca-java-0.90/samples/helloworld-ws-service/build.xml b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-service/build.xml
index 46678febc3..46678febc3 100644
--- a/branches/sca-java-0.90/samples/helloworld-ws-service/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-service/build.xml
diff --git a/branches/sca-java-0.90/samples/helloworld-ws-service/helloworld-ws-service.png b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-service/helloworld-ws-service.png
index 6f7d9dd450..6f7d9dd450 100644
--- a/branches/sca-java-0.90/samples/helloworld-ws-service/helloworld-ws-service.png
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-service/helloworld-ws-service.png
diff --git a/branches/sca-java-0.90/samples/helloworld-ws-service/helloworld-ws-service.svg b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-service/helloworld-ws-service.svg
index 3305faeed8..3305faeed8 100644
--- a/branches/sca-java-0.90/samples/helloworld-ws-service/helloworld-ws-service.svg
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-service/helloworld-ws-service.svg
diff --git a/branches/sca-java-0.90/samples/helloworld-ws-service/pom.xml b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-service/pom.xml
index c05016ae50..c05016ae50 100644
--- a/branches/sca-java-0.90/samples/helloworld-ws-service/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-service/pom.xml
diff --git a/branches/sca-java-0.90/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java
index 0de3c70303..0de3c70303 100644
--- a/branches/sca-java-0.90/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-0.90/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java
index e03ed4dc25..e03ed4dc25 100644
--- a/branches/sca-java-0.90/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java
diff --git a/branches/sca-java-0.90/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java
index bd527ff8e2..bd527ff8e2 100644
--- a/branches/sca-java-0.90/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-0.90/samples/helloworld-ws-service/src/main/resources/helloworldws.composite b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-service/src/main/resources/helloworldws.composite
index 8add8f1e18..8add8f1e18 100644
--- a/branches/sca-java-0.90/samples/helloworld-ws-service/src/main/resources/helloworldws.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-service/src/main/resources/helloworldws.composite
diff --git a/branches/sca-java-0.90/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl
index db4f6674aa..db4f6674aa 100644
--- a/branches/sca-java-0.90/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-0.90/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java
index cc0c93bd50..cc0c93bd50 100644
--- a/branches/sca-java-0.90/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java
diff --git a/branches/sca-java-0.90/samples/implementation-composite/README b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-composite/README
index 7a840c1c8e..7a840c1c8e 100644
--- a/branches/sca-java-0.90/samples/implementation-composite/README
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-composite/README
diff --git a/branches/sca-java-0.90/samples/implementation-composite/build.xml b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-composite/build.xml
index 7aa31aab8b..7aa31aab8b 100644
--- a/branches/sca-java-0.90/samples/implementation-composite/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-composite/build.xml
diff --git a/branches/sca-java-0.90/samples/implementation-composite/implementation-composite.png b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-composite/implementation-composite.png
index 4c6d71bc03..4c6d71bc03 100644
--- a/branches/sca-java-0.90/samples/implementation-composite/implementation-composite.png
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-composite/implementation-composite.png
diff --git a/branches/sca-java-0.90/samples/implementation-composite/implementation-composite.svg b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-composite/implementation-composite.svg
index 0e60354aab..0e60354aab 100644
--- a/branches/sca-java-0.90/samples/implementation-composite/implementation-composite.svg
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-composite/implementation-composite.svg
diff --git a/branches/sca-java-0.90/samples/implementation-composite/pom.xml b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-composite/pom.xml
index 1fcc707e46..1fcc707e46 100644
--- a/branches/sca-java-0.90/samples/implementation-composite/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-composite/pom.xml
diff --git a/branches/sca-java-0.90/samples/implementation-composite/src/main/java/composite/CompositeClient.java b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-composite/src/main/java/composite/CompositeClient.java
index bf743e1797..bf743e1797 100644
--- a/branches/sca-java-0.90/samples/implementation-composite/src/main/java/composite/CompositeClient.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-composite/src/main/java/composite/CompositeClient.java
diff --git a/branches/sca-java-0.90/samples/implementation-composite/src/main/java/composite/Source.java b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-composite/src/main/java/composite/Source.java
index d0efcc1df1..d0efcc1df1 100644
--- a/branches/sca-java-0.90/samples/implementation-composite/src/main/java/composite/Source.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-composite/src/main/java/composite/Source.java
diff --git a/branches/sca-java-0.90/samples/implementation-composite/src/main/java/composite/SourceCallback.java b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-composite/src/main/java/composite/SourceCallback.java
index baa95a8e39..baa95a8e39 100644
--- a/branches/sca-java-0.90/samples/implementation-composite/src/main/java/composite/SourceCallback.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-composite/src/main/java/composite/SourceCallback.java
diff --git a/branches/sca-java-0.90/samples/implementation-composite/src/main/java/composite/SourceImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-composite/src/main/java/composite/SourceImpl.java
index b9a0c7ff74..b9a0c7ff74 100644
--- a/branches/sca-java-0.90/samples/implementation-composite/src/main/java/composite/SourceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-composite/src/main/java/composite/SourceImpl.java
diff --git a/branches/sca-java-0.90/samples/implementation-composite/src/main/java/composite/Target.java b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-composite/src/main/java/composite/Target.java
index 9a8f68a7fa..9a8f68a7fa 100644
--- a/branches/sca-java-0.90/samples/implementation-composite/src/main/java/composite/Target.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-composite/src/main/java/composite/Target.java
diff --git a/branches/sca-java-0.90/samples/implementation-composite/src/main/java/composite/TargetImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-composite/src/main/java/composite/TargetImpl.java
index 86686e9233..86686e9233 100644
--- a/branches/sca-java-0.90/samples/implementation-composite/src/main/java/composite/TargetImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-composite/src/main/java/composite/TargetImpl.java
diff --git a/branches/sca-java-0.90/samples/implementation-composite/src/main/resources/InnerComposite.composite b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-composite/src/main/resources/InnerComposite.composite
index 3376ac8ff5..3376ac8ff5 100644
--- a/branches/sca-java-0.90/samples/implementation-composite/src/main/resources/InnerComposite.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-composite/src/main/resources/InnerComposite.composite
diff --git a/branches/sca-java-0.90/samples/implementation-composite/src/main/resources/InnerComposite2.composite b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-composite/src/main/resources/InnerComposite2.composite
index c9eff4fa9d..c9eff4fa9d 100644
--- a/branches/sca-java-0.90/samples/implementation-composite/src/main/resources/InnerComposite2.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-composite/src/main/resources/InnerComposite2.composite
diff --git a/branches/sca-java-0.90/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
index 71859a321e..71859a321e 100644
--- a/branches/sca-java-0.90/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-0.90/samples/implementation-composite/src/main/resources/OuterComposite.composite b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-composite/src/main/resources/OuterComposite.composite
index cb1c1e13d4..cb1c1e13d4 100644
--- a/branches/sca-java-0.90/samples/implementation-composite/src/main/resources/OuterComposite.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-composite/src/main/resources/OuterComposite.composite
diff --git a/branches/sca-java-0.90/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
index d20f6d17d3..d20f6d17d3 100644
--- a/branches/sca-java-0.90/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
diff --git a/branches/sca-java-0.90/samples/implementation-crud-client/README b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud-client/README
index 1c285564db..1c285564db 100644
--- a/branches/sca-java-0.90/samples/implementation-crud-client/README
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud-client/README
diff --git a/branches/sca-java-0.90/samples/implementation-crud-client/build.xml b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud-client/build.xml
index b06c13ae85..b06c13ae85 100644
--- a/branches/sca-java-0.90/samples/implementation-crud-client/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud-client/build.xml
diff --git a/branches/sca-java-0.90/samples/implementation-crud-client/implementation-crud.png b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud-client/implementation-crud.png
index a292037e7a..a292037e7a 100644
--- a/branches/sca-java-0.90/samples/implementation-crud-client/implementation-crud.png
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud-client/implementation-crud.png
diff --git a/branches/sca-java-0.90/samples/implementation-crud-client/implementation-crud.svg b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud-client/implementation-crud.svg
index dbb37be208..dbb37be208 100644
--- a/branches/sca-java-0.90/samples/implementation-crud-client/implementation-crud.svg
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud-client/implementation-crud.svg
diff --git a/branches/sca-java-0.90/samples/implementation-crud-client/pom.xml b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud-client/pom.xml
index c671b265f0..c671b265f0 100644
--- a/branches/sca-java-0.90/samples/implementation-crud-client/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud-client/pom.xml
diff --git a/branches/sca-java-0.90/samples/implementation-crud-client/src/main/java/crud/client/CRUDClient.java b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud-client/src/main/java/crud/client/CRUDClient.java
index ff2da8985b..ff2da8985b 100644
--- a/branches/sca-java-0.90/samples/implementation-crud-client/src/main/java/crud/client/CRUDClient.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud-client/src/main/java/crud/client/CRUDClient.java
diff --git a/branches/sca-java-0.90/samples/implementation-crud-client/src/main/resources/crud.composite b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud-client/src/main/resources/crud.composite
index 18745033bb..18745033bb 100644
--- a/branches/sca-java-0.90/samples/implementation-crud-client/src/main/resources/crud.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud-client/src/main/resources/crud.composite
diff --git a/branches/sca-java-0.90/samples/implementation-crud-client/src/test/java/crud/client/CRUDTestCase.java b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud-client/src/test/java/crud/client/CRUDTestCase.java
index c3fe9d0f62..c3fe9d0f62 100644
--- a/branches/sca-java-0.90/samples/implementation-crud-client/src/test/java/crud/client/CRUDTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud-client/src/test/java/crud/client/CRUDTestCase.java
diff --git a/branches/sca-java-0.90/samples/implementation-crud/README b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud/README
index 225829a46c..225829a46c 100644
--- a/branches/sca-java-0.90/samples/implementation-crud/README
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud/README
diff --git a/branches/sca-java-0.90/samples/implementation-crud/build.xml b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud/build.xml
index 79bd63aeea..79bd63aeea 100644
--- a/branches/sca-java-0.90/samples/implementation-crud/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud/build.xml
diff --git a/branches/sca-java-0.90/samples/implementation-crud/pom.xml b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud/pom.xml
index a9a47f18a1..a9a47f18a1 100644
--- a/branches/sca-java-0.90/samples/implementation-crud/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud/pom.xml
diff --git a/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/CRUD.java b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/CRUD.java
index b23d85887b..b23d85887b 100644
--- a/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/CRUD.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/CRUD.java
diff --git a/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/CRUDImplementation.java b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/CRUDImplementation.java
index 5cb2bd2b1c..5cb2bd2b1c 100644
--- a/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/CRUDImplementation.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/CRUDImplementation.java
diff --git a/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/CRUDImplementationFactory.java b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/CRUDImplementationFactory.java
index 2a6f3bd955..2a6f3bd955 100644
--- a/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/CRUDImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/CRUDImplementationFactory.java
diff --git a/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/DefaultCRUDImplementationFactory.java b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/DefaultCRUDImplementationFactory.java
index 38aac604d9..38aac604d9 100644
--- a/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/DefaultCRUDImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/DefaultCRUDImplementationFactory.java
diff --git a/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/backend/ResourceManager.java b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/backend/ResourceManager.java
index 2baf95c561..2baf95c561 100644
--- a/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/backend/ResourceManager.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/backend/ResourceManager.java
diff --git a/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/impl/CRUDImplementationImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/impl/CRUDImplementationImpl.java
index 4dd3e336b7..4dd3e336b7 100644
--- a/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/impl/CRUDImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/impl/CRUDImplementationImpl.java
diff --git a/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/impl/CRUDImplementationProcessor.java b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/impl/CRUDImplementationProcessor.java
index cf57336cd1..cf57336cd1 100644
--- a/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/impl/CRUDImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/impl/CRUDImplementationProcessor.java
diff --git a/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/module/CRUDModuleActivator.java b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/module/CRUDModuleActivator.java
index 49b0eef259..49b0eef259 100644
--- a/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/module/CRUDModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/module/CRUDModuleActivator.java
diff --git a/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/provider/CRUDImplementationProvider.java b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/provider/CRUDImplementationProvider.java
index 0f040a478f..0f040a478f 100644
--- a/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/provider/CRUDImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/provider/CRUDImplementationProvider.java
diff --git a/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/provider/CRUDImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/provider/CRUDImplementationProviderFactory.java
index 08e041d7e0..08e041d7e0 100644
--- a/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/provider/CRUDImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/provider/CRUDImplementationProviderFactory.java
diff --git a/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/provider/CRUDInvoker.java b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/provider/CRUDInvoker.java
index f09922e965..f09922e965 100644
--- a/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/provider/CRUDInvoker.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud/src/main/java/crud/provider/CRUDInvoker.java
diff --git a/branches/sca-java-0.90/samples/implementation-crud/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index d9ab99f258..d9ab99f258 100644
--- a/branches/sca-java-0.90/samples/implementation-crud/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-0.90/samples/implementation-crud/src/test/java/crud/CRUDTestCase.java b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud/src/test/java/crud/CRUDTestCase.java
index 8b092818a9..8b092818a9 100644
--- a/branches/sca-java-0.90/samples/implementation-crud/src/test/java/crud/CRUDTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud/src/test/java/crud/CRUDTestCase.java
diff --git a/branches/sca-java-0.90/samples/implementation-crud/src/test/resources/crud.composite b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud/src/test/resources/crud.composite
index 18745033bb..18745033bb 100644
--- a/branches/sca-java-0.90/samples/implementation-crud/src/test/resources/crud.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/implementation-crud/src/test/resources/crud.composite
diff --git a/branches/sca-java-0.90/samples/loanapplication/pom.xml b/sca-java-1.x/branches/sca-java-0.90/samples/loanapplication/pom.xml
index 1e58d99e1b..1e58d99e1b 100644
--- a/branches/sca-java-0.90/samples/loanapplication/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/loanapplication/pom.xml
diff --git a/branches/sca-java-0.90/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java b/sca-java-1.x/branches/sca-java-0.90/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java
index 441f68ebf0..441f68ebf0 100644
--- a/branches/sca-java-0.90/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java
diff --git a/branches/sca-java-0.90/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java b/sca-java-1.x/branches/sca-java-0.90/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java
index 5183ece867..5183ece867 100644
--- a/branches/sca-java-0.90/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java
diff --git a/branches/sca-java-0.90/samples/loanapplication/src/main/java/loanapplication/LoanClient.java b/sca-java-1.x/branches/sca-java-0.90/samples/loanapplication/src/main/java/loanapplication/LoanClient.java
index 7e4438bbff..7e4438bbff 100644
--- a/branches/sca-java-0.90/samples/loanapplication/src/main/java/loanapplication/LoanClient.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/loanapplication/src/main/java/loanapplication/LoanClient.java
diff --git a/branches/sca-java-0.90/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java
index b06d9465a2..b06d9465a2 100644
--- a/branches/sca-java-0.90/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java
diff --git a/branches/sca-java-0.90/samples/loanapplication/src/main/java/loanapplication/LoanService.java b/sca-java-1.x/branches/sca-java-0.90/samples/loanapplication/src/main/java/loanapplication/LoanService.java
index d09864ea55..d09864ea55 100644
--- a/branches/sca-java-0.90/samples/loanapplication/src/main/java/loanapplication/LoanService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/loanapplication/src/main/java/loanapplication/LoanService.java
diff --git a/branches/sca-java-0.90/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java
index 76a53323bd..76a53323bd 100644
--- a/branches/sca-java-0.90/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java
diff --git a/branches/sca-java-0.90/samples/loanapplication/src/main/resources/loanapplication.composite b/sca-java-1.x/branches/sca-java-0.90/samples/loanapplication/src/main/resources/loanapplication.composite
index 3aa8d030b7..3aa8d030b7 100644
--- a/branches/sca-java-0.90/samples/loanapplication/src/main/resources/loanapplication.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/loanapplication/src/main/resources/loanapplication.composite
diff --git a/branches/sca-java-0.90/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java b/sca-java-1.x/branches/sca-java-0.90/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java
index f97dfc9875..f97dfc9875 100644
--- a/branches/sca-java-0.90/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java
diff --git a/branches/sca-java-0.90/samples/pom.xml b/sca-java-1.x/branches/sca-java-0.90/samples/pom.xml
index 353d99756b..353d99756b 100644
--- a/branches/sca-java-0.90/samples/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/pom.xml
diff --git a/branches/sca-java-0.90/samples/simple-bigbank/README b/sca-java-1.x/branches/sca-java-0.90/samples/simple-bigbank/README
index 4110f081a5..4110f081a5 100644
--- a/branches/sca-java-0.90/samples/simple-bigbank/README
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/simple-bigbank/README
diff --git a/branches/sca-java-0.90/samples/simple-bigbank/build.xml b/sca-java-1.x/branches/sca-java-0.90/samples/simple-bigbank/build.xml
index a814014eae..a814014eae 100644
--- a/branches/sca-java-0.90/samples/simple-bigbank/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/simple-bigbank/build.xml
diff --git a/branches/sca-java-0.90/samples/simple-bigbank/pom.xml b/sca-java-1.x/branches/sca-java-0.90/samples/simple-bigbank/pom.xml
index aee4d6ee92..aee4d6ee92 100644
--- a/branches/sca-java-0.90/samples/simple-bigbank/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/simple-bigbank/pom.xml
diff --git a/branches/sca-java-0.90/samples/simple-bigbank/simple-bigbank.png b/sca-java-1.x/branches/sca-java-0.90/samples/simple-bigbank/simple-bigbank.png
index 593c047f6a..593c047f6a 100644
--- a/branches/sca-java-0.90/samples/simple-bigbank/simple-bigbank.png
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/simple-bigbank/simple-bigbank.png
diff --git a/branches/sca-java-0.90/samples/simple-bigbank/simple-bigbank.svg b/sca-java-1.x/branches/sca-java-0.90/samples/simple-bigbank/simple-bigbank.svg
index c64f6de6b9..c64f6de6b9 100644
--- a/branches/sca-java-0.90/samples/simple-bigbank/simple-bigbank.svg
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/simple-bigbank/simple-bigbank.svg
diff --git a/branches/sca-java-0.90/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java b/sca-java-1.x/branches/sca-java-0.90/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java
index 3f207e2f79..3f207e2f79 100644
--- a/branches/sca-java-0.90/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java
diff --git a/branches/sca-java-0.90/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java b/sca-java-1.x/branches/sca-java-0.90/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java
index 7c9082b944..7c9082b944 100644
--- a/branches/sca-java-0.90/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java
diff --git a/branches/sca-java-0.90/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
index 0d73a6c3c9..0d73a6c3c9 100644
--- a/branches/sca-java-0.90/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
diff --git a/branches/sca-java-0.90/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java b/sca-java-1.x/branches/sca-java-0.90/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java
index a5ae7b3955..a5ae7b3955 100644
--- a/branches/sca-java-0.90/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java
diff --git a/branches/sca-java-0.90/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java b/sca-java-1.x/branches/sca-java-0.90/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java
index c354de387b..c354de387b 100644
--- a/branches/sca-java-0.90/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java
diff --git a/branches/sca-java-0.90/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
index c8fc6277ca..c8fc6277ca 100644
--- a/branches/sca-java-0.90/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
diff --git a/branches/sca-java-0.90/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java b/sca-java-1.x/branches/sca-java-0.90/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java
index 11bdff757e..11bdff757e 100644
--- a/branches/sca-java-0.90/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java
diff --git a/branches/sca-java-0.90/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java b/sca-java-1.x/branches/sca-java-0.90/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java
index b791024076..b791024076 100644
--- a/branches/sca-java-0.90/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java
diff --git a/branches/sca-java-0.90/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java b/sca-java-1.x/branches/sca-java-0.90/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java
index 03df61772b..03df61772b 100644
--- a/branches/sca-java-0.90/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java
diff --git a/branches/sca-java-0.90/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java b/sca-java-1.x/branches/sca-java-0.90/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java
index edbf910d37..edbf910d37 100644
--- a/branches/sca-java-0.90/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java
diff --git a/branches/sca-java-0.90/samples/simple-bigbank/src/main/resources/BigBank.composite b/sca-java-1.x/branches/sca-java-0.90/samples/simple-bigbank/src/main/resources/BigBank.composite
index ebebce5af9..ebebce5af9 100644
--- a/branches/sca-java-0.90/samples/simple-bigbank/src/main/resources/BigBank.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/simple-bigbank/src/main/resources/BigBank.composite
diff --git a/branches/sca-java-0.90/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java b/sca-java-1.x/branches/sca-java-0.90/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java
index 42d780953d..42d780953d 100644
--- a/branches/sca-java-0.90/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java
diff --git a/branches/sca-java-0.90/samples/simple-callback/README b/sca-java-1.x/branches/sca-java-0.90/samples/simple-callback/README
index 5481d451e0..5481d451e0 100644
--- a/branches/sca-java-0.90/samples/simple-callback/README
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/simple-callback/README
diff --git a/branches/sca-java-0.90/samples/simple-callback/build.xml b/sca-java-1.x/branches/sca-java-0.90/samples/simple-callback/build.xml
index 47d1ea4bc1..47d1ea4bc1 100644
--- a/branches/sca-java-0.90/samples/simple-callback/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/simple-callback/build.xml
diff --git a/branches/sca-java-0.90/samples/simple-callback/pom.xml b/sca-java-1.x/branches/sca-java-0.90/samples/simple-callback/pom.xml
index 5117ab78d6..5117ab78d6 100644
--- a/branches/sca-java-0.90/samples/simple-callback/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/simple-callback/pom.xml
diff --git a/branches/sca-java-0.90/samples/simple-callback/simple-callback.png b/sca-java-1.x/branches/sca-java-0.90/samples/simple-callback/simple-callback.png
index 1b6353f5cf..1b6353f5cf 100644
--- a/branches/sca-java-0.90/samples/simple-callback/simple-callback.png
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/simple-callback/simple-callback.png
diff --git a/branches/sca-java-0.90/samples/simple-callback/simple-callback.svg b/sca-java-1.x/branches/sca-java-0.90/samples/simple-callback/simple-callback.svg
index 484b65df9d..484b65df9d 100644
--- a/branches/sca-java-0.90/samples/simple-callback/simple-callback.svg
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/simple-callback/simple-callback.svg
diff --git a/branches/sca-java-0.90/samples/simple-callback/src/main/java/simplecallback/MyClient.java b/sca-java-1.x/branches/sca-java-0.90/samples/simple-callback/src/main/java/simplecallback/MyClient.java
index 4cc00d6d0f..4cc00d6d0f 100644
--- a/branches/sca-java-0.90/samples/simple-callback/src/main/java/simplecallback/MyClient.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/simple-callback/src/main/java/simplecallback/MyClient.java
diff --git a/branches/sca-java-0.90/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java
index 3e2a1df5a5..3e2a1df5a5 100644
--- a/branches/sca-java-0.90/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java
diff --git a/branches/sca-java-0.90/samples/simple-callback/src/main/java/simplecallback/MyService.java b/sca-java-1.x/branches/sca-java-0.90/samples/simple-callback/src/main/java/simplecallback/MyService.java
index e78ad6f68f..e78ad6f68f 100644
--- a/branches/sca-java-0.90/samples/simple-callback/src/main/java/simplecallback/MyService.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/simple-callback/src/main/java/simplecallback/MyService.java
diff --git a/branches/sca-java-0.90/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java b/sca-java-1.x/branches/sca-java-0.90/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java
index b27eea44f5..b27eea44f5 100644
--- a/branches/sca-java-0.90/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java
diff --git a/branches/sca-java-0.90/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java
index fc5e31d14e..fc5e31d14e 100644
--- a/branches/sca-java-0.90/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java
diff --git a/branches/sca-java-0.90/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java b/sca-java-1.x/branches/sca-java-0.90/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java
index b8987fcd07..b8987fcd07 100644
--- a/branches/sca-java-0.90/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java
diff --git a/branches/sca-java-0.90/samples/simple-callback/src/main/resources/simplecallback.composite b/sca-java-1.x/branches/sca-java-0.90/samples/simple-callback/src/main/resources/simplecallback.composite
index 33e6f60601..33e6f60601 100644
--- a/branches/sca-java-0.90/samples/simple-callback/src/main/resources/simplecallback.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/simple-callback/src/main/resources/simplecallback.composite
diff --git a/branches/sca-java-0.90/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java b/sca-java-1.x/branches/sca-java-0.90/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java
index cafa1bf2fb..cafa1bf2fb 100644
--- a/branches/sca-java-0.90/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java
diff --git a/branches/sca-java-0.90/samples/supplychain/README b/sca-java-1.x/branches/sca-java-0.90/samples/supplychain/README
index 9e7b13c664..9e7b13c664 100644
--- a/branches/sca-java-0.90/samples/supplychain/README
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/supplychain/README
diff --git a/branches/sca-java-0.90/samples/supplychain/build.xml b/sca-java-1.x/branches/sca-java-0.90/samples/supplychain/build.xml
index 506180b8b1..506180b8b1 100644
--- a/branches/sca-java-0.90/samples/supplychain/build.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/supplychain/build.xml
diff --git a/branches/sca-java-0.90/samples/supplychain/pom.xml b/sca-java-1.x/branches/sca-java-0.90/samples/supplychain/pom.xml
index 0a72a29efb..0a72a29efb 100644
--- a/branches/sca-java-0.90/samples/supplychain/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/supplychain/pom.xml
diff --git a/branches/sca-java-0.90/samples/supplychain/src/main/java/supplychain/Customer.java b/sca-java-1.x/branches/sca-java-0.90/samples/supplychain/src/main/java/supplychain/Customer.java
index 8088001898..8088001898 100644
--- a/branches/sca-java-0.90/samples/supplychain/src/main/java/supplychain/Customer.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/supplychain/src/main/java/supplychain/Customer.java
diff --git a/branches/sca-java-0.90/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
index 7a1e8553ec..7a1e8553ec 100644
--- a/branches/sca-java-0.90/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
diff --git a/branches/sca-java-0.90/samples/supplychain/src/main/java/supplychain/Retailer.java b/sca-java-1.x/branches/sca-java-0.90/samples/supplychain/src/main/java/supplychain/Retailer.java
index 1add63fb4e..1add63fb4e 100644
--- a/branches/sca-java-0.90/samples/supplychain/src/main/java/supplychain/Retailer.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/supplychain/src/main/java/supplychain/Retailer.java
diff --git a/branches/sca-java-0.90/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
index f622052cf8..f622052cf8 100644
--- a/branches/sca-java-0.90/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
diff --git a/branches/sca-java-0.90/samples/supplychain/src/main/java/supplychain/Shipper.java b/sca-java-1.x/branches/sca-java-0.90/samples/supplychain/src/main/java/supplychain/Shipper.java
index d4d49a922b..d4d49a922b 100644
--- a/branches/sca-java-0.90/samples/supplychain/src/main/java/supplychain/Shipper.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/supplychain/src/main/java/supplychain/Shipper.java
diff --git a/branches/sca-java-0.90/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
index 4ae52a12a2..4ae52a12a2 100644
--- a/branches/sca-java-0.90/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
diff --git a/branches/sca-java-0.90/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java b/sca-java-1.x/branches/sca-java-0.90/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java
index 7072f582d1..7072f582d1 100644
--- a/branches/sca-java-0.90/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java
diff --git a/branches/sca-java-0.90/samples/supplychain/src/main/java/supplychain/Warehouse.java b/sca-java-1.x/branches/sca-java-0.90/samples/supplychain/src/main/java/supplychain/Warehouse.java
index 0be499f569..0be499f569 100644
--- a/branches/sca-java-0.90/samples/supplychain/src/main/java/supplychain/Warehouse.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/supplychain/src/main/java/supplychain/Warehouse.java
diff --git a/branches/sca-java-0.90/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
index b5e256a1e0..b5e256a1e0 100644
--- a/branches/sca-java-0.90/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
diff --git a/branches/sca-java-0.90/samples/supplychain/src/main/resources/supplychain.composite b/sca-java-1.x/branches/sca-java-0.90/samples/supplychain/src/main/resources/supplychain.composite
index 301efcaf1f..301efcaf1f 100644
--- a/branches/sca-java-0.90/samples/supplychain/src/main/resources/supplychain.composite
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/supplychain/src/main/resources/supplychain.composite
diff --git a/branches/sca-java-0.90/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java b/sca-java-1.x/branches/sca-java-0.90/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
index d7421e9889..d7421e9889 100644
--- a/branches/sca-java-0.90/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
diff --git a/branches/sca-java-0.90/samples/supplychain/supplychain.png b/sca-java-1.x/branches/sca-java-0.90/samples/supplychain/supplychain.png
index 51a384e827..51a384e827 100644
--- a/branches/sca-java-0.90/samples/supplychain/supplychain.png
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/supplychain/supplychain.png
diff --git a/branches/sca-java-0.90/samples/supplychain/supplychain.svg b/sca-java-1.x/branches/sca-java-0.90/samples/supplychain/supplychain.svg
index f72e77acab..f72e77acab 100644
--- a/branches/sca-java-0.90/samples/supplychain/supplychain.svg
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/supplychain/supplychain.svg