diff options
author | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2009-11-11 23:09:18 +0000 |
---|---|---|
committer | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2009-11-11 23:09:18 +0000 |
commit | 4e13586bc791d71c41760cf4d0a5cc908973de3e (patch) | |
tree | 82e905f91d993f3a642168854371789150dfb2e8 /sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl | |
parent | cde3d2629677a07aa09e3c7fbe117b680c0f5df7 (diff) |
Moving 2.x branches
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835134 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/LICENSE (renamed from branches/sca-java-2.0-M2/modules/node-impl-osgi/LICENSE) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/META-INF/MANIFEST.MF (renamed from branches/sca-java-2.0-M2/modules/node-impl-osgi/META-INF/MANIFEST.MF) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/NOTICE (renamed from branches/sca-java-2.0-M2/modules/node-impl-osgi/NOTICE) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/pom.xml (renamed from branches/sca-java-2.0-M2/modules/node-impl-osgi/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeActivator.java (renamed from branches/sca-java-2.0-M2/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeActivator.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeFactoryImpl.java (renamed from branches/sca-java-2.0-M2/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeFactoryImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeManager.java (renamed from branches/sca-java-2.0-M2/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeManager.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeUtil.java (renamed from branches/sca-java-2.0-M2/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeUtil.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/OSGiServiceTracker.java (renamed from branches/sca-java-2.0-M2/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/OSGiServiceTracker.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.NodeFactory (renamed from branches/sca-java-2.0-M2/modules/node-impl-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.NodeFactory) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorService.java (renamed from branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorService.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorActivator.java (renamed from branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorActivator.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java (renamed from branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorServiceImpl.java (renamed from branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/AddService.java (renamed from branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/AddService.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/DivideService.java (renamed from branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/DivideService.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/MultiplyService.java (renamed from branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/MultiplyService.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/SubtractService.java (renamed from branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/SubtractService.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/AddServiceImpl.java (renamed from branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/AddServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/DivideServiceImpl.java (renamed from branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/DivideServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java (renamed from branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/OperationsActivator.java (renamed from branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/OperationsActivator.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java (renamed from branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java (renamed from branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiTestCase.java (renamed from branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/OSGiTestBundles.java (renamed from branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/OSGiTestBundles.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF (renamed from branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/sca-contribution.xml (renamed from branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/blueprint/calculator-module.xml (renamed from branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/blueprint/calculator-module.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/calculator-component.xml (renamed from branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/calculator-component.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/remote-service/calculator-service-descriptions.xml (renamed from branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/remote-service/calculator-service-descriptions.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/bundle.componentType (renamed from branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/bundle.componentType) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/calculator.composite (renamed from branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/calculator.composite) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF (renamed from branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/sca-contribution.xml (renamed from branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/add-component.xml (renamed from branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/add-component.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/blueprint/operations-module.xml (renamed from branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/blueprint/operations-module.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/divide-component.xml (renamed from branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/divide-component.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/multiply-component.xml (renamed from branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/multiply-component.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/subtract-component.xml (renamed from branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/subtract-component.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/bundle.componentType (renamed from branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/bundle.componentType) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/operations.composite (renamed from branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/operations.composite) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl/LICENSE (renamed from branches/sca-java-2.0-M2/modules/node-impl/LICENSE) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl/META-INF/MANIFEST.MF (renamed from branches/sca-java-2.0-M2/modules/node-impl/META-INF/MANIFEST.MF) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl/NOTICE (renamed from branches/sca-java-2.0-M2/modules/node-impl/NOTICE) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl/pom.xml (renamed from branches/sca-java-2.0-M2/modules/node-impl/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java (renamed from branches/sca-java-2.0-M2/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java (renamed from branches/sca-java-2.0-M2/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeUtil.java (renamed from branches/sca-java-2.0-M2/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeUtil.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.NodeFactory (renamed from branches/sca-java-2.0-M2/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.NodeFactory) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl/src/test/java/hello/HelloWorld.java (renamed from branches/sca-java-2.0-M2/modules/node-impl/src/test/java/hello/HelloWorld.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl/src/test/java/hello/HelloWorldImpl.java (renamed from branches/sca-java-2.0-M2/modules/node-impl/src/test/java/hello/HelloWorldImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java (renamed from branches/sca-java-2.0-M2/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl/src/test/resources/HelloWorld.composite (renamed from branches/sca-java-2.0-M2/modules/node-impl/src/test/resources/HelloWorld.composite) | 0 | ||||
-rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml (renamed from branches/sca-java-2.0-M2/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml) | 0 |
55 files changed, 0 insertions, 0 deletions
diff --git a/branches/sca-java-2.0-M2/modules/node-impl-osgi/LICENSE b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/LICENSE index 8aa906c321..8aa906c321 100644 --- a/branches/sca-java-2.0-M2/modules/node-impl-osgi/LICENSE +++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/LICENSE diff --git a/branches/sca-java-2.0-M2/modules/node-impl-osgi/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/META-INF/MANIFEST.MF index 3bfe39c0e2..3bfe39c0e2 100644 --- a/branches/sca-java-2.0-M2/modules/node-impl-osgi/META-INF/MANIFEST.MF +++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/META-INF/MANIFEST.MF diff --git a/branches/sca-java-2.0-M2/modules/node-impl-osgi/NOTICE b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/NOTICE index 25bb89c9b2..25bb89c9b2 100644 --- a/branches/sca-java-2.0-M2/modules/node-impl-osgi/NOTICE +++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/NOTICE diff --git a/branches/sca-java-2.0-M2/modules/node-impl-osgi/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/pom.xml index c02ee883a9..c02ee883a9 100644 --- a/branches/sca-java-2.0-M2/modules/node-impl-osgi/pom.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/pom.xml diff --git a/branches/sca-java-2.0-M2/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-M2/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-M2/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-M2/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeActivator.java diff --git a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeFactoryImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeFactoryImpl.java index f0ee07acf1..f0ee07acf1 100644 --- a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeFactoryImpl.java +++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeFactoryImpl.java diff --git a/branches/sca-java-2.0-M2/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-M2/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeManager.java index 47368a9f18..47368a9f18 100644 --- a/branches/sca-java-2.0-M2/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-M2/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeManager.java diff --git a/branches/sca-java-2.0-M2/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-M2/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeUtil.java index 63324bf4c4..63324bf4c4 100644 --- a/branches/sca-java-2.0-M2/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-M2/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeUtil.java diff --git a/branches/sca-java-2.0-M2/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-M2/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-M2/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-M2/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/OSGiServiceTracker.java diff --git a/branches/sca-java-2.0-M2/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-M2/modules/node-impl-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.NodeFactory index 2d7902084d..2d7902084d 100644 --- a/branches/sca-java-2.0-M2/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-M2/modules/node-impl-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.NodeFactory diff --git a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorService.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorService.java index cc562b7c2f..cc562b7c2f 100644 --- a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorService.java +++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorService.java diff --git a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorActivator.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorActivator.java index cf1b78931a..cf1b78931a 100644 --- a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorActivator.java +++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorActivator.java diff --git a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java index 5f9db16ca9..5f9db16ca9 100644 --- a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java +++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java diff --git a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorServiceImpl.java index 0960938086..0960938086 100644 --- a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorServiceImpl.java +++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorServiceImpl.java diff --git a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/AddService.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/AddService.java index 971500782f..971500782f 100644 --- a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/AddService.java +++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/AddService.java diff --git a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/DivideService.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/DivideService.java index 49b8a1c0bf..49b8a1c0bf 100644 --- a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/DivideService.java +++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/DivideService.java diff --git a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/MultiplyService.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/MultiplyService.java index f4e59d12ea..f4e59d12ea 100644 --- a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/MultiplyService.java +++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/MultiplyService.java diff --git a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/SubtractService.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/SubtractService.java index bfb9b820f7..bfb9b820f7 100644 --- a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/SubtractService.java +++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/SubtractService.java diff --git a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/AddServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/AddServiceImpl.java index 66b2977241..66b2977241 100644 --- a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/AddServiceImpl.java +++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/AddServiceImpl.java diff --git a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/DivideServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/DivideServiceImpl.java index a3c21b2b96..a3c21b2b96 100644 --- a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/DivideServiceImpl.java +++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/DivideServiceImpl.java diff --git a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java index 7922d2d392..7922d2d392 100644 --- a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java +++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java diff --git a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/OperationsActivator.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/OperationsActivator.java index 5348d19f34..5348d19f34 100644 --- a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/OperationsActivator.java +++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/OperationsActivator.java diff --git a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java index 4bbe83b14f..4bbe83b14f 100644 --- a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java +++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java diff --git a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java index 945f0fca37..945f0fca37 100644 --- a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java +++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java diff --git a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiTestCase.java index 2af5552279..2af5552279 100644 --- a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiTestCase.java +++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiTestCase.java diff --git a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/OSGiTestBundles.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/OSGiTestBundles.java index 0e299938a1..0e299938a1 100644 --- a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/OSGiTestBundles.java +++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/OSGiTestBundles.java diff --git a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF index 0aa9cf047e..0aa9cf047e 100644 --- a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF +++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF diff --git a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/sca-contribution.xml index b14b3516f6..b14b3516f6 100644 --- a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/sca-contribution.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/sca-contribution.xml diff --git a/branches/sca-java-2.0-M2/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-M2/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-M2/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-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/blueprint/calculator-module.xml diff --git a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/calculator-component.xml b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/calculator-component.xml index 5daaa59aae..5daaa59aae 100644 --- a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/calculator-component.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/calculator-component.xml diff --git a/branches/sca-java-2.0-M2/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-M2/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-M2/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-M2/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-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/bundle.componentType b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/bundle.componentType index 7860094626..7860094626 100644 --- a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/bundle.componentType +++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/bundle.componentType diff --git a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/calculator.composite b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/calculator.composite index 3c77086c45..3c77086c45 100644 --- a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/calculator.composite +++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/calculator.composite diff --git a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF index ef8c19f9c8..ef8c19f9c8 100644 --- a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF +++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF diff --git a/branches/sca-java-2.0-M2/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-M2/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-M2/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-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/sca-contribution.xml diff --git a/branches/sca-java-2.0-M2/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-M2/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-M2/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-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/add-component.xml diff --git a/branches/sca-java-2.0-M2/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-M2/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-M2/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-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/blueprint/operations-module.xml diff --git a/branches/sca-java-2.0-M2/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-M2/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-M2/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-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/divide-component.xml diff --git a/branches/sca-java-2.0-M2/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-M2/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-M2/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-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/multiply-component.xml diff --git a/branches/sca-java-2.0-M2/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-M2/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-M2/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-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/subtract-component.xml diff --git a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/bundle.componentType b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/bundle.componentType index 6f6f4bdce6..6f6f4bdce6 100644 --- a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/bundle.componentType +++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/bundle.componentType diff --git a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/operations.composite b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/operations.composite index c9fb3818b8..c9fb3818b8 100644 --- a/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/operations.composite +++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/operations.composite diff --git a/branches/sca-java-2.0-M2/modules/node-impl/LICENSE b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl/LICENSE index 8aa906c321..8aa906c321 100644 --- a/branches/sca-java-2.0-M2/modules/node-impl/LICENSE +++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl/LICENSE diff --git a/branches/sca-java-2.0-M2/modules/node-impl/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl/META-INF/MANIFEST.MF index 3970002180..3970002180 100644 --- a/branches/sca-java-2.0-M2/modules/node-impl/META-INF/MANIFEST.MF +++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl/META-INF/MANIFEST.MF diff --git a/branches/sca-java-2.0-M2/modules/node-impl/NOTICE b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl/NOTICE index 25bb89c9b2..25bb89c9b2 100644 --- a/branches/sca-java-2.0-M2/modules/node-impl/NOTICE +++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl/NOTICE diff --git a/branches/sca-java-2.0-M2/modules/node-impl/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl/pom.xml index 6de9dbe89d..6de9dbe89d 100644 --- a/branches/sca-java-2.0-M2/modules/node-impl/pom.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl/pom.xml diff --git a/branches/sca-java-2.0-M2/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java index 5ee68899a9..5ee68899a9 100644 --- a/branches/sca-java-2.0-M2/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java +++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java diff --git a/branches/sca-java-2.0-M2/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java index edd1dd9d3f..edd1dd9d3f 100644 --- a/branches/sca-java-2.0-M2/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java +++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java diff --git a/branches/sca-java-2.0-M2/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeUtil.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeUtil.java index 396d77af66..396d77af66 100644 --- a/branches/sca-java-2.0-M2/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeUtil.java +++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeUtil.java diff --git a/branches/sca-java-2.0-M2/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-M2/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.NodeFactory index 800bdd84cc..800bdd84cc 100644 --- a/branches/sca-java-2.0-M2/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-M2/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.NodeFactory diff --git a/branches/sca-java-2.0-M2/modules/node-impl/src/test/java/hello/HelloWorld.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl/src/test/java/hello/HelloWorld.java index e3fcdfd25f..e3fcdfd25f 100644 --- a/branches/sca-java-2.0-M2/modules/node-impl/src/test/java/hello/HelloWorld.java +++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl/src/test/java/hello/HelloWorld.java diff --git a/branches/sca-java-2.0-M2/modules/node-impl/src/test/java/hello/HelloWorldImpl.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl/src/test/java/hello/HelloWorldImpl.java index c9a7560b12..c9a7560b12 100644 --- a/branches/sca-java-2.0-M2/modules/node-impl/src/test/java/hello/HelloWorldImpl.java +++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl/src/test/java/hello/HelloWorldImpl.java diff --git a/branches/sca-java-2.0-M2/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java index dc0f37b987..dc0f37b987 100644 --- a/branches/sca-java-2.0-M2/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java +++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java diff --git a/branches/sca-java-2.0-M2/modules/node-impl/src/test/resources/HelloWorld.composite b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl/src/test/resources/HelloWorld.composite index 27ddcb94a8..27ddcb94a8 100644 --- a/branches/sca-java-2.0-M2/modules/node-impl/src/test/resources/HelloWorld.composite +++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl/src/test/resources/HelloWorld.composite diff --git a/branches/sca-java-2.0-M2/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml index 1149eb5cbf..1149eb5cbf 100644 --- a/branches/sca-java-2.0-M2/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M2/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml |