You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by na...@apache.org on 2011/08/12 12:52:45 UTC
svn commit: r1157045 - in
/tuscany/sca-java-1.x/trunk/samples/calculator-distributed: ./
src/main/java/node/ src/main/resources/ src/main/resources/cloud/
src/test/java/calculator/
Author: nash
Date: Fri Aug 12 10:52:45 2011
New Revision: 1157045
URL: http://svn.apache.org/viewvc?rev=1157045&view=rev
Log:
TUSCANY-3919: Fix configuration problems in the calculator-distributed sample
Added:
tuscany/sca-java-1.x/trunk/samples/calculator-distributed/src/main/resources/cloud.composite
- copied, changed from r1091737, tuscany/sca-java-1.x/trunk/samples/calculator-distributed/cloud.composite
tuscany/sca-java-1.x/trunk/samples/calculator-distributed/src/main/resources/domain.composite
- copied unchanged from r1091737, tuscany/sca-java-1.x/trunk/samples/calculator-distributed/domain.composite
tuscany/sca-java-1.x/trunk/samples/calculator-distributed/src/main/resources/workspace.xml
- copied, changed from r1091737, tuscany/sca-java-1.x/trunk/samples/calculator-distributed/workspace.xml
Removed:
tuscany/sca-java-1.x/trunk/samples/calculator-distributed/cloud.composite
tuscany/sca-java-1.x/trunk/samples/calculator-distributed/domain.composite
tuscany/sca-java-1.x/trunk/samples/calculator-distributed/workspace.xml
Modified:
tuscany/sca-java-1.x/trunk/samples/calculator-distributed/README
tuscany/sca-java-1.x/trunk/samples/calculator-distributed/src/main/java/node/LaunchDomain.java
tuscany/sca-java-1.x/trunk/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite
tuscany/sca-java-1.x/trunk/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite
tuscany/sca-java-1.x/trunk/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite
tuscany/sca-java-1.x/trunk/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
Modified: tuscany/sca-java-1.x/trunk/samples/calculator-distributed/README
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/samples/calculator-distributed/README?rev=1157045&r1=1157044&r2=1157045&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/samples/calculator-distributed/README (original)
+++ tuscany/sca-java-1.x/trunk/samples/calculator-distributed/README Fri Aug 12 10:52:45 2011
@@ -24,17 +24,17 @@ Please run the commands in this order.
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 @@ calculator/
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/
Modified: tuscany/sca-java-1.x/trunk/samples/calculator-distributed/src/main/java/node/LaunchDomain.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/samples/calculator-distributed/src/main/java/node/LaunchDomain.java?rev=1157045&r1=1157044&r2=1157045&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/samples/calculator-distributed/src/main/java/node/LaunchDomain.java (original)
+++ tuscany/sca-java-1.x/trunk/samples/calculator-distributed/src/main/java/node/LaunchDomain.java Fri Aug 12 10:52:45 2011
@@ -26,8 +26,11 @@ import org.apache.tuscany.sca.node.launc
* 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);
}
}
Copied: tuscany/sca-java-1.x/trunk/samples/calculator-distributed/src/main/resources/cloud.composite (from r1091737, tuscany/sca-java-1.x/trunk/samples/calculator-distributed/cloud.composite)
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/samples/calculator-distributed/src/main/resources/cloud.composite?p2=tuscany/sca-java-1.x/trunk/samples/calculator-distributed/src/main/resources/cloud.composite&p1=tuscany/sca-java-1.x/trunk/samples/calculator-distributed/cloud.composite&r1=1091737&r2=1157045&rev=1157045&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/samples/calculator-distributed/cloud.composite (original)
+++ tuscany/sca-java-1.x/trunk/samples/calculator-distributed/src/main/resources/cloud.composite Fri Aug 12 10:52:45 2011
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite?rev=1157045&r1=1157044&r2=1157045&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite (original)
+++ tuscany/sca-java-1.x/trunk/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite Fri Aug 12 10:52:45 2011
@@ -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">
Modified: tuscany/sca-java-1.x/trunk/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite?rev=1157045&r1=1157044&r2=1157045&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite (original)
+++ tuscany/sca-java-1.x/trunk/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite Fri Aug 12 10:52:45 2011
@@ -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">
Modified: tuscany/sca-java-1.x/trunk/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite?rev=1157045&r1=1157044&r2=1157045&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite (original)
+++ tuscany/sca-java-1.x/trunk/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite Fri Aug 12 10:52:45 2011
@@ -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">
Copied: tuscany/sca-java-1.x/trunk/samples/calculator-distributed/src/main/resources/workspace.xml (from r1091737, tuscany/sca-java-1.x/trunk/samples/calculator-distributed/workspace.xml)
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/samples/calculator-distributed/src/main/resources/workspace.xml?p2=tuscany/sca-java-1.x/trunk/samples/calculator-distributed/src/main/resources/workspace.xml&p1=tuscany/sca-java-1.x/trunk/samples/calculator-distributed/workspace.xml&r1=1091737&r2=1157045&rev=1157045&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/samples/calculator-distributed/workspace.xml (original)
+++ tuscany/sca-java-1.x/trunk/samples/calculator-distributed/src/main/resources/workspace.xml Fri Aug 12 10:52:45 2011
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java?rev=1157045&r1=1157044&r2=1157045&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java (original)
+++ tuscany/sca-java-1.x/trunk/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java Fri Aug 12 10:52:45 2011
@@ -50,7 +50,7 @@ public class CalculatorDistributedTestCa
System.out.println("Setting up domain");
DomainManagerLauncher managerLauncher = DomainManagerLauncher.newInstance();
- manager = managerLauncher.createDomainManager();
+ manager = managerLauncher.createDomainManager("./target/classes/");
manager.start();
SCANodeFactory nodeFactory = SCANodeFactory.newInstance();