Author: slaws
Date: Fri May 14 11:13:42 2010
New Revision: 944207
URL: http://svn.apache.org/viewvc?rev=944207&view=rev
Log:
Make ant script work for JSE launcher. compiles with base jar but doesn't run
with it at the moment.
Added:
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/SampleLauncherException.java
Modified:
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/SampleJSELauncher.java
Added: 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=944207&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/build.xml (added)
+++ tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/build.xml Fri May
14 11:13:42 2010
@@ -0,0 +1,71 @@
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<project name="binding-ws-calculator" default="run">
+ <property name="tuscany.home" value="../.."/>
+ <property name="jar.name" value="sample-launcher-embedded-jse.jar" />
+ <property name="main.class" value="launcher.SampleJSELauncher" />
+
+ <echo>${tuscany.home}</echo>
+
+ <target name="init">
+ <delete quiet="true" includeemptydirs="true">
+ <fileset dir="target"/>
+ </delete>
+ <mkdir dir="target/classes"/>
+ </target>
+
+ <target name="compile" depends="init">
+ <javac srcdir="src/main/java"
+ destdir="target/classes"
+ debug="on"
+ source="1.5"
+ target="1.5"
+ failonerror="true">
+ <classpath>
+ <fileset dir="${tuscany.home}/lib">
+ <include name="tuscany-base-*.jar" />
+ </fileset>
+ </classpath>
+ </javac>
+ <jar destfile="target/${jar.name}" basedir="target/classes">
+ <manifest>
+ <attribute name="Main-Class" value="${main.class}" />
+ </manifest>
+ </jar>
+ </target>
+
+ <target name="run" depends="compile">
+ <echo>Please use 'ant run-name-of-sample-contribution-to-run'
</echo>
+ </target>
+
+ <target name="run-binding-ws-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="binding-ws-calculator"/>
+ </java>
+ </target>
+
+</project>
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=944207&r1=944206&r2=944207&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 11:13:42 2010
@@ -19,11 +19,10 @@
package launcher;
-import static org.junit.Assert.assertEquals;
-
import org.apache.tuscany.sca.node.Contribution;
import org.apache.tuscany.sca.node.Node;
import org.apache.tuscany.sca.node.NodeFactory;
+import org.oasisopen.sca.ServiceRuntimeException;
import calculator.CalculatorService;
@@ -37,7 +36,22 @@ public class SampleJSELauncher {
public static void main(String[] args) throws Exception {
SampleJSELauncher launcher = new SampleJSELauncher();
- launcher.launchBindingWSCalculator();
+ String contribution = null;
+
+ 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";
+ } else {
+ contribution = args[0];
+ }
+
+ if (contribution.equals("binding-ws-calculator")){
+ launcher.launchBindingWSCalculator();
+ } else {
+ System.out.println("Sample contribution " + contribution + "not
found");
+ }
+
}
public Node startNode(Contribution... contributions){
@@ -54,10 +68,10 @@ public class SampleJSELauncher {
Node node = startNode(new Contribution("c1",
"../binding-ws-calculator/target/classes"));
CalculatorService calculator =
node.getService(CalculatorService.class, "CalculatorServiceComponent");
- assertEquals(calculator.add(3, 2), 5.0, 0);
- assertEquals(calculator.subtract(3, 2), 1.0, 0);
- assertEquals(calculator.multiply(3, 2), 6.0, 0);
- assertEquals(calculator.divide(3, 2), 1.5, 0);
+ // 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){
+ throw new SampleLauncherException();
+ }
stopNode(node);
}
Added:
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/SampleLauncherException.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/SampleLauncherException.java?rev=944207&view=auto
==============================================================================
---
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/SampleLauncherException.java
(added)
+++
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/SampleLauncherException.java
Fri May 14 11:13:42 2010
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package launcher;
+
+/**
+ * This exception signals problems in the management of SCA component
execution.
+ */
+public class SampleLauncherException extends RuntimeException {
+ /**
+ * Constructs a SampleLauncherException with no detail message.
+ */
+ public SampleLauncherException() {
+ super();
+ }
+
+ /**
+ * Constructs a SampleLauncherException with the specified detail
+ * message.
+ *
+ * @param message the detail message
+ */
+ public SampleLauncherException(String message) {
+ super(message);
+ }
+
+}
