Author: slaws
Date: Wed May 19 07:32:16 2010
New Revision: 946067
URL: http://svn.apache.org/viewvc?rev=946067&view=rev
Log:
Make module name consistent with other calculator contributions. From previous
discussion we're probably going to move into a sub-directory.
Added:
tuscany/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/
- copied from r945534,
tuscany/sca-java-2.x/trunk/samples/implementation-java-calculator/
tuscany/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/resources/CalculatorClient.composite
tuscany/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/resources/META-INF/
tuscany/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/resources/META-INF/sca-contribution.xml
Removed:
tuscany/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/calculator.png
tuscany/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/calculator.svg
Modified:
tuscany/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/build.xml
tuscany/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/pom.xml
tuscany/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/resources/Calculator.composite
tuscany/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/test/java/calculator/CalculatorTestCase.java
tuscany/sca-java-2.x/trunk/samples/pom.xml
Modified:
tuscany/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/build.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/build.xml?rev=946067&r1=945534&r2=946067&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/build.xml
(original)
+++
tuscany/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/build.xml
Wed May 19 07:32:16 2010
@@ -17,9 +17,12 @@
* under the License.
-->
-<project name="implementation-java-calculator" default="run"> <!-- could
dertmine the same name autmatically -->
+<project name="implementation-java-calculator" default="compile">
- <property name="jar.name"
value="sample-implementation-java-calculator.jar" />
+ <property name="tuscany.home" value="../.."/>
+ <property name="jar.name"
value="contribution-implementation-java-calculator.jar" />
+
+ <echo>${tuscany.home}</echo>
<target name="init">
<delete quiet="true" includeemptydirs="true">
@@ -27,33 +30,27 @@
</delete>
<mkdir dir="target/classes"/>
</target>
-
+
<target name="compile" depends="init">
<javac srcdir="src/main/java"
- destdir="target/classes"
- debug="on"
+ destdir="target/classes"
+ debug="on"
source="1.5"
target="1.5"
- failonerror="true">
- <classpath>
- <pathelement
location="../../modules/tuscany-sca-api-2.0-SNAPSHOT.jar"/>
- </classpath>
+ failonerror="true">
+ <classpath>
+ <fileset dir="${tuscany.home}/lib">
+ <include name="tuscany-sca-api-*.jar" />
+ </fileset>
+ </classpath>
</javac>
<copy todir="target/classes">
<fileset dir="src/main/resources"/>
</copy>
- <jar destfile="target/${jar.name}" basedir="target/classes"/>
- </target>
-
- <target name="run" depends="compile">
- <java classname="org.apache.tuscany.sca.launcher.LauncherMain"
- fork="true"
- inputstring="q"
- failonerror="true">
- <classpath>
- <pathelement location="../../bin/launcher.jar"/>
- </classpath>
- <arg value="target/${jar.name}"/>
- </java>
+ <jar destfile="target/${jar.name}" basedir="target/classes">
+ <manifest>
+ <attribute name="Main-Class" value="${main.class}" />
+ </manifest>
+ </jar>
</target>
</project>
Modified:
tuscany/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/pom.xml?rev=946067&r1=945534&r2=946067&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/pom.xml
(original)
+++
tuscany/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/pom.xml
Wed May 19 07:32:16 2010
@@ -25,8 +25,8 @@
<version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>sample-implementation-java-calculator</artifactId>
- <name>Apache Tuscany SCA Sample Implementation Java Calculator</name>
+ <artifactId>sample-contribution-implementation-java-calculator</artifactId>
+ <name>Apache Tuscany SCA Sample Contribution Implementation Java
Calculator</name>
<repositories>
<repository>
@@ -42,14 +42,7 @@
<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>junit</groupId>
<artifactId>junit</artifactId>
Modified:
tuscany/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/resources/Calculator.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/resources/Calculator.composite?rev=946067&r1=945534&r2=946067&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/resources/Calculator.composite
(original)
+++
tuscany/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/resources/Calculator.composite
Wed May 19 07:32:16 2010
@@ -46,9 +46,4 @@
<implementation.java class="calculator.DivideServiceImpl"/>
</component>
- <component name="CalculatorClient">
- <implementation.java class="calculator.CalculatorClient"/>
- <reference name="calculatorService"
target="CalculatorServiceComponent" />
- </component>
-
</composite>
Added:
tuscany/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/resources/CalculatorClient.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/resources/CalculatorClient.composite?rev=946067&view=auto
==============================================================================
---
tuscany/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/resources/CalculatorClient.composite
(added)
+++
tuscany/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/resources/CalculatorClient.composite
Wed May 19 07:32:16 2010
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912";
+ targetNamespace="http://sample";
+ xmlns:sample="http://sample";
+ name="CalculatorClient">
+
+ <component name="CalculatorClient">
+ <implementation.java class="calculator.CalculatorClient"/>
+ <reference name="calculatorService"
target="CalculatorServiceComponent" />
+ </component>
+
+</composite>
Added:
tuscany/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/resources/META-INF/sca-contribution.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/resources/META-INF/sca-contribution.xml?rev=946067&view=auto
==============================================================================
---
tuscany/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/resources/META-INF/sca-contribution.xml
(added)
+++
tuscany/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/resources/META-INF/sca-contribution.xml
Wed May 19 07:32:16 2010
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912";
+ xmlns:sample="http://sample";>
+ <deployable composite="sample:Calculator"/>
+ <deployable composite="sample:CalculatorClient"/>
+</contribution>
\ No newline at end of file
Modified:
tuscany/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/test/java/calculator/CalculatorTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/test/java/calculator/CalculatorTestCase.java?rev=946067&r1=945534&r2=946067&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/test/java/calculator/CalculatorTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/test/java/calculator/CalculatorTestCase.java
Wed May 19 07:32:16 2010
@@ -18,13 +18,8 @@
*/
package calculator;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.equinox.launcher.Contribution;
-import org.apache.tuscany.sca.node.equinox.launcher.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.equinox.launcher.NodeLauncher;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
+import static org.junit.Assert.assertEquals;
+
import org.junit.Test;
/**
@@ -32,41 +27,23 @@ import org.junit.Test;
*/
public class CalculatorTestCase {
- private static NodeLauncher launcher;
- private static Node node;
- private static String status = "Sample Success";
-
- public static void main(String[] args) throws Exception {
- setUpBeforeClass();
- tearDownAfterClass();
- }
-
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {
- launcher = NodeLauncher.newInstance();
- String location =
ContributionLocationHelper.getContributionLocation(CalculatorClient.class);
- node = launcher.createNode("Calculator.composite", new
Contribution("test", location));
-
- try {
- node.start();
- } catch (Exception ex) {
- status = ex.toString();
- System.out.println(status);
- }
- }
-
- @AfterClass
- public static void tearDownAfterClass() throws Exception {
- if (node != null) {
- node.stop();
- }
- if (launcher != null) {
- launcher.destroy();
- }
- }
-
@Test
- public void testSample() throws Exception {
- Assert.assertEquals("Sample Success", status);
+ public void testCalculator() throws Exception {
+ AddService add = new AddServiceImpl();
+ SubtractService subtract = new SubtractServiceImpl();
+ MultiplyService multiply = new MultiplyServiceImpl();
+ DivideService divide = new DivideServiceImpl();
+
+ CalculatorServiceImpl calculator = new CalculatorServiceImpl();
+
+ calculator.setAddService(add);
+ calculator.setSubtractService(subtract);
+ calculator.setMultiplyService(multiply);
+ calculator.setDivideService(divide);
+
+ 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);
}
}
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=946067&r1=946066&r2=946067&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/pom.xml Wed May 19 07:32:16 2010
@@ -44,8 +44,6 @@
</activation>
<modules>
<module>calculator-osgi</module>
- <module>calculator-rmi-reference</module>
- <module>calculator-rmi-service</module>
<module>dosgi-calculator</module>
<module>dosgi-calculator-operations</module>
<module>dosgi-dynamic-calculator</module>
@@ -62,7 +60,6 @@
********* -->
<module>helloworld-bpel</module>
- <module>implementation-java-calculator</module>
<module>store</module>
<module>store-webapp</module>
<module>webapps/helloworld</module>
@@ -78,6 +75,8 @@
<module>contribution-binding-sca-calculator</module>
<module>contribution-binding-ws-calculator</module>
+ <module>binding-rmi</module>
+ <module>contribution-implementation-java-calculator</module>
<!-- contributions - Tuscany samples -->
