You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2010/10/04 11:30:34 UTC
svn commit: r1004166 - in /tuscany/sca-java-2.x/trunk/samples:
learning-more/binding-ws/calculator-contribution/ running-tuscany/
running-tuscany/embedded-jse/
running-tuscany/embedded-jse/src/main/java/launcher/
running-tuscany/embedded-osgi-base/src/...
Author: slaws
Date: Mon Oct 4 09:30:33 2010
New Revision: 1004166
URL: http://svn.apache.org/viewvc?rev=1004166&view=rev
Log:
Update for sample name changes
Modified:
tuscany/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/build.xml
tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/build.xml
tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingJSONRPCCalculator.java
tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingRMICalculator.java
tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingSCACalculator.java
tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingWSCalculator.java
tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationJavaCalculator.java
tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationScriptCalculator.java
tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/src/main/java/launcher/SampleJSELauncher.java
tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingSCA.java
tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingWS.java
tuscany/sca-java-2.x/trunk/samples/running-tuscany/pom.xml
Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/build.xml?rev=1004166&r1=1004165&r2=1004166&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/build.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/build.xml Mon Oct 4 09:30:33 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/build.xml?rev=1004166&r1=1004165&r2=1004166&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/build.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/build.xml Mon Oct 4 09:30:33 2010
@@ -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">
Modified: tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingJSONRPCCalculator.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingJSONRPCCalculator.java?rev=1004166&r1=1004165&r2=1004166&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingJSONRPCCalculator.java (original)
+++ tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingJSONRPCCalculator.java Mon Oct 4 09:30:33 2010
@@ -41,7 +41,7 @@ public class JSELauncherBindingJSONRPCCa
* 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");
Modified: tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingRMICalculator.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingRMICalculator.java?rev=1004166&r1=1004165&r2=1004166&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingRMICalculator.java (original)
+++ tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingRMICalculator.java Mon Oct 4 09:30:33 2010
@@ -39,8 +39,8 @@ public class JSELauncherBindingRMICalcul
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();
Modified: tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingSCACalculator.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingSCACalculator.java?rev=1004166&r1=1004165&r2=1004166&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingSCACalculator.java (original)
+++ tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingSCACalculator.java Mon Oct 4 09:30:33 2010
@@ -41,7 +41,7 @@ public class JSELauncherBindingSCACalcul
* 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");
Modified: tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingWSCalculator.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingWSCalculator.java?rev=1004166&r1=1004165&r2=1004166&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingWSCalculator.java (original)
+++ tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingWSCalculator.java Mon Oct 4 09:30:33 2010
@@ -41,7 +41,7 @@ public class JSELauncherBindingWSCalcula
* 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");
Modified: tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationJavaCalculator.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationJavaCalculator.java?rev=1004166&r1=1004165&r2=1004166&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationJavaCalculator.java (original)
+++ tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationJavaCalculator.java Mon Oct 4 09:30:33 2010
@@ -37,7 +37,7 @@ public class JSELauncherImplementationJa
}
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();
Modified: tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationScriptCalculator.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationScriptCalculator.java?rev=1004166&r1=1004165&r2=1004166&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationScriptCalculator.java (original)
+++ tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationScriptCalculator.java Mon Oct 4 09:30:33 2010
@@ -41,7 +41,7 @@ public class JSELauncherImplementationSc
* 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");
Modified: tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/src/main/java/launcher/SampleJSELauncher.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/src/main/java/launcher/SampleJSELauncher.java?rev=1004166&r1=1004165&r2=1004166&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/src/main/java/launcher/SampleJSELauncher.java (original)
+++ tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/src/main/java/launcher/SampleJSELauncher.java Mon Oct 4 09:30:33 2010
@@ -64,7 +64,7 @@ public class SampleJSELauncher extends R
* 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 R
* 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");
Modified: tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingSCA.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingSCA.java?rev=1004166&r1=1004165&r2=1004166&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingSCA.java (original)
+++ tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingSCA.java Mon Oct 4 09:30:33 2010
@@ -40,7 +40,7 @@ public class SampleOSGILauncherBindingSC
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);
}
Modified: tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingWS.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingWS.java?rev=1004166&r1=1004165&r2=1004166&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingWS.java (original)
+++ tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingWS.java Mon Oct 4 09:30:33 2010
@@ -41,7 +41,7 @@ public class SampleOSGILauncherBindingWS
// 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");
Modified: tuscany/sca-java-2.x/trunk/samples/running-tuscany/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/running-tuscany/pom.xml?rev=1004166&r1=1004165&r2=1004166&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/running-tuscany/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/running-tuscany/pom.xml Mon Oct 4 09:30:33 2010
@@ -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>