You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2008/03/17 03:40:07 UTC
svn commit: r637703 - in /incubator/tuscany/java/sca/samples: ./
calculator-distributed/src/main/java/node/
calculator-distributed/src/test/java/calculator/
Author: jsdelfino
Date: Sun Mar 16 19:40:05 2008
New Revision: 637703
URL: http://svn.apache.org/viewvc?rev=637703&view=rev
Log:
Ported the calculator-distributed sample to the latest launchers.
Modified:
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchDomain.java
incubator/tuscany/java/sca/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
incubator/tuscany/java/sca/samples/pom.xml
Modified: incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java?rev=637703&r1=637702&r2=637703&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java (original)
+++ incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java Sun Mar 16 19:40:05 2008
@@ -19,10 +19,10 @@
package node;
-import org.apache.tuscany.sca.node.launch.SCANode2Launcher;
+import org.apache.tuscany.sca.implementation.node.launcher.NodeImplementationLauncher;
public class LaunchCalculatorNodeB {
public static void main(String[] args) throws Exception {
- SCANode2Launcher.main(new String[] {"http://localhost:9990/composite-image/?composite=composite:nodeB;http://sample;CalculatorB"});
+ NodeImplementationLauncher.main(new String[] {"http://localhost:9990/composite-image/?composite=composite:nodeB;http://sample;CalculatorB"});
}
}
Modified: incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java?rev=637703&r1=637702&r2=637703&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java (original)
+++ incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java Sun Mar 16 19:40:05 2008
@@ -19,10 +19,10 @@
package node;
-import org.apache.tuscany.sca.node.launch.SCANode2Launcher;
+import org.apache.tuscany.sca.implementation.node.launcher.NodeImplementationLauncher;
public class LaunchCalculatorNodeC {
public static void main(String[] args) throws Exception {
- SCANode2Launcher.main(new String[] {"http://localhost:9990/composite-image/?composite=composite:nodeC;http://sample;CalculatorC"});
+ NodeImplementationLauncher.main(new String[] {"http://localhost:9990/composite-image/?composite=composite:nodeC;http://sample;CalculatorC"});
}
}
Modified: incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchDomain.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchDomain.java?rev=637703&r1=637702&r2=637703&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchDomain.java (original)
+++ incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/LaunchDomain.java Sun Mar 16 19:40:05 2008
@@ -18,14 +18,16 @@
*/
package node;
+import org.apache.tuscany.sca.workspace.admin.launcher.DomainAdminLauncher;
+
/**
* This server program that loads a composite to provide simple registry function.
* This server can be replaced with any registry that is appropriate but the components
* in each node that talk to the registry should be replaced also.
*/
public class LaunchDomain {
- public static void main(String[] args) {
- org.apache.tuscany.sca.workspace.admin.launch.LaunchDomainAdmin.main(args);
+ public static void main(String[] args) throws Exception {
+ DomainAdminLauncher.main(args);
}
}
Modified: incubator/tuscany/java/sca/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java?rev=637703&r1=637702&r2=637703&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java (original)
+++ incubator/tuscany/java/sca/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java Sun Mar 16 19:40:05 2008
@@ -19,21 +19,17 @@
package calculator;
-import javax.xml.namespace.QName;
-
import junit.framework.Assert;
import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.implementation.node.launcher.NodeProcessCollectionImpl;
import org.apache.tuscany.sca.node.SCAClient;
import org.apache.tuscany.sca.node.SCANode2;
import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.workspace.admin.impl.NodeProcessCollectionImpl;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-import calculator.CalculatorService;
-
/**
* Runs a distributed domain in a single VM by using and in memory
* implementation of the distributed domain
@@ -53,7 +49,7 @@
try {
System.out.println("Setting up domain");
- SCADomain.newInstance("Admin.composite");
+ SCADomain.newInstance("DomainAdmin.composite");
NodeProcessCollectionImpl nodes = new NodeProcessCollectionImpl();
Modified: incubator/tuscany/java/sca/samples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/pom.xml?rev=637703&r1=637702&r2=637703&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/pom.xml (original)
+++ incubator/tuscany/java/sca/samples/pom.xml Sun Mar 16 19:40:05 2008
@@ -49,7 +49,7 @@
<module>binding-notification-consumer</module>
<module>binding-notification-producer</module>
<module>calculator</module>
- <!--module>calculator-distributed</module-->
+ <module>calculator-distributed</module>
<module>calculator-implementation-policies</module>
<module>calculator-rmi-reference</module>
<module>calculator-rmi-service</module>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org