TUSCANY-3919: Fix configuration problems in the calculator-distributed sample git-svn-id: https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk@1157045 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/samples/calculator-distributed/README b/samples/calculator-distributed/README index 3113202..b1bb60a 100644 --- a/samples/calculator-distributed/README +++ b/samples/calculator-distributed/README
@@ -24,17 +24,17 @@ OR if you don't have ant, on Windows use -java -cp src\main\resources;..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator-distributed.jar node.LaunchDomain -java -cp src\main\resources;..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator-distributed.jar node.LaunchCalculatorNodeB -java -cp src\main\resources;..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator-distributed.jar node.LaunchCalculatorNodeC -java -cp src\main\resources;..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator-distributed.jar node.LaunchCalculatorNodeA +java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator-distributed.jar node.LaunchDomain +java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator-distributed.jar node.LaunchCalculatorNodeB +java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator-distributed.jar node.LaunchCalculatorNodeC +java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator-distributed.jar node.LaunchCalculatorNodeA and on *nix do -java -cp src/main/resources:../../lib/tuscany-sca-manifest.jar:target/sample-calculator-distributed.jar node.LaunchDomain -java -cp src/main/resources:../../lib/tuscany-sca-manifest.jar:target/sample-calculator-distributed.jar node.LaunchCalculatorNodeB -java -cp src/main/resources:../../lib/tuscany-sca-manifest.jar:target/sample-calculator-distributed.jar node.LaunchCalculatorNodeC -java -cp src/main/resources:../../lib/tuscany-sca-manifest.jar:target/sample-calculator-distributed.jar node.LaunchCalculatorNodeA +java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-calculator-distributed.jar node.LaunchDomain +java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-calculator-distributed.jar node.LaunchCalculatorNodeB +java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-calculator-distributed.jar node.LaunchCalculatorNodeC +java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-calculator-distributed.jar node.LaunchCalculatorNodeA The processes started on each of these command prompts can be ended by typing 'q'. @@ -110,13 +110,17 @@ configuration to the distributed nodes resources/ - cloud - The SCA composite files that describe + workspace.xml - The domain manager configuration files that + domain.composite describe the configuration of the domain's + cloud.composite contributions, composites, and nodes + + cloud/ - The SCA composite files that describe the configuration of each node - nodeA - the SCA assembly for nodeA's part of the + nodeA/ - the SCA assembly for nodeA's part of the calculator application - nodeB - the SCA assembly for nodeB's part of the + nodeB/ - the SCA assembly for nodeB's part of the calculator application - nodeC - the SCA assembly for nodeC's part of the + nodeC/ - the SCA assembly for nodeC's part of the calculator application test/ java/
diff --git a/samples/calculator-distributed/src/main/java/node/LaunchDomain.java b/samples/calculator-distributed/src/main/java/node/LaunchDomain.java index 8b4fe56..114c07e 100644 --- a/samples/calculator-distributed/src/main/java/node/LaunchDomain.java +++ b/samples/calculator-distributed/src/main/java/node/LaunchDomain.java
@@ -26,8 +26,11 @@ * in each node that talk to the registry should be replaced also. */ public class LaunchDomain { + private static String[] defaultRootDir = {"./target/classes/"}; + public static void main(String[] args) throws Exception { - DomainManagerLauncher.main(args); + String[] rootDir = args.length > 0 ? args : defaultRootDir; + DomainManagerLauncher.main(rootDir); } }
diff --git a/samples/calculator-distributed/cloud.composite b/samples/calculator-distributed/src/main/resources/cloud.composite similarity index 89% rename from samples/calculator-distributed/cloud.composite rename to samples/calculator-distributed/src/main/resources/cloud.composite index 85e2f9c..1d37da3 100644 --- a/samples/calculator-distributed/cloud.composite +++ b/samples/calculator-distributed/src/main/resources/cloud.composite
@@ -20,7 +20,7 @@ <composite name="cloud.composite" targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:ns1="http://www.osoa.org/xmlns/sca/1.0"> - <include name="ns2:NodeA" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://sample/cloud"/> - <include name="ns2:NodeB" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://sample/cloud"/> - <include name="ns2:NodeC" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://sample/cloud"/> + <include name="ns2:NodeA" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/> + <include name="ns2:NodeB" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/> + <include name="ns2:NodeC" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/> </composite>
diff --git a/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite b/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite index ed7fe55..7f03eb5 100644 --- a/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite +++ b/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite
@@ -19,7 +19,7 @@ --> <composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" - targetNamespace="http://sample/cloud" + targetNamespace="http://tuscany.apache.org/cloud" xmlns:s="http://sample" name="NodeA">
diff --git a/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite b/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite index 8f29cc1..74f06cc 100644 --- a/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite +++ b/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite
@@ -19,7 +19,7 @@ --> <composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" - targetNamespace="http://sample/cloud" + targetNamespace="http://tuscany.apache.org/cloud" xmlns:s="http://sample" name="NodeB">
diff --git a/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite b/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite index 9ad132b..f292303 100644 --- a/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite +++ b/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite
@@ -19,7 +19,7 @@ --> <composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" - targetNamespace="http://sample/cloud" + targetNamespace="http://tuscany.apache.org/cloud" xmlns:s="http://sample" name="NodeC">
diff --git a/samples/calculator-distributed/domain.composite b/samples/calculator-distributed/src/main/resources/domain.composite similarity index 100% rename from samples/calculator-distributed/domain.composite rename to samples/calculator-distributed/src/main/resources/domain.composite
diff --git a/samples/calculator-distributed/workspace.xml b/samples/calculator-distributed/src/main/resources/workspace.xml similarity index 74% rename from samples/calculator-distributed/workspace.xml rename to samples/calculator-distributed/src/main/resources/workspace.xml index 7d6d3db..818b055 100644 --- a/samples/calculator-distributed/workspace.xml +++ b/samples/calculator-distributed/src/main/resources/workspace.xml
@@ -18,8 +18,8 @@ * under the License. --> <workspace xmlns="http://tuscany.apache.org/xmlns/sca/1.0" xmlns:ns1="http://tuscany.apache.org/xmlns/sca/1.0"> - <contribution location="file:./src/main/resources/nodeA" uri="nodeA"/> - <contribution location="file:./src/main/resources/nodeB" uri="nodeB"/> - <contribution location="file:./src/main/resources/nodeC" uri="nodeC"/> - <contribution location="file:./src/main/resources/cloud" uri="http://tuscany.apache.org/cloud"/> + <contribution location="file:./target/classes/nodeA" uri="nodeA"/> + <contribution location="file:./target/classes/nodeB" uri="nodeB"/> + <contribution location="file:./target/classes/nodeC" uri="nodeC"/> + <contribution location="file:./target/classes/cloud" uri="http://tuscany.apache.org/cloud"/> </workspace>
diff --git a/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java b/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java index 2a6f3af..92197ac 100644 --- a/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java +++ b/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
@@ -50,7 +50,7 @@ System.out.println("Setting up domain"); DomainManagerLauncher managerLauncher = DomainManagerLauncher.newInstance(); - manager = managerLauncher.createDomainManager(); + manager = managerLauncher.createDomainManager("./target/classes/"); manager.start(); SCANodeFactory nodeFactory = SCANodeFactory.newInstance();