Moving 2.x branches

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

68 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/LICENSE b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/LICENSE
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/LICENSE
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/META-INF/MANIFEST.MF
index 9ddf78f76e..9ddf78f76e 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/NOTICE b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/NOTICE
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/NOTICE
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/pom.xml
index d8406e643f..d8406e643f 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/pom.xml
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeActivator.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeActivator.java
index 43892d44d8..43892d44d8 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeActivator.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeActivator.java
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeManager.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeManager.java
index 3f71117c1a..3f71117c1a 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeManager.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeManager.java
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeUtil.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeUtil.java
index fccd30d8ff..fccd30d8ff 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeUtil.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeUtil.java
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/OSGiNodeFactoryImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/OSGiNodeFactoryImpl.java
index 3a698eeb4b..3a698eeb4b 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/OSGiNodeFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/OSGiNodeFactoryImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/OSGiServiceTracker.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/OSGiServiceTracker.java
index 59ee133061..59ee133061 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/OSGiServiceTracker.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/OSGiServiceTracker.java
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.NodeFactory b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.NodeFactory
index 488529a04f..488529a04f 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.NodeFactory
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.NodeFactory
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorService.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorService.java
index cc562b7c2f..cc562b7c2f 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorService.java
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorActivator.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorActivator.java
index cf1b78931a..cf1b78931a 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorActivator.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorActivator.java
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
index 5f9db16ca9..5f9db16ca9 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorServiceImpl.java
index 0960938086..0960938086 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorServiceImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/AddService.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/AddService.java
index 971500782f..971500782f 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/AddService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/AddService.java
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/DivideService.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/DivideService.java
index 49b8a1c0bf..49b8a1c0bf 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/DivideService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/DivideService.java
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/MultiplyService.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/MultiplyService.java
index f4e59d12ea..f4e59d12ea 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/SubtractService.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/SubtractService.java
index bfb9b820f7..bfb9b820f7 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/SubtractService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/SubtractService.java
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/AddServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/AddServiceImpl.java
index 66b2977241..66b2977241 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/AddServiceImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/DivideServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
index a3c21b2b96..a3c21b2b96 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
index 7922d2d392..7922d2d392 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/OperationsActivator.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/OperationsActivator.java
index 5348d19f34..5348d19f34 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/OperationsActivator.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/OperationsActivator.java
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
index 4bbe83b14f..4bbe83b14f 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
index 268f16bc9f..268f16bc9f 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiTestCase.java
index 2af5552279..2af5552279 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/OSGiTestBundles.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/OSGiTestBundles.java
index 619dcaa07d..619dcaa07d 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/OSGiTestBundles.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/OSGiTestBundles.java
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF
index 4b7b7ec71b..4b7b7ec71b 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/sca-contribution.xml
index b14b3516f6..b14b3516f6 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/blueprint/calculator-module.xml b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/blueprint/calculator-module.xml
index fd834e12ef..fd834e12ef 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/blueprint/calculator-module.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/blueprint/calculator-module.xml
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/calculator-component.xml b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/calculator-component.xml
index 5daaa59aae..5daaa59aae 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/calculator-component.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/calculator-component.xml
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/remote-service/calculator-service-descriptions.xml b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/remote-service/calculator-service-descriptions.xml
index da76d00024..da76d00024 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/remote-service/calculator-service-descriptions.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/remote-service/calculator-service-descriptions.xml
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/bundle.componentType b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/bundle.componentType
index 7860094626..7860094626 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/bundle.componentType
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/bundle.componentType
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/calculator.composite b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/calculator.composite
index 3c77086c45..3c77086c45 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/calculator.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/calculator.composite
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF
index 2345c785a7..2345c785a7 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/sca-contribution.xml
index 16a33f4f65..16a33f4f65 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/add-component.xml b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/add-component.xml
index 99845257ff..99845257ff 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/add-component.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/add-component.xml
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/blueprint/operations-module.xml b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/blueprint/operations-module.xml
index f6b5f4690e..f6b5f4690e 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/blueprint/operations-module.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/blueprint/operations-module.xml
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/divide-component.xml b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/divide-component.xml
index 322d4daf2f..322d4daf2f 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/divide-component.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/divide-component.xml
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/multiply-component.xml b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/multiply-component.xml
index b9ca777bd8..b9ca777bd8 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/multiply-component.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/multiply-component.xml
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/subtract-component.xml b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/subtract-component.xml
index 1472f5a976..1472f5a976 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/subtract-component.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/subtract-component.xml
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/bundle.componentType b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/bundle.componentType
index 6f6f4bdce6..6f6f4bdce6 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/bundle.componentType
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/bundle.componentType
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/operations.composite b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/operations.composite
index c9fb3818b8..c9fb3818b8 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/operations.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/operations.composite
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/META-INF/MANIFEST.MF
index 0153fc6997..0153fc6997 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/META-INF/sca-contribution.xml
index 8ba4b85247..8ba4b85247 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/OSGI-INF/sca/calculator.composite b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/OSGI-INF/sca/calculator.composite
index ac7f0f470c..ac7f0f470c 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/OSGI-INF/sca/calculator.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/OSGI-INF/sca/calculator.composite
diff --git a/branches/sca-java-2.0-M3/modules/node-impl/LICENSE b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl/LICENSE
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/LICENSE
diff --git a/branches/sca-java-2.0-M3/modules/node-impl/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/META-INF/MANIFEST.MF
index fcf9d25ad0..fcf9d25ad0 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-2.0-M3/modules/node-impl/NOTICE b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl/NOTICE
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/NOTICE
diff --git a/branches/sca-java-2.0-M3/modules/node-impl/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/pom.xml
index c6b4a86a4e..c6b4a86a4e 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/pom.xml
diff --git a/branches/sca-java-2.0-M3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationATOMProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationATOMProcessor.java
index d3d0c5d077..d3d0c5d077 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationATOMProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationATOMProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationProcessor.java
index fb16cf461d..fb16cf461d 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/XMLStreamSerializer.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/XMLStreamSerializer.java
index 38d8215cb2..38d8215cb2 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/XMLStreamSerializer.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/XMLStreamSerializer.java
diff --git a/branches/sca-java-2.0-M3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/Contributions.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/Contributions.java
index 7dabb471be..7dabb471be 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/Contributions.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/Contributions.java
diff --git a/branches/sca-java-2.0-M3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
index f637842afe..f637842afe 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
index 6737a16d3a..6737a16d3a 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeUtil.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeUtil.java
index 8bf3ea8b04..8bf3ea8b04 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeUtil.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeUtil.java
diff --git a/branches/sca-java-2.0-M3/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 00cf337707..00cf337707 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-2.0-M3/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.NodeFactory b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.NodeFactory
index 793aa8d475..793aa8d475 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.NodeFactory
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.NodeFactory
diff --git a/branches/sca-java-2.0-M3/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.configuration.NodeConfigurationFactory b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.configuration.NodeConfigurationFactory
index a81f2d8a0e..a81f2d8a0e 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.configuration.NodeConfigurationFactory
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.configuration.NodeConfigurationFactory
diff --git a/branches/sca-java-2.0-M3/modules/node-impl/src/main/resources/node-impl-validation-messages.properties b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/src/main/resources/node-impl-validation-messages.properties
index 0c07a3a30f..0c07a3a30f 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl/src/main/resources/node-impl-validation-messages.properties
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/src/main/resources/node-impl-validation-messages.properties
diff --git a/branches/sca-java-2.0-M3/modules/node-impl/src/test/java/hello/HelloWorld.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/src/test/java/hello/HelloWorld.java
index e3fcdfd25f..e3fcdfd25f 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl/src/test/java/hello/HelloWorld.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/src/test/java/hello/HelloWorld.java
diff --git a/branches/sca-java-2.0-M3/modules/node-impl/src/test/java/hello/HelloWorldImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/src/test/java/hello/HelloWorldImpl.java
index c9a7560b12..c9a7560b12 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl/src/test/java/hello/HelloWorldImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/src/test/java/hello/HelloWorldImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationProcessorTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationProcessorTestCase.java
index f76aabe034..f76aabe034 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationProcessorTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java
index aa7933630a..aa7933630a 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeUtilTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeUtilTestCase.java
index 55e44c04ba..55e44c04ba 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeUtilTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeUtilTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/node-impl/src/test/resources/HelloWorld.composite b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/src/test/resources/HelloWorld.composite
index 4c6f1b082f..4c6f1b082f 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl/src/test/resources/HelloWorld.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/src/test/resources/HelloWorld.composite
diff --git a/branches/sca-java-2.0-M3/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml
index 1149eb5cbf..1149eb5cbf 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-2.0-M3/modules/node-impl/src/test/resources/org/apache/tuscany/sca/node/configuration/node1.xml b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/src/test/resources/org/apache/tuscany/sca/node/configuration/node1.xml
index 40961a22b7..40961a22b7 100644
--- a/branches/sca-java-2.0-M3/modules/node-impl/src/test/resources/org/apache/tuscany/sca/node/configuration/node1.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/node-impl/src/test/resources/org/apache/tuscany/sca/node/configuration/node1.xml