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/05/14 15:15:25 UTC
svn commit: r944245 - in /tuscany/sca-java-2.x/trunk/samples: ./
binding-ws-calculator/ contribution-binding-ws-calculator/
launcher-embedded-jse/ launcher-embedded-jse/src/main/java/launcher/
Author: slaws
Date: Fri May 14 13:15:25 2010
New Revision: 944245
URL: http://svn.apache.org/viewvc?rev=944245&view=rev
Log:
rename binding-ws-calculator to make it clear that it's a contribution (may decide to use subdirectories for this but seeing how we feel about this approach first)
Added:
tuscany/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/
- copied from r943830, tuscany/sca-java-2.x/trunk/samples/binding-ws-calculator/
tuscany/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/build.xml
- copied unchanged from r944187, tuscany/sca-java-2.x/trunk/samples/binding-ws-calculator/build.xml
Removed:
tuscany/sca-java-2.x/trunk/samples/binding-ws-calculator/
Modified:
tuscany/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/pom.xml
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/launcher/SampleJSELauncher.java
tuscany/sca-java-2.x/trunk/samples/pom.xml
Modified: tuscany/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/pom.xml?rev=944245&r1=943830&r2=944245&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/pom.xml Fri May 14 13:15:25 2010
@@ -25,8 +25,8 @@
<version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>sample-binding-ws-calculator</artifactId>
- <name>Apache Tuscany SCA Sample Binding WS Calculator</name>
+ <artifactId>sample-contribution-binding-ws-calculator</artifactId>
+ <name>Apache Tuscany SCA Sample Binding WS Calculator Contribution</name>
<repositories>
<repository>
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=944245&r1=944244&r2=944245&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 Fri May 14 13:15:25 2010
@@ -54,7 +54,7 @@
<echo>Please use 'ant run-name-of-sample-contribution-to-run' </echo>
</target>
- <target name="run-binding-ws-calculator" depends="compile">
+ <target name="run-contribution-binding-ws-calculator" depends="compile">
<java classname="${main.class}"
fork="true"
failonerror="true">
@@ -64,7 +64,7 @@
<include name="tuscany-sca-manifest.jar" />
</fileset>
</classpath>
- <arg value="binding-ws-calculator"/>
+ <arg value="contribution-binding-ws-calculator"/>
</java>
</target>
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=944245&r1=944244&r2=944245&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 Fri May 14 13:15:25 2010
@@ -41,12 +41,12 @@ public class SampleJSELauncher {
if (args == null || args.length != 1){
System.out.println("Please provide the name of the sample contribution to run as a parameter");
System.out.println("Running binding-ws-calculator by default");
- contribution = "binding-ws-calculator";
+ contribution = "contribution-binding-ws-calculator";
} else {
contribution = args[0];
}
- if (contribution.equals("binding-ws-calculator")){
+ if (contribution.equals("contribution-binding-ws-calculator")){
launcher.launchBindingWSCalculator();
} else {
System.out.println("Sample contribution " + contribution + "not found");
@@ -65,11 +65,13 @@ public class SampleJSELauncher {
}
public void launchBindingWSCalculator(){
- Node node = startNode(new Contribution("c1", "../binding-ws-calculator/target/classes"));
+ Node node = startNode(new Contribution("c1", "../contribution-binding-ws-calculator/target/classes"));
CalculatorService calculator = node.getService(CalculatorService.class, "CalculatorServiceComponent");
// TODO - could use JUnit assertions but don't want to have to handle JUnit dependency from Ant script
- if (calculator.add(3, 2) != 5.0){
+ double result = calculator.add(3, 2);
+ System.out.println("3 + 2 = " + result);
+ if (result != 5.0){
throw new SampleLauncherException();
}
Modified: tuscany/sca-java-2.x/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/pom.xml?rev=944245&r1=944244&r2=944245&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/pom.xml Fri May 14 13:15:25 2010
@@ -43,7 +43,6 @@
<activeByDefault>true</activeByDefault>
</activation>
<modules>
- <module>binding-ws-calculator</module>
<module>calculator</module>
<module>calculator-equinox</module>
<module>calculator-osgi</module>
@@ -76,6 +75,30 @@
<module>webapps/helloworld-jsp</module>
<module>webapps/helloworld-stripes</module>
<module>webapps/helloworld-servlet</module>
+
+ <!-- contributions - SCA samples -->
+
+ <module>contribution-binding-ws-calculator</module>
+
+ <!-- contributions - Tuscany samples -->
+
+ <!-- TODO -->
+
+ <!-- contribution launchers -->
+
+ <!-- don't need to process this as it has just a README in it
+ <module>launcher-command-line</module>
+ -->
+ <module>launcher-embedded-jse</module>
+
+ <!-- don't add yet
+ <module>launcher-embedded-osgi</module>
+ -->
+
+ <!-- Application samples -->
+
+ <!-- TODO -->
+
</modules>
</profile>
</profiles>