diff options
Diffstat (limited to '')
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/node-api/DISCLAIMER) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/LICENSE (renamed from branches/sca-java-1.2.1/modules/node-api/LICENSE) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/NOTICE (renamed from branches/sca-java-1.2.1/modules/node-api/NOTICE) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/pom.xml (renamed from branches/sca-java-1.2.1/modules/node-api/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeException.java (renamed from branches/sca-java-1.2.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.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCADomainAccess.java (renamed from branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCADomainAccess.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCADomainFinder.java (renamed from branches/sca-java-1.2.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.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode.java (renamed from branches/sca-java-1.2.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.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java (renamed from branches/sca-java-1.2.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.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/util/SCAContributionUtil.java (renamed from branches/sca-java-1.2.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.2.1/modules/node-impl/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/node-impl/DISCLAIMER) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/LICENSE (renamed from branches/sca-java-1.2.1/modules/node-impl/LICENSE) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/NOTICE (renamed from branches/sca-java-1.2.1/modules/node-impl/NOTICE) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/pom.xml (renamed from branches/sca-java-1.2.1/modules/node-impl/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentInfoImpl.java (renamed from branches/sca-java-1.2.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.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentManagerServiceImpl.java (renamed from branches/sca-java-1.2.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.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainAPIServiceProxyImpl.java (renamed from branches/sca-java-1.2.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.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainEventServiceProxyImpl.java (renamed from branches/sca-java-1.2.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.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainFinderImpl.java (renamed from branches/sca-java-1.2.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.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainProxyImpl.java (renamed from branches/sca-java-1.2.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.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeFactoryImpl.java (renamed from branches/sca-java-1.2.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.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java (renamed from branches/sca-java-1.2.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.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeUtil.java (renamed from branches/sca-java-1.2.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.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/launch/SCANodeLauncher.java (renamed from branches/sca-java-1.2.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.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/impl/SCANodeManagerServiceImpl.java (renamed from branches/sca-java-1.2.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.2.1/modules/node-impl/src/main/resources/node.composite (renamed from branches/sca-java-1.2.1/modules/node-impl/src/main/resources/node.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/index.html (renamed from branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/index.html) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/node.png (renamed from branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/node.png) | bin | 296 -> 296 bytes | |||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/style.css (renamed from branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/style.css) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddService.java (renamed from branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddServiceUpdateImpl.java (renamed from branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddServiceUpdateImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/CalculatorService.java (renamed from branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/CalculatorService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/CalculatorServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/CalculatorServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/DivideService.java (renamed from branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/DivideService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/DivideServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/DivideServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/MultiplyService.java (renamed from branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/MultiplyService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/MultiplyServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/MultiplyServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/SubtractService.java (renamed from branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/SubtractService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/SubtractServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/SubtractServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/DomainDrivenTestCase.java (renamed from branches/sca-java-1.2.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.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeDrivenTestCase.java (renamed from branches/sca-java-1.2.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.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeMemoryTestCase.java (renamed from branches/sca-java-1.2.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.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/StandaloneNodeTestCase.java (renamed from branches/sca-java-1.2.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.2.1/modules/node-impl/src/test/resources/calculatordependent/Calculator.composite (renamed from branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatordependent/Calculator.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatordependent/META-INF/sca-contribution.xml (renamed from branches/sca-java-1.2.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.2.1/modules/node-impl/src/test/resources/calculatorprimary/Calculator.composite (renamed from branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatorprimary/Calculator.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatorprimary/META-INF/sca-contribution.xml (renamed from branches/sca-java-1.2.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.2.1/modules/node-impl/src/test/resources/nodeA/Calculator.composite (renamed from branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeA/Calculator.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeA/META-INF/sca-contribution.xml (renamed from branches/sca-java-1.2.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.2.1/modules/node-impl/src/test/resources/nodeB/META-INF/sca-deployables/Calculator.composite (renamed from branches/sca-java-1.2.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.2.1/modules/node-impl/src/test/resources/nodeC/META-INF/sca-deployables/Calculator.composite (renamed from branches/sca-java-1.2.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.2.1/modules/node-impl/src/test/resources/nodeD/META-INF/sca-deployables/Calculator.composite (renamed from branches/sca-java-1.2.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.2.1/modules/node/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/node/DISCLAIMER) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node/LICENSE (renamed from branches/sca-java-1.2.1/modules/node/LICENSE) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node/NOTICE (renamed from branches/sca-java-1.2.1/modules/node/NOTICE) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node/pom.xml (renamed from branches/sca-java-1.2.1/modules/node/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentInfo.java (renamed from branches/sca-java-1.2.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.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentListener.java (renamed from branches/sca-java-1.2.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.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManager.java (renamed from branches/sca-java-1.2.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.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManagerService.java (renamed from branches/sca-java-1.2.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.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java (renamed from branches/sca-java-1.2.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.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactoryImpl.java (renamed from branches/sca-java-1.2.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.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/SCADomainProxySPI.java (renamed from branches/sca-java-1.2.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.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/SCANodeSPI.java (renamed from branches/sca-java-1.2.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.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerInitService.java (renamed from branches/sca-java-1.2.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.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerService.java (renamed from branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/node2-api/DISCLAIMER) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/LICENSE (renamed from branches/sca-java-1.2.1/modules/node2-api/LICENSE) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/NOTICE (renamed from branches/sca-java-1.2.1/modules/node2-api/NOTICE) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/pom.xml (renamed from branches/sca-java-1.2.1/modules/node2-api/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCAClient.java (renamed from branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCAClient.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2.java (renamed from branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.java (renamed from branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/node2-impl/DISCLAIMER) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/LICENSE (renamed from branches/sca-java-1.2.1/modules/node2-impl/LICENSE) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/NOTICE (renamed from branches/sca-java-1.2.1/modules/node2-impl/NOTICE) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/pom.xml (renamed from branches/sca-java-1.2.1/modules/node2-impl/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java (renamed from branches/sca-java-1.2.1/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java (renamed from branches/sca-java-1.2.1/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/node2-launcher-webapp/DISCLAIMER) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/LICENSE (renamed from branches/sca-java-1.2.1/modules/node2-launcher-webapp/LICENSE) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/NOTICE (renamed from branches/sca-java-1.2.1/modules/node2-launcher-webapp/NOTICE) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/pom.xml (renamed from branches/sca-java-1.2.1/modules/node2-launcher-webapp/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml (renamed from branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/WEB-INF/web.xml (renamed from branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/WEB-INF/web.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/index.jsp (renamed from branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/index.jsp) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/node2-launcher/DISCLAIMER) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/LICENSE (renamed from branches/sca-java-1.2.1/modules/node2-launcher/LICENSE) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/NOTICE (renamed from branches/sca-java-1.2.1/modules/node2-launcher/NOTICE) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/pom.xml (renamed from branches/sca-java-1.2.1/modules/node2-launcher/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java (renamed from branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java (renamed from branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java (renamed from branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java (renamed from branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java (renamed from branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java (renamed from branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java (renamed from branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java) | 0 |
98 files changed, 0 insertions, 0 deletions
diff --git a/branches/sca-java-1.2.1/modules/node-api/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/DISCLAIMER index d68a410903..d68a410903 100644 --- a/branches/sca-java-1.2.1/modules/node-api/DISCLAIMER +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/DISCLAIMER diff --git a/branches/sca-java-1.2.1/modules/node-api/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/LICENSE index 8aa906c321..8aa906c321 100644 --- a/branches/sca-java-1.2.1/modules/node-api/LICENSE +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/LICENSE diff --git a/branches/sca-java-1.2.1/modules/node-api/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/NOTICE index fdfa0e9faa..fdfa0e9faa 100644 --- a/branches/sca-java-1.2.1/modules/node-api/NOTICE +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/NOTICE diff --git a/branches/sca-java-1.2.1/modules/node-api/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/pom.xml index 9892dc7ace..9892dc7ace 100644 --- a/branches/sca-java-1.2.1/modules/node-api/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/pom.xml diff --git a/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeException.java index 5ef2aee114..5ef2aee114 100644 --- a/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeException.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeException.java diff --git a/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCADomainAccess.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCADomainAccess.java index bae5a086b0..bae5a086b0 100644 --- a/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCADomainAccess.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCADomainAccess.java diff --git a/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCADomainFinder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCADomainFinder.java index d915a34cd8..d915a34cd8 100644 --- a/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCADomainFinder.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCADomainFinder.java diff --git a/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode.java index 676b0f7f8b..676b0f7f8b 100644 --- a/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode.java diff --git a/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java index 1cba8a08f4..1cba8a08f4 100644 --- a/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java diff --git a/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/util/SCAContributionUtil.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/util/SCAContributionUtil.java index f3b532ed8c..f3b532ed8c 100644 --- a/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/util/SCAContributionUtil.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/util/SCAContributionUtil.java diff --git a/branches/sca-java-1.2.1/modules/node-impl/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/DISCLAIMER index d68a410903..d68a410903 100644 --- a/branches/sca-java-1.2.1/modules/node-impl/DISCLAIMER +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/DISCLAIMER diff --git a/branches/sca-java-1.2.1/modules/node-impl/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/LICENSE index 8aa906c321..8aa906c321 100644 --- a/branches/sca-java-1.2.1/modules/node-impl/LICENSE +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/LICENSE diff --git a/branches/sca-java-1.2.1/modules/node-impl/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/NOTICE index fdfa0e9faa..fdfa0e9faa 100644 --- a/branches/sca-java-1.2.1/modules/node-impl/NOTICE +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/NOTICE diff --git a/branches/sca-java-1.2.1/modules/node-impl/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/pom.xml index 71a4d47d23..71a4d47d23 100644 --- a/branches/sca-java-1.2.1/modules/node-impl/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/pom.xml diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentInfoImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentInfoImpl.java index 396b789794..396b789794 100644 --- a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentInfoImpl.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentInfoImpl.java diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentManagerServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentManagerServiceImpl.java index b00825be45..b00825be45 100644 --- a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentManagerServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentManagerServiceImpl.java diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainAPIServiceProxyImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainAPIServiceProxyImpl.java index 1c208e2464..1c208e2464 100644 --- a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainAPIServiceProxyImpl.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainAPIServiceProxyImpl.java diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainEventServiceProxyImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainEventServiceProxyImpl.java index 42d4be1df4..42d4be1df4 100644 --- a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainEventServiceProxyImpl.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainEventServiceProxyImpl.java diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainFinderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainFinderImpl.java index f1480d5ded..f1480d5ded 100644 --- a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainFinderImpl.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainFinderImpl.java diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainProxyImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainProxyImpl.java index dcfd186515..dcfd186515 100644 --- a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainProxyImpl.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainProxyImpl.java diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeFactoryImpl.java index 5c6d372f11..5c6d372f11 100644 --- a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeFactoryImpl.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeFactoryImpl.java diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java index cd5bc37b84..cd5bc37b84 100644 --- a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeUtil.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeUtil.java index 0c46050a4c..0c46050a4c 100644 --- a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeUtil.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeUtil.java diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/launch/SCANodeLauncher.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/launch/SCANodeLauncher.java index 0c12d75a25..0c12d75a25 100644 --- a/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/launch/SCANodeLauncher.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/launch/SCANodeLauncher.java diff --git a/branches/sca-java-1.2.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.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/impl/SCANodeManagerServiceImpl.java index c19c51f28a..c19c51f28a 100644 --- a/branches/sca-java-1.2.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.2.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/impl/SCANodeManagerServiceImpl.java diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/node.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/node.composite index 137ae72467..137ae72467 100644 --- a/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/node.composite +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/node.composite diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/index.html b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/index.html index e53f353b53..e53f353b53 100644 --- a/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/index.html +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/index.html diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/node.png b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/node.png Binary files differindex fa01e64272..fa01e64272 100644 --- a/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/node.png +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/node.png diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/style.css b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/style.css index f5bbf23379..f5bbf23379 100644 --- a/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/style.css +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/main/resources/webroot/style.css diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddService.java index d7dc4473ad..d7dc4473ad 100644 --- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddService.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddService.java diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddServiceImpl.java index e9b7e254e5..e9b7e254e5 100644 --- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddServiceImpl.java diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddServiceUpdateImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddServiceUpdateImpl.java index 5b63ad5a17..5b63ad5a17 100644 --- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddServiceUpdateImpl.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/AddServiceUpdateImpl.java diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/CalculatorService.java index 5fbd3a3f6b..5fbd3a3f6b 100644 --- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/CalculatorService.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/CalculatorService.java diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/CalculatorServiceImpl.java index da869e00fd..da869e00fd 100644 --- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/CalculatorServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/CalculatorServiceImpl.java diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/DivideService.java index 30d248208b..30d248208b 100644 --- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/DivideService.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/DivideService.java diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/DivideServiceImpl.java index f7ac0b7287..f7ac0b7287 100644 --- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/DivideServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/DivideServiceImpl.java diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/MultiplyService.java index 5290605938..5290605938 100644 --- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/MultiplyService.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/MultiplyService.java diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/MultiplyServiceImpl.java index b7dca792b2..b7dca792b2 100644 --- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/MultiplyServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/MultiplyServiceImpl.java diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/SubtractService.java index 78ab9c6ee0..78ab9c6ee0 100644 --- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/SubtractService.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/SubtractService.java diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/SubtractServiceImpl.java index 1010207154..1010207154 100644 --- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/SubtractServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/calculator/SubtractServiceImpl.java diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/DomainDrivenTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/DomainDrivenTestCase.java index 0305b4303b..0305b4303b 100644 --- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/DomainDrivenTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/DomainDrivenTestCase.java diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeDrivenTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeDrivenTestCase.java index 783f61b2c2..783f61b2c2 100644 --- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeDrivenTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeDrivenTestCase.java diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeMemoryTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeMemoryTestCase.java index ff8987da01..ff8987da01 100644 --- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeMemoryTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeMemoryTestCase.java diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/StandaloneNodeTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/StandaloneNodeTestCase.java index eef0374866..eef0374866 100644 --- a/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/StandaloneNodeTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/StandaloneNodeTestCase.java diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatordependent/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatordependent/Calculator.composite index 538ad2e4c8..538ad2e4c8 100644 --- a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatordependent/Calculator.composite +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatordependent/Calculator.composite diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatordependent/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatordependent/META-INF/sca-contribution.xml index 673de80c44..673de80c44 100644 --- a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatordependent/META-INF/sca-contribution.xml +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatordependent/META-INF/sca-contribution.xml diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatorprimary/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatorprimary/Calculator.composite index c120fed3ca..c120fed3ca 100644 --- a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatorprimary/Calculator.composite +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatorprimary/Calculator.composite diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatorprimary/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatorprimary/META-INF/sca-contribution.xml index 392310da11..392310da11 100644 --- a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatorprimary/META-INF/sca-contribution.xml +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/calculatorprimary/META-INF/sca-contribution.xml diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeA/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeA/Calculator.composite index 534e1a29af..534e1a29af 100644 --- a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeA/Calculator.composite +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeA/Calculator.composite diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeA/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeA/META-INF/sca-contribution.xml index db255e0232..db255e0232 100644 --- a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeA/META-INF/sca-contribution.xml +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeA/META-INF/sca-contribution.xml diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeB/META-INF/sca-deployables/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeB/META-INF/sca-deployables/Calculator.composite index bdb89803d1..bdb89803d1 100644 --- a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeB/META-INF/sca-deployables/Calculator.composite +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeB/META-INF/sca-deployables/Calculator.composite diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeC/META-INF/sca-deployables/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeC/META-INF/sca-deployables/Calculator.composite index c5af8dd3cc..c5af8dd3cc 100644 --- a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeC/META-INF/sca-deployables/Calculator.composite +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeC/META-INF/sca-deployables/Calculator.composite diff --git a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeD/META-INF/sca-deployables/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeD/META-INF/sca-deployables/Calculator.composite index 119c52cbf8..119c52cbf8 100644 --- a/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeD/META-INF/sca-deployables/Calculator.composite +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node-impl/src/test/resources/nodeD/META-INF/sca-deployables/Calculator.composite diff --git a/branches/sca-java-1.2.1/modules/node/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/DISCLAIMER index d68a410903..d68a410903 100644 --- a/branches/sca-java-1.2.1/modules/node/DISCLAIMER +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/DISCLAIMER diff --git a/branches/sca-java-1.2.1/modules/node/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/LICENSE index 8aa906c321..8aa906c321 100644 --- a/branches/sca-java-1.2.1/modules/node/LICENSE +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/LICENSE diff --git a/branches/sca-java-1.2.1/modules/node/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/NOTICE index fdfa0e9faa..fdfa0e9faa 100644 --- a/branches/sca-java-1.2.1/modules/node/NOTICE +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/NOTICE diff --git a/branches/sca-java-1.2.1/modules/node/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/pom.xml index 9be59d662d..9be59d662d 100644 --- a/branches/sca-java-1.2.1/modules/node/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/pom.xml diff --git a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentInfo.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentInfo.java index b3a856c276..b3a856c276 100644 --- a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentInfo.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentInfo.java diff --git a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentListener.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentListener.java index ac51add4d7..ac51add4d7 100644 --- a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentListener.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentListener.java diff --git a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManager.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManager.java index 6a22c3c8f4..6a22c3c8f4 100644 --- a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManager.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManager.java diff --git a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManagerService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManagerService.java index afb4e0c3ed..afb4e0c3ed 100644 --- a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManagerService.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManagerService.java diff --git a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java index c4a83fd624..c4a83fd624 100644 --- a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java diff --git a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactoryImpl.java index ea20afaf71..ea20afaf71 100644 --- a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactoryImpl.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactoryImpl.java diff --git a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/SCADomainProxySPI.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/SCADomainProxySPI.java index 96ff3a0c1a..96ff3a0c1a 100644 --- a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/SCADomainProxySPI.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/SCADomainProxySPI.java diff --git a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/SCANodeSPI.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/SCANodeSPI.java index 37414486e0..37414486e0 100644 --- a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/SCANodeSPI.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/SCANodeSPI.java diff --git a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerInitService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerInitService.java index d63a6e1159..d63a6e1159 100644 --- a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerInitService.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerInitService.java diff --git a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerService.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerService.java index 093dda4aec..093dda4aec 100644 --- a/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerService.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node/src/main/java/org/apache/tuscany/sca/node/management/SCANodeManagerService.java diff --git a/branches/sca-java-1.2.1/modules/node2-api/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/DISCLAIMER index d68a410903..d68a410903 100644 --- a/branches/sca-java-1.2.1/modules/node2-api/DISCLAIMER +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/DISCLAIMER diff --git a/branches/sca-java-1.2.1/modules/node2-api/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/LICENSE index 8aa906c321..8aa906c321 100644 --- a/branches/sca-java-1.2.1/modules/node2-api/LICENSE +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/LICENSE diff --git a/branches/sca-java-1.2.1/modules/node2-api/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/NOTICE index fdfa0e9faa..fdfa0e9faa 100644 --- a/branches/sca-java-1.2.1/modules/node2-api/NOTICE +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/NOTICE diff --git a/branches/sca-java-1.2.1/modules/node2-api/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/pom.xml index 92632f767e..92632f767e 100644 --- a/branches/sca-java-1.2.1/modules/node2-api/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/pom.xml diff --git a/branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCAClient.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCAClient.java index 8ddafcf8d9..8ddafcf8d9 100644 --- a/branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCAClient.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCAClient.java diff --git a/branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2.java index 4fd3e35668..4fd3e35668 100644 --- a/branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2.java diff --git a/branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.java index e956993dbc..e956993dbc 100644 --- a/branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.java diff --git a/branches/sca-java-1.2.1/modules/node2-impl/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/DISCLAIMER index 8e5c524323..8e5c524323 100644 --- a/branches/sca-java-1.2.1/modules/node2-impl/DISCLAIMER +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/DISCLAIMER diff --git a/branches/sca-java-1.2.1/modules/node2-impl/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/LICENSE index 8aa906c321..8aa906c321 100644 --- a/branches/sca-java-1.2.1/modules/node2-impl/LICENSE +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/LICENSE diff --git a/branches/sca-java-1.2.1/modules/node2-impl/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/NOTICE index fdfa0e9faa..fdfa0e9faa 100644 --- a/branches/sca-java-1.2.1/modules/node2-impl/NOTICE +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/NOTICE diff --git a/branches/sca-java-1.2.1/modules/node2-impl/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/pom.xml index 6a2ce22156..6a2ce22156 100644 --- a/branches/sca-java-1.2.1/modules/node2-impl/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/pom.xml diff --git a/branches/sca-java-1.2.1/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java index c1cb1d9612..c1cb1d9612 100644 --- a/branches/sca-java-1.2.1/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java diff --git a/branches/sca-java-1.2.1/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java index 0bb9e18a54..0bb9e18a54 100644 --- a/branches/sca-java-1.2.1/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java diff --git a/branches/sca-java-1.2.1/modules/node2-launcher-webapp/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/DISCLAIMER index d68a410903..d68a410903 100644 --- a/branches/sca-java-1.2.1/modules/node2-launcher-webapp/DISCLAIMER +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/DISCLAIMER diff --git a/branches/sca-java-1.2.1/modules/node2-launcher-webapp/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/LICENSE index 8aa906c321..8aa906c321 100644 --- a/branches/sca-java-1.2.1/modules/node2-launcher-webapp/LICENSE +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/LICENSE diff --git a/branches/sca-java-1.2.1/modules/node2-launcher-webapp/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/NOTICE index fdfa0e9faa..fdfa0e9faa 100644 --- a/branches/sca-java-1.2.1/modules/node2-launcher-webapp/NOTICE +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/NOTICE diff --git a/branches/sca-java-1.2.1/modules/node2-launcher-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/pom.xml index 44d0b59e6b..44d0b59e6b 100644 --- a/branches/sca-java-1.2.1/modules/node2-launcher-webapp/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/pom.xml diff --git a/branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml index 78bbebbb83..78bbebbb83 100644 --- a/branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml diff --git a/branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/WEB-INF/web.xml index 6c2c943c99..6c2c943c99 100644 --- a/branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/WEB-INF/web.xml +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/WEB-INF/web.xml diff --git a/branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/index.jsp b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/index.jsp index a739302ce6..a739302ce6 100644 --- a/branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/index.jsp +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher-webapp/src/main/webapp/index.jsp diff --git a/branches/sca-java-1.2.1/modules/node2-launcher/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/DISCLAIMER index d68a410903..d68a410903 100644 --- a/branches/sca-java-1.2.1/modules/node2-launcher/DISCLAIMER +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/DISCLAIMER diff --git a/branches/sca-java-1.2.1/modules/node2-launcher/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/LICENSE index 8aa906c321..8aa906c321 100644 --- a/branches/sca-java-1.2.1/modules/node2-launcher/LICENSE +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/LICENSE diff --git a/branches/sca-java-1.2.1/modules/node2-launcher/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/NOTICE index fdfa0e9faa..fdfa0e9faa 100644 --- a/branches/sca-java-1.2.1/modules/node2-launcher/NOTICE +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/NOTICE diff --git a/branches/sca-java-1.2.1/modules/node2-launcher/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/pom.xml index 0fdfa51645..0fdfa51645 100644 --- a/branches/sca-java-1.2.1/modules/node2-launcher/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/pom.xml diff --git a/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java index f661f9019d..f661f9019d 100644 --- a/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java diff --git a/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java index 39e8d81139..39e8d81139 100644 --- a/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java diff --git a/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java index be416ec68b..be416ec68b 100644 --- a/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java diff --git a/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java index d8124037fe..d8124037fe 100644 --- a/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java diff --git a/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java index 6abd571b31..6abd571b31 100644 --- a/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java diff --git a/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java index eafe4ddaa0..eafe4ddaa0 100644 --- a/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java diff --git a/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java index 63515b9cd1..63515b9cd1 100644 --- a/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java |