diff options
Diffstat (limited to '')
12 files changed, 40 insertions, 34 deletions
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/build.xml b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/build.xml index b7c1508414..dcb1193e3b 100644 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/build.xml +++ b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/build.xml @@ -18,7 +18,7 @@ -->
<project name="binding-ws-calculator" default="compile">
<property name="tuscany.home" value="../../../.."/>
- <property name="jar.name" value="contribution-binding-ws-calculator.jar" />
+ <property name="jar.name" value="sample-contribution-binding-ws-calculator.jar" />
<echo>${tuscany.home}</echo>
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/build.xml b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/build.xml index 5a2e65637b..23a9f79712 100644 --- a/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/build.xml +++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/build.xml @@ -17,11 +17,14 @@ * under the License.
-->
<project name="launcher-embedded-jse" default="run">
- <property name="tuscany.home" value="../../.."/>
+ <property name="tuscany.home" value="../../.."/>
<property name="jar.name" value="sample-launcher-embedded-jse.jar" />
- <property name="wait.before.stopping" value="dontWaitBeforeStopping" />
-
- <echo>${tuscany.home}</echo>
+
+ <echo>Root of Tuscany binary distribution is - ${tuscany.home}</echo>
+
+ <include file="${tuscany.home}/features/tuscany-base-runtime/build-path.xml"/>
+ <include file="${tuscany.home}/features/tuscany-binding-ws-runtime-axis2/build-path.xml"/>
+ <include file="${tuscany.home}/features/tuscany-binding-rmi-runtime/build-path.xml"/>
<target name="init">
<delete quiet="true" includeemptydirs="true">
@@ -47,15 +50,15 @@ </jar>
</target>
- <target name="run" depends="compile">
- <echo>Please use 'ant run-name-of-sample-contribution-to-run' for example, try one of</echo>
- <echo> 'ant run-contribution-binding-sca-calculator' </echo>
- <echo> 'ant run-contribution-binding-ws-calculator' </echo>
- <echo> 'ant run-contribution-binding-rmi-calculator' </echo>
- <echo> 'ant run-contribution-implementation-java-calculator' </echo>
+ <target name="run" depends="compile">
+ <echo>Please use 'ant run-name-of-sample-contribution-to-run' for example, try one of</echo>
+ <echo> 'ant binding-sca-calculator' </echo>
+ <echo> 'ant binding-ws-calculator' </echo>
+ <echo> 'ant binding-rmi-calculator' </echo>
+ <echo> 'ant implementation-java-calculator' </echo>
</target>
- <target name="run-contribution-binding-sca-calculator" depends="compile">
+ <target name="binding-sca-calculator" depends="compile">
<java classname="launcher.JSELauncherBindingSCACalculator"
fork="true"
failonerror="true">
@@ -68,33 +71,36 @@ </java>
</target>
- <target name="run-contribution-binding-ws-calculator" depends="compile">
+ <target name="binding-ws-calculator" depends="compile">
<java classname="launcher.JSELauncherBindingWSCalculator"
fork="true"
failonerror="true">
<classpath>
<pathelement location="target/${jar.name}"/>
- <fileset dir="${tuscany.home}/features">
- <include name="tuscany-sca-manifest.jar" />
- </fileset>
+ <path refid="tuscany-base-runtime.path"/>
+ <path refid="tuscany-binding-ws-runtime-axis2.path"/>
</classpath>
</java>
</target>
- <target name="run-contribution-binding-rmi-calculator" depends="compile">
+ <target name="binding-rmi-calculator" depends="compile">
<java classname="launcher.JSELauncherBindingRMICalculator"
fork="true"
failonerror="true">
<classpath>
<pathelement location="target/${jar.name}"/>
- <fileset dir="${tuscany.home}/features">
- <include name="tuscany-sca-manifest.jar" />
+ <fileset dir="${tuscany.home}/features/tuscany-base-runtime">
+ <include name="tuscany-base-runtime-manifest.jar" />
+ </fileset>
+ <fileset dir="${tuscany.home}/features/tuscany-binding-rmi-runtime">
+ <include name="tuscany-binding-rmi-runtime-manifest.jar" />
</fileset>
</classpath>
</java>
</target>
- <target name="run-contribution-implementation-java-calculator" depends="compile">
+ <!-- TODO - I'd like this to be running with aggregate JARs -->
+ <target name="implementation-java-calculator" depends="compile">
<java classname="launcher.JSELauncherImplementationJavaCalculator"
fork="true"
failonerror="true">
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingJSONRPCCalculator.java b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingJSONRPCCalculator.java index 3d6af9f561..c898f6b7c6 100644 --- a/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingJSONRPCCalculator.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingJSONRPCCalculator.java @@ -41,7 +41,7 @@ public class JSELauncherBindingJSONRPCCalculator { * Using the Tuscany Node API to get a local service proxy
*/
public void launchBindingSCACalculator(){
- Node node = NodeFactory.newInstance().createNode(new Contribution("c1", "../binding-jsonrpc/contribution-calculator/target/sample-contribution-binding-jsonrpc-calculator.jar"));
+ Node node = NodeFactory.newInstance().createNode(new Contribution("c1", "../binding-jsonrpc/calculator-contribution/target/sample-contribution-binding-jsonrpc-calculator.jar"));
node.start();
CalculatorService calculator = node.getService(CalculatorService.class, "CalculatorServiceComponent");
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingRMICalculator.java b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingRMICalculator.java index 8a6bae5123..0ac295d252 100644 --- a/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingRMICalculator.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingRMICalculator.java @@ -39,8 +39,8 @@ public class JSELauncherBindingRMICalculator { public void launchBindingRMICalculator(){ - Node node1 = NodeFactory.newInstance().createNode(new Contribution("c1", "../../learning-more/binding-rmi/contribution-calculator-service/target/sample-contribution-binding-rmi-calculator-service.jar")); - Node node2 = NodeFactory.newInstance().createNode(new Contribution("c1", "../../learning-more/binding-rmi/contribution-calculator-reference/target/sample-contribution-binding-rmi-calculator-reference.jar")); + Node node1 = NodeFactory.newInstance().createNode(new Contribution("c1", "../../learning-more/binding-rmi/calculator-service-contribution/target/sample-contribution-binding-rmi-calculator-service.jar")); + Node node2 = NodeFactory.newInstance().createNode(new Contribution("c1", "../../learning-more/binding-rmi/calculator-reference-contribution/target/sample-contribution-binding-rmi-calculator-reference.jar")); node1.start(); node2.start(); diff --git a/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingSCACalculator.java b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingSCACalculator.java index bb860faf44..de48e5245d 100644 --- a/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingSCACalculator.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingSCACalculator.java @@ -41,7 +41,7 @@ public class JSELauncherBindingSCACalculator { * Using the Tuscany Node API to get a local service proxy */ public void launchBindingSCACalculator(){ - Node node = NodeFactory.newInstance().createNode(new Contribution("c1", "../../learning-more/binding-sca/contribution-calculator/target/sample-contribution-binding-sca-calculator.jar")); + Node node = NodeFactory.newInstance().createNode(new Contribution("c1", "../../learning-more/binding-sca/calculator-contribution/target/sample-contribution-binding-sca-calculator.jar")); node.start(); CalculatorService calculator = node.getService(CalculatorService.class, "CalculatorServiceComponent"); diff --git a/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingWSCalculator.java b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingWSCalculator.java index 238dd40ff7..afcc338130 100644 --- a/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingWSCalculator.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingWSCalculator.java @@ -41,7 +41,7 @@ public class JSELauncherBindingWSCalculator { * Using the Tuscany Node API to get a local service proxy
*/
public void launchBindingWSCalculator(){
- Node node = NodeFactory.newInstance().createNode(new Contribution("c1", "../../learning-more/binding-ws/contribution-calculator/target/sample-contribution-binding-ws-calculator.jar"));
+ Node node = NodeFactory.newInstance().createNode(new Contribution("c1", "../../learning-more/binding-ws/calculator-contribution/target/sample-contribution-binding-ws-calculator.jar"));
node.start();
CalculatorService calculator = node.getService(CalculatorService.class, "CalculatorServiceComponent");
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationJavaCalculator.java b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationJavaCalculator.java index 91410503e3..ecc747a1fa 100644 --- a/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationJavaCalculator.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationJavaCalculator.java @@ -37,7 +37,7 @@ public class JSELauncherImplementationJavaCalculator { } public void launchImplementationJavaCalculator(){ - Node node = NodeFactory.newInstance().createNode(new Contribution("c1", "../../learning-more/implementation-java/contribution-calculator/target/sample-contribution-implementation-java-calculator.jar")); + Node node = NodeFactory.newInstance().createNode(new Contribution("c1", "../../learning-more/implementation-java/calculator-contribution/target/sample-contribution-implementation-java-calculator.jar")); node.start(); node.stop(); diff --git a/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationScriptCalculator.java b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationScriptCalculator.java index 6592b97c1b..70bd07649f 100644 --- a/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationScriptCalculator.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationScriptCalculator.java @@ -41,7 +41,7 @@ public class JSELauncherImplementationScriptCalculator { * Using the Tuscany Node API to get a local service proxy
*/
public void launchImplementationScriptCalculator(){
- Node node = NodeFactory.newInstance().createNode(new Contribution("c1", "../../learning-more/implementation-script/contribution-calculator/target/sample-contribution-implementation-script-calculator.jar"));
+ Node node = NodeFactory.newInstance().createNode(new Contribution("c1", "../../learning-more/implementation-script/calculator-contribution/target/sample-contribution-implementation-script-calculator.jar"));
node.start();
CalculatorService calculator = node.getService(CalculatorService.class, "CalculatorServiceComponent");
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/src/main/java/launcher/SampleJSELauncher.java b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/src/main/java/launcher/SampleJSELauncher.java index 46cdcc73e4..3df1418604 100644 --- a/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/src/main/java/launcher/SampleJSELauncher.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/src/main/java/launcher/SampleJSELauncher.java @@ -64,7 +64,7 @@ public class SampleJSELauncher extends RuntimeIntegration { * that calls the CalculatorServiceComponent from an operation marked by @Init. */ public void launchBindingSCACalculator(){ - Node node = startNode(new Contribution("c1", "../../learning-more/binding-sca/contribution-calculator/target/sample-contribution-binding-sca-calculator.jar")); + Node node = startNode(new Contribution("c1", "../../learning-more/binding-sca/calculator-contribution/target/sample-contribution-binding-sca-calculator.jar")); stopNode(node); } @@ -73,7 +73,7 @@ public class SampleJSELauncher extends RuntimeIntegration { * Using a Tuscany specific mechanism for getting at local service proxies */ public void launchBindingWSCalculator() throws NoSuchDomainException, NoSuchServiceException{ - Node node = startNode(new Contribution("c1", "../../learning-more/binding-ws/contribution-calculator/target/sample-contribution-binding-ws-calculator.jar")); + Node node = startNode(new Contribution("c1", "../../learning-more/binding-ws/calculator-contribution/target/sample-contribution-binding-ws-calculator.jar")); CalculatorService calculator = node.getService(CalculatorService.class, "CalculatorServiceComponent"); diff --git a/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingSCA.java b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingSCA.java index ea22d3cc7b..eb196a0a07 100644 --- a/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingSCA.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingSCA.java @@ -40,7 +40,7 @@ public class SampleOSGILauncherBindingSCA extends RuntimeIntegration { SampleOSGILauncherBindingSCA launcher = new SampleOSGILauncherBindingSCA(); - Node node = launcher.startNode(new Contribution("c1", "../../learning-more/binding-sca/contribution-calculator/target/sample-contribution-binding-sca-calculator.jar")); + Node node = launcher.startNode(new Contribution("c1", "../../learning-more/binding-sca/calculator-contribution/target/sample-contribution-binding-sca-calculator.jar")); launcher.stopNode(node); } diff --git a/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingWS.java b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingWS.java index d85c1cf5f8..b53dd9e90e 100644 --- a/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingWS.java +++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingWS.java @@ -41,7 +41,7 @@ public class SampleOSGILauncherBindingWS extends RuntimeIntegration { // launcher.launchBindingWSCalculator(); - Node node = launcher.startNode(new Contribution("c1", "../../learning-more/binding-ws/contribution-calculator/target/sample-contribution-binding-ws-calculator.jar")); + Node node = launcher.startNode(new Contribution("c1", "../../learning-more/binding-ws/calculator-contribution/target/sample-contribution-binding-ws-calculator.jar")); CalculatorService calculator = node.getService(CalculatorService.class, "CalculatorServiceComponent"); diff --git a/sca-java-2.x/trunk/samples/running-tuscany/pom.xml b/sca-java-2.x/trunk/samples/running-tuscany/pom.xml index 9496041257..06d5ff3306 100644 --- a/sca-java-2.x/trunk/samples/running-tuscany/pom.xml +++ b/sca-java-2.x/trunk/samples/running-tuscany/pom.xml @@ -42,9 +42,9 @@ <module>maven</module> <module>webapp</module> --> - <!--module>embedded-jse</module--> - <!--module>embedded-osgi</module--> - <!--module>embedded-osgi-base</module--> + <module>embedded-jse</module> + <module>embedded-osgi</module> + <module>embedded-osgi-base</module> <module>shell</module> </modules> |