Author: slaws
Date: Wed May 19 07:34:24 2010
New Revision: 946070
URL: http://svn.apache.org/viewvc?rev=946070&view=rev
Log:
Update to match sample contribution changes
Modified:
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/build.xml
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/pom.xml
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/SampleJSELauncher.java
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/test/java/launcher/LauncherTestCase.java
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/calculator/CalculatorService.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=946070&r1=946069&r2=946070&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 Wed May
19 07:34:24 2010
@@ -95,5 +95,19 @@
<arg value="contribution-binding-rmi-calculator"/>
</java>
</target>
+
+ <target name="run-contribution-implementation-java-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-implementaton-java-calculator"/>
+ </java>
+ </target>
</project>
Modified: tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/pom.xml?rev=946070&r1=946069&r2=946070&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/pom.xml Wed May 19
07:34:24 2010
@@ -38,24 +38,10 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-feature-api</artifactId>
+ <artifactId>tuscany-feature-all</artifactId>
<type>pom</type>
<version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-feature-core</artifactId>
- <type>pom</type>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-feature-binding-ws</artifactId>
- <type>pom</type>
- <version>2.0-SNAPSHOT</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>junit</groupId>
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=946070&r1=946069&r2=946070&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
Wed May 19 07:34:24 2010
@@ -49,7 +49,9 @@ public class SampleJSELauncher extends R
} else if (contribution.equals("contribution-binding-ws-calculator")){
launcher.launchBindingWSCalculator();
} else if (contribution.equals("contribution-binding-rmi-calculator")){
- launcher.launchBindingRMICalculator();
+ launcher.launchBindingRMICalculator();
+ } else if
(contribution.equals("contribution-implementation-java-calculator")){
+ launcher.launchImplementationJavaCalculator();
} else {
System.out.println("Sample contribution " + contribution + "not
found");
}
@@ -106,6 +108,16 @@ public class SampleJSELauncher extends R
stopNode(node2);
stopNode(node1);
- }
+ }
+
+ /**
+ * The contribution-binding-sca-calculator contribution includes a client
component
+ * that calls the CalculatorServiceComponent from an operation marked by
@Init.
+ */
+ public void launchImplementationJavaCalculator(){
+ Node node = startNode(new Contribution("c1",
"../contribution-implementation-java-calculator/target/classes"));
+
+ stopNode(node);
+ }
}
Modified:
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/test/java/launcher/LauncherTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/test/java/launcher/LauncherTestCase.java?rev=946070&r1=946069&r2=946070&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/test/java/launcher/LauncherTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/test/java/launcher/LauncherTestCase.java
Wed May 19 07:34:24 2010
@@ -26,12 +26,22 @@ import org.junit.Test;
public class LauncherTestCase {
@Test
- public void testCOntributionBindingSCACalculator() throws Exception {
+ public void testContributionBindingSCACalculator() throws Exception {
SampleJSELauncher.main(new String[]
{"contribution-binding-sca-calculator"});
}
@Test
- public void testCOntributionBindingWSCalculator() throws Exception {
+ public void testContributionBindingWSCalculator() throws Exception {
SampleJSELauncher.main(new String[]
{"contribution-binding-ws-calculator"});
- }
+ }
+
+ @Test
+ public void testContributionBindingRMICalculator() throws Exception {
+ SampleJSELauncher.main(new String[]
{"contribution-binding-rmi-calculator"});
+ }
+
+ @Test
+ public void testContributionImplementationJavaCalculator() throws
Exception {
+ SampleJSELauncher.main(new String[]
{"contribution-implementation-java-calculator"});
+ }
}
Modified:
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/calculator/CalculatorService.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/calculator/CalculatorService.java?rev=946070&r1=946069&r2=946070&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/calculator/CalculatorService.java
(original)
+++
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/calculator/CalculatorService.java
Wed May 19 07:34:24 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);
