summaryrefslogtreecommitdiffstats
path: root/sca-java-1.x/branches/sca-java-1.1/modules/node
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-api/DISCLAIMER (renamed from branches/sca-java-1.1/modules/node-api/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-api/LICENSE (renamed from branches/sca-java-1.1/modules/node-api/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-api/NOTICE (renamed from branches/sca-java-1.1/modules/node-api/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-api/pom.xml (renamed from branches/sca-java-1.1/modules/node-api/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeException.java (renamed from branches/sca-java-1.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCADomainFinder.java (renamed from branches/sca-java-1.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCADomainFinder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode.java (renamed from branches/sca-java-1.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java (renamed from branches/sca-java-1.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/util/SCAContributionUtil.java (renamed from branches/sca-java-1.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/util/SCAContributionUtil.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-impl/DISCLAIMER (renamed from branches/sca-java-1.1/modules/node-impl/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-impl/LICENSE (renamed from branches/sca-java-1.1/modules/node-impl/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-impl/NOTICE (renamed from branches/sca-java-1.1/modules/node-impl/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-impl/pom.xml (renamed from branches/sca-java-1.1/modules/node-impl/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentInfoImpl.java (renamed from branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentInfoImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentManagerServiceImpl.java (renamed from branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentManagerServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainAPIServiceProxyImpl.java (renamed from branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainAPIServiceProxyImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainEventServiceProxyImpl.java (renamed from branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainEventServiceProxyImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainFinderImpl.java (renamed from branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainFinderImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainProxyImpl.java (renamed from branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainProxyImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeFactoryImpl.java (renamed from branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java (renamed from branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeUtil.java (renamed from branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeUtil.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/launch/SCANodeLauncher.java (renamed from branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/launch/SCANodeLauncher.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/impl/SCANodeManagerServiceImpl.java (renamed from branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/impl/SCANodeManagerServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/resources/node.composite (renamed from branches/sca-java-1.1/modules/node-impl/src/main/resources/node.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/resources/webroot/index.html (renamed from branches/sca-java-1.1/modules/node-impl/src/main/resources/webroot/index.html)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/resources/webroot/node.png (renamed from branches/sca-java-1.1/modules/node-impl/src/main/resources/webroot/node.png)bin296 -> 296 bytes
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/resources/webroot/style.css (renamed from branches/sca-java-1.1/modules/node-impl/src/main/resources/webroot/style.css)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/AddService.java (renamed from branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/AddService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/AddServiceImpl.java (renamed from branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/AddServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/AddServiceUpdateImpl.java (renamed from branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/AddServiceUpdateImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/CalculatorService.java (renamed from branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/CalculatorService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/CalculatorServiceImpl.java (renamed from branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/CalculatorServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/DivideService.java (renamed from branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/DivideService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/DivideServiceImpl.java (renamed from branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/DivideServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/MultiplyService.java (renamed from branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/MultiplyService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/MultiplyServiceImpl.java (renamed from branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/MultiplyServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/SubtractService.java (renamed from branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/SubtractService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/SubtractServiceImpl.java (renamed from branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/SubtractServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/DomainDrivenTestCase.java (renamed from branches/sca-java-1.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/DomainDrivenTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeDrivenTestCase.java (renamed from branches/sca-java-1.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeDrivenTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeMemoryTestCase.java (renamed from branches/sca-java-1.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeMemoryTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/StandaloneNodeTestCase.java (renamed from branches/sca-java-1.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/StandaloneNodeTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/resources/calculatordependent/Calculator.composite (renamed from branches/sca-java-1.1/modules/node-impl/src/test/resources/calculatordependent/Calculator.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/resources/calculatordependent/META-INF/sca-contribution.xml (renamed from branches/sca-java-1.1/modules/node-impl/src/test/resources/calculatordependent/META-INF/sca-contribution.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/resources/calculatorprimary/Calculator.composite (renamed from branches/sca-java-1.1/modules/node-impl/src/test/resources/calculatorprimary/Calculator.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/resources/calculatorprimary/META-INF/sca-contribution.xml (renamed from branches/sca-java-1.1/modules/node-impl/src/test/resources/calculatorprimary/META-INF/sca-contribution.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/resources/nodeA/Calculator.composite (renamed from branches/sca-java-1.1/modules/node-impl/src/test/resources/nodeA/Calculator.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/resources/nodeA/META-INF/sca-contribution.xml (renamed from branches/sca-java-1.1/modules/node-impl/src/test/resources/nodeA/META-INF/sca-contribution.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/resources/nodeB/META-INF/sca-deployables/Calculator.composite (renamed from branches/sca-java-1.1/modules/node-impl/src/test/resources/nodeB/META-INF/sca-deployables/Calculator.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/resources/nodeC/META-INF/sca-deployables/Calculator.composite (renamed from branches/sca-java-1.1/modules/node-impl/src/test/resources/nodeC/META-INF/sca-deployables/Calculator.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/resources/nodeD/META-INF/sca-deployables/Calculator.composite (renamed from branches/sca-java-1.1/modules/node-impl/src/test/resources/nodeD/META-INF/sca-deployables/Calculator.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node/DISCLAIMER (renamed from branches/sca-java-1.1/modules/node/DISCLAIMER)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node/LICENSE (renamed from branches/sca-java-1.1/modules/node/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node/NOTICE (renamed from branches/sca-java-1.1/modules/node/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node/pom.xml (renamed from branches/sca-java-1.1/modules/node/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentInfo.java (renamed from branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentInfo.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentListener.java (renamed from branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentListener.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManager.java (renamed from branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManager.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManagerService.java (renamed from branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManagerService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java (renamed from branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactoryImpl.java (renamed from branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/SCADomainProxySPI.java (renamed from branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/SCADomainProxySPI.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/SCANodeSPI.java (renamed from branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/SCANodeSPI.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerInitService.java (renamed from branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerInitService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerService.java (renamed from branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerService.java)0
66 files changed, 0 insertions, 0 deletions
diff --git a/branches/sca-java-1.1/modules/node-api/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.1/modules/node-api/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.1/modules/node-api/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-api/DISCLAIMER
diff --git a/branches/sca-java-1.1/modules/node-api/LICENSE b/sca-java-1.x/branches/sca-java-1.1/modules/node-api/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.1/modules/node-api/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-api/LICENSE
diff --git a/branches/sca-java-1.1/modules/node-api/NOTICE b/sca-java-1.x/branches/sca-java-1.1/modules/node-api/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.1/modules/node-api/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-api/NOTICE
diff --git a/branches/sca-java-1.1/modules/node-api/pom.xml b/sca-java-1.x/branches/sca-java-1.1/modules/node-api/pom.xml
index 3e54ca8a29..3e54ca8a29 100644
--- a/branches/sca-java-1.1/modules/node-api/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-api/pom.xml
diff --git a/branches/sca-java-1.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeException.java b/sca-java-1.x/branches/sca-java-1.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeException.java
index 463b8ec299..463b8ec299 100644
--- a/branches/sca-java-1.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeException.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeException.java
diff --git a/branches/sca-java-1.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCADomainFinder.java b/sca-java-1.x/branches/sca-java-1.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCADomainFinder.java
index 882c61dfcc..882c61dfcc 100644
--- a/branches/sca-java-1.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCADomainFinder.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCADomainFinder.java
diff --git a/branches/sca-java-1.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode.java b/sca-java-1.x/branches/sca-java-1.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode.java
index 61a381fa28..61a381fa28 100644
--- a/branches/sca-java-1.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode.java
diff --git a/branches/sca-java-1.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java b/sca-java-1.x/branches/sca-java-1.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java
index 1fbde3cc6e..1fbde3cc6e 100644
--- a/branches/sca-java-1.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java
diff --git a/branches/sca-java-1.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/util/SCAContributionUtil.java b/sca-java-1.x/branches/sca-java-1.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/util/SCAContributionUtil.java
index f3b532ed8c..f3b532ed8c 100644
--- a/branches/sca-java-1.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/util/SCAContributionUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/util/SCAContributionUtil.java
diff --git a/branches/sca-java-1.1/modules/node-impl/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.1/modules/node-impl/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/DISCLAIMER
diff --git a/branches/sca-java-1.1/modules/node-impl/LICENSE b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.1/modules/node-impl/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/LICENSE
diff --git a/branches/sca-java-1.1/modules/node-impl/NOTICE b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.1/modules/node-impl/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/NOTICE
diff --git a/branches/sca-java-1.1/modules/node-impl/pom.xml b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/pom.xml
index 5358862754..5358862754 100644
--- a/branches/sca-java-1.1/modules/node-impl/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/pom.xml
diff --git a/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentInfoImpl.java b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentInfoImpl.java
index 5e38c6bb81..5e38c6bb81 100644
--- a/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentInfoImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentInfoImpl.java
diff --git a/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentManagerServiceImpl.java b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentManagerServiceImpl.java
index 3e135c7ebf..3e135c7ebf 100644
--- a/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentManagerServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentManagerServiceImpl.java
diff --git a/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainAPIServiceProxyImpl.java b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainAPIServiceProxyImpl.java
index ddb2995d5c..ddb2995d5c 100644
--- a/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainAPIServiceProxyImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainAPIServiceProxyImpl.java
diff --git a/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainEventServiceProxyImpl.java b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainEventServiceProxyImpl.java
index ac83208c24..ac83208c24 100644
--- a/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainEventServiceProxyImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainEventServiceProxyImpl.java
diff --git a/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainFinderImpl.java b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainFinderImpl.java
index 2e4a0637ef..2e4a0637ef 100644
--- a/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainFinderImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainFinderImpl.java
diff --git a/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainProxyImpl.java b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainProxyImpl.java
index 85eb0d4540..85eb0d4540 100644
--- a/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainProxyImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainProxyImpl.java
diff --git a/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeFactoryImpl.java
index e707b1fbb8..e707b1fbb8 100644
--- a/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeFactoryImpl.java
diff --git a/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java
index f404daf8d7..f404daf8d7 100644
--- a/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java
diff --git a/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeUtil.java b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeUtil.java
index fc8de653da..fc8de653da 100644
--- a/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeUtil.java
diff --git a/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/launch/SCANodeLauncher.java b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/launch/SCANodeLauncher.java
index 0c12d75a25..0c12d75a25 100644
--- a/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/launch/SCANodeLauncher.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/launch/SCANodeLauncher.java
diff --git a/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/impl/SCANodeManagerServiceImpl.java b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/impl/SCANodeManagerServiceImpl.java
index 621dd21999..621dd21999 100644
--- a/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/impl/SCANodeManagerServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/impl/SCANodeManagerServiceImpl.java
diff --git a/branches/sca-java-1.1/modules/node-impl/src/main/resources/node.composite b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/resources/node.composite
index 137ae72467..137ae72467 100644
--- a/branches/sca-java-1.1/modules/node-impl/src/main/resources/node.composite
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/resources/node.composite
diff --git a/branches/sca-java-1.1/modules/node-impl/src/main/resources/webroot/index.html b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/resources/webroot/index.html
index e53f353b53..e53f353b53 100644
--- a/branches/sca-java-1.1/modules/node-impl/src/main/resources/webroot/index.html
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/resources/webroot/index.html
diff --git a/branches/sca-java-1.1/modules/node-impl/src/main/resources/webroot/node.png b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/resources/webroot/node.png
index fa01e64272..fa01e64272 100644
--- a/branches/sca-java-1.1/modules/node-impl/src/main/resources/webroot/node.png
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/resources/webroot/node.png
Binary files differ
diff --git a/branches/sca-java-1.1/modules/node-impl/src/main/resources/webroot/style.css b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/resources/webroot/style.css
index 28a4d4540c..28a4d4540c 100644
--- a/branches/sca-java-1.1/modules/node-impl/src/main/resources/webroot/style.css
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/main/resources/webroot/style.css
diff --git a/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/AddService.java
index 797ebb4024..797ebb4024 100644
--- a/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/AddService.java
diff --git a/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/AddServiceImpl.java
index 1a63d4ff77..1a63d4ff77 100644
--- a/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/AddServiceUpdateImpl.java b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/AddServiceUpdateImpl.java
index 93486d915e..93486d915e 100644
--- a/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/AddServiceUpdateImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/AddServiceUpdateImpl.java
diff --git a/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/CalculatorService.java
index 2718ab8772..2718ab8772 100644
--- a/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/CalculatorServiceImpl.java
index 8ee640ed6b..8ee640ed6b 100644
--- a/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/DivideService.java
index ef6a8b375b..ef6a8b375b 100644
--- a/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/SubtractService.java
index 615320e670..615320e670 100644
--- a/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/SubtractServiceImpl.java
index abf2777c7d..abf2777c7d 100644
--- a/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/DomainDrivenTestCase.java b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/DomainDrivenTestCase.java
index 743161d856..743161d856 100644
--- a/branches/sca-java-1.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/DomainDrivenTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/DomainDrivenTestCase.java
diff --git a/branches/sca-java-1.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeDrivenTestCase.java b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeDrivenTestCase.java
index cd3af4b36d..cd3af4b36d 100644
--- a/branches/sca-java-1.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeDrivenTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeDrivenTestCase.java
diff --git a/branches/sca-java-1.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeMemoryTestCase.java b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeMemoryTestCase.java
index fb223f2736..fb223f2736 100644
--- a/branches/sca-java-1.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeMemoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeMemoryTestCase.java
diff --git a/branches/sca-java-1.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/StandaloneNodeTestCase.java b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/StandaloneNodeTestCase.java
index b2906e4aed..b2906e4aed 100644
--- a/branches/sca-java-1.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/StandaloneNodeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/StandaloneNodeTestCase.java
diff --git a/branches/sca-java-1.1/modules/node-impl/src/test/resources/calculatordependent/Calculator.composite b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/resources/calculatordependent/Calculator.composite
index 538ad2e4c8..538ad2e4c8 100644
--- a/branches/sca-java-1.1/modules/node-impl/src/test/resources/calculatordependent/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/resources/calculatordependent/Calculator.composite
diff --git a/branches/sca-java-1.1/modules/node-impl/src/test/resources/calculatordependent/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/resources/calculatordependent/META-INF/sca-contribution.xml
index 8264a8243f..8264a8243f 100644
--- a/branches/sca-java-1.1/modules/node-impl/src/test/resources/calculatordependent/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/resources/calculatordependent/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.1/modules/node-impl/src/test/resources/calculatorprimary/Calculator.composite b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/resources/calculatorprimary/Calculator.composite
index c120fed3ca..c120fed3ca 100644
--- a/branches/sca-java-1.1/modules/node-impl/src/test/resources/calculatorprimary/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/resources/calculatorprimary/Calculator.composite
diff --git a/branches/sca-java-1.1/modules/node-impl/src/test/resources/calculatorprimary/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/resources/calculatorprimary/META-INF/sca-contribution.xml
index e53c14a651..e53c14a651 100644
--- a/branches/sca-java-1.1/modules/node-impl/src/test/resources/calculatorprimary/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/resources/calculatorprimary/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.1/modules/node-impl/src/test/resources/nodeA/Calculator.composite b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/resources/nodeA/Calculator.composite
index 534e1a29af..534e1a29af 100644
--- a/branches/sca-java-1.1/modules/node-impl/src/test/resources/nodeA/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/resources/nodeA/Calculator.composite
diff --git a/branches/sca-java-1.1/modules/node-impl/src/test/resources/nodeA/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/resources/nodeA/META-INF/sca-contribution.xml
index 1b1c0291e2..1b1c0291e2 100644
--- a/branches/sca-java-1.1/modules/node-impl/src/test/resources/nodeA/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.1/modules/node-impl/src/test/resources/nodeB/META-INF/sca-deployables/Calculator.composite b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/resources/nodeB/META-INF/sca-deployables/Calculator.composite
index bdb89803d1..bdb89803d1 100644
--- a/branches/sca-java-1.1/modules/node-impl/src/test/resources/nodeB/META-INF/sca-deployables/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/resources/nodeB/META-INF/sca-deployables/Calculator.composite
diff --git a/branches/sca-java-1.1/modules/node-impl/src/test/resources/nodeC/META-INF/sca-deployables/Calculator.composite b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/resources/nodeC/META-INF/sca-deployables/Calculator.composite
index c5af8dd3cc..c5af8dd3cc 100644
--- a/branches/sca-java-1.1/modules/node-impl/src/test/resources/nodeC/META-INF/sca-deployables/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/resources/nodeC/META-INF/sca-deployables/Calculator.composite
diff --git a/branches/sca-java-1.1/modules/node-impl/src/test/resources/nodeD/META-INF/sca-deployables/Calculator.composite b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/resources/nodeD/META-INF/sca-deployables/Calculator.composite
index 119c52cbf8..119c52cbf8 100644
--- a/branches/sca-java-1.1/modules/node-impl/src/test/resources/nodeD/META-INF/sca-deployables/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node-impl/src/test/resources/nodeD/META-INF/sca-deployables/Calculator.composite
diff --git a/branches/sca-java-1.1/modules/node/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.1/modules/node/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.1/modules/node/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node/DISCLAIMER
diff --git a/branches/sca-java-1.1/modules/node/LICENSE b/sca-java-1.x/branches/sca-java-1.1/modules/node/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.1/modules/node/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node/LICENSE
diff --git a/branches/sca-java-1.1/modules/node/NOTICE b/sca-java-1.x/branches/sca-java-1.1/modules/node/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.1/modules/node/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node/NOTICE
diff --git a/branches/sca-java-1.1/modules/node/pom.xml b/sca-java-1.x/branches/sca-java-1.1/modules/node/pom.xml
index 519216db7b..519216db7b 100644
--- a/branches/sca-java-1.1/modules/node/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node/pom.xml
diff --git a/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentInfo.java b/sca-java-1.x/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentInfo.java
index e7cebc9ff2..e7cebc9ff2 100644
--- a/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentInfo.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentInfo.java
diff --git a/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentListener.java b/sca-java-1.x/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentListener.java
index a19e2ce361..a19e2ce361 100644
--- a/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentListener.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentListener.java
diff --git a/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManager.java b/sca-java-1.x/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManager.java
index 279842d6d6..279842d6d6 100644
--- a/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManager.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManager.java
diff --git a/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManagerService.java b/sca-java-1.x/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManagerService.java
index 92cf8817e6..92cf8817e6 100644
--- a/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManagerService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManagerService.java
diff --git a/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java b/sca-java-1.x/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java
index 7d0f362854..7d0f362854 100644
--- a/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java
diff --git a/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactoryImpl.java
index 7caba33fde..7caba33fde 100644
--- a/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactoryImpl.java
diff --git a/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/SCADomainProxySPI.java b/sca-java-1.x/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/SCADomainProxySPI.java
index 4b9fbb49de..4b9fbb49de 100644
--- a/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/SCADomainProxySPI.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/SCADomainProxySPI.java
diff --git a/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/SCANodeSPI.java b/sca-java-1.x/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/SCANodeSPI.java
index 1e24e14608..1e24e14608 100644
--- a/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/SCANodeSPI.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/SCANodeSPI.java
diff --git a/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerInitService.java b/sca-java-1.x/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerInitService.java
index 08fcbc1831..08fcbc1831 100644
--- a/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerInitService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerInitService.java
diff --git a/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerService.java b/sca-java-1.x/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerService.java
index 8bf8cf499a..8bf8cf499a 100644
--- a/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerService.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerService.java