Author: slaws
Date: Tue May 18 12:50:07 2010
New Revision: 945630
URL: http://svn.apache.org/viewvc?rev=945630&view=rev
Log:
Add the binding-rmi contribution into the jse launcher
Modified:
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/build.xml
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/calculator/CalculatorService.java
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/SampleJSELauncher.java
Modified: tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/build.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/build.xml?rev=945630&r1=945629&r2=945630&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/build.xml
(original)
+++ tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/build.xml Tue May
18 12:50:07 2010
@@ -81,5 +81,19 @@
<arg value="contribution-binding-ws-calculator"/>
</java>
</target>
+
+ <target name="run-contribution-binding-rmi-calculator" depends="compile">
+ <java classname="${main.class}"
+ fork="true"
+ failonerror="true">
+ <classpath>
+ <pathelement location="target/${jar.name}"/>
+ <fileset dir="${tuscany.home}/features">
+ <include name="tuscany-sca-manifest.jar" />
+ </fileset>
+ </classpath>
+ <arg value="contribution-binding-rmi-calculator"/>
+ </java>
+ </target>
</project>
Modified:
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/calculator/CalculatorService.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/calculator/CalculatorService.java?rev=945630&r1=945629&r2=945630&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/calculator/CalculatorService.java
(original)
+++
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/calculator/CalculatorService.java
Tue May 18 12:50:07 2010
@@ -18,10 +18,13 @@
*/
package calculator;
+import org.oasisopen.sca.annotation.Remotable;
+
/**
* The Calculator service interface.
*/
+...@remotable
public interface CalculatorService {
double add(double n1, double n2);
Modified:
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/SampleJSELauncher.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/SampleJSELauncher.java?rev=945630&r1=945629&r2=945630&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/SampleJSELauncher.java
(original)
+++
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/SampleJSELauncher.java
Tue May 18 12:50:07 2010
@@ -48,6 +48,8 @@ public class SampleJSELauncher extends R
launcher.launchBindingSCACalculator();
} else if (contribution.equals("contribution-binding-ws-calculator")){
launcher.launchBindingWSCalculator();
+ } else if (contribution.equals("contribution-binding-rmi-calculator")){
+ launcher.launchBindingRMICalculator();
} else {
System.out.println("Sample contribution " + contribution + "not
found");
}
@@ -87,4 +89,23 @@ public class SampleJSELauncher extends R
stopNode(node);
}
+ /*
+ * Using a Tuscany specific mechanism for getting at local service proxies
+ */
+ public void launchBindingRMICalculator(){
+ Node node1 = startNode(new Contribution("c1",
"../binding-rmi/contribution-calculator-service/target/classes"));
+ Node node2 = startNode(new Contribution("c1",
"../binding-rmi/contribution-calculator-reference/target/classes"));
+
+ CalculatorService calculator =
node2.getService(CalculatorService.class, "CalculatorServiceComponent");
+ // TODO - could use JUnit assertions but don't want to have to handle
JUnit dependency from Ant script
+ double result = calculator.add(3, 2);
+ System.out.println("3 + 2 = " + result);
+ if (result != 5.0){
+ throw new SampleLauncherException();
+ }
+
+ stopNode(node2);
+ stopNode(node1);
+ }
+
}
