You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2010/08/29 10:47:19 UTC
svn commit: r990504 - in /tuscany/sca-java-2.x/trunk/samples: ./
calculator-rest-osgi/ calculator-rest-osgi/META-INF/
calculator-rest-osgi/src/ calculator-rest-osgi/src/main/
calculator-rest-osgi/src/main/java/
calculator-rest-osgi/src/main/java/calcul...
Author: lresende
Date: Sun Aug 29 08:47:18 2010
New Revision: 990504
URL: http://svn.apache.org/viewvc?rev=990504&view=rev
Log:
TUSCANY-3595 - Calculator sample running under OSGi runtime and using REST binding
Added:
tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/
tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/META-INF/
tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/META-INF/MANIFEST.MF
tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/README (with props)
tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/pom.xml (with props)
tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/
tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/
tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/
tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/
tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/AddService.java (with props)
tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/AddServiceImpl.java (with props)
tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/CalculatorActivator.java (with props)
tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/CalculatorService.java (with props)
tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/CalculatorServiceImpl.java (with props)
tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/DivideService.java (with props)
tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/DivideServiceImpl.java (with props)
tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/MultiplyService.java (with props)
tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/MultiplyServiceImpl.java (with props)
tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/SubtractService.java (with props)
tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/SubtractServiceImpl.java (with props)
tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/resources/
tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/resources/Calculator.composite (with props)
tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/test/
tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/test/java/
tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/test/java/calculator/
tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/test/java/calculator/CalculatorTestCase.java (with props)
Modified:
tuscany/sca-java-2.x/trunk/samples/pom.xml
Added: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/META-INF/MANIFEST.MF?rev=990504&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/META-INF/MANIFEST.MF (added)
+++ tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/META-INF/MANIFEST.MF Sun Aug 29 08:47:18 2010
@@ -0,0 +1,19 @@
+Manifest-Version: 1.0
+Private-Package: calculator;version="2.0.0"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Calculator OSGi Sample
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Eclipse-LazyStart: false
+Bundle-Version: 2.0.0
+Bnd-LastModified: 1223949424781
+Bundle-Activator: calculator.CalculatorActivator
+Bundle-ManifestVersion: 2
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Calculator OSGi Sample
+Import-Package: org.apache.tuscany.sca.node;version="2.0.0",
+ org.oasisopen.sca.annotation;version="2.0.0",
+ org.osgi.framework;version="1.4"
+Bundle-SymbolicName: sample-calculator-osgi
+Bundle-DocURL: http://www.apache.org/
+Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
Added: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/README
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/README?rev=990504&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/README (added)
+++ tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/README Sun Aug 29 08:47:18 2010
@@ -0,0 +1,99 @@
+Calculator Sample
+=================
+This sample implements a simple calculator using SCA components and run it in a OSGi environment using the REST binding.
+
+The README in the <distribution-unpack-dir>/samples directory provides
+general instructions about building and running samples. (where
+distribution-unpack-dir is the directory in which you unpacked the tuscany
+binary distribution archive). Take a look there first (noting at you read it that this sample
+is not a new style sample).
+
+If you just want to run it to see what happens open a command prompt, navigate
+to this sample directory and do:
+
+ant run
+
+OR if you don't have ant, on Windows do
+
+java -jar ..\..\features\tuscany-sca-equinox-manifest.jar -composite Calculator.composite -config ..\..\features\configuration\ -ttl 0 target\sample-calculator-osgi.jar
+
+and on *nix do
+
+java -jar ../../features/tuscany-sca-equinox-manifest.jar -composite Calculator.composite -config ../../features/configuration/ -ttl 0 target/sample-calculator-osgi.jar
+
+Sample Overview
+---------------
+The sample provides a single calculator service with a default SCA (java)
+binding. The CalculatorClient exercises this interface by calling add,
+subtract, multiply and divide operations. This results in messages passing to
+the appropriate components in the composite across the local wires.
+
+calculator/
+ src/
+ main/
+ java/
+ calculator/
+ CalculatorService.java - the first component, calls +-/* as
+ appropriate
+ CalculatorServiceImpl.java
+ AddService.java - adds two numbers
+ AddServiceImpl.java
+ SubtractService.java - subtracts one number from another
+ SubtractServiceImpl.java
+ MultiplyService.java - multiplies two numbers
+ MultiplyServiceImpl.java
+ DivideService.java - divides one number by another
+ DivideServiceImpl.java
+ CalculatorClient.java - starts the SCA Runtime and
+ deploys the Calculator.composite.
+ It then calls the deployed Calculator
+ Components services
+ resources/
+ Calculator.composite - the SCA assembly for this sample
+ test/
+ java/
+ calculator/
+ CalculatorTestCase.java - JUnit test case
+ calculator.png - a pictorial representation of the sample
+ .composite file
+ build.xml - the Ant build file
+ pom.xml - the Maven build file
+
+Building And Running The Sample Using Ant
+-----------------------------------------
+With the binary distribution the sample can be built and run using Ant as
+follows
+
+cd calculator
+ant compile
+ant run
+
+You should see the following output from the run target.
+
+run:
+ [java] 3 + 2=5.0
+ [java] 3 - 2=1.0
+ [java] 3 * 2=6.0
+ [java] 3 / 2=1.5
+
+Building And Running The Sample Using Maven
+-------------------------------------------
+With either the binary or source distributions the sample can be built and run
+using Maven as follows.
+
+cd calculator
+mvn
+
+You should see the following output from the test phase.
+
+-------------------------------------------------------
+ T E S T S
+-------------------------------------------------------
+Running calculator.CalculatorTestCase
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.272 sec
+
+Results :
+
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
+
+This shows that the Junit test cases have run successfully.
Propchange: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/README
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/README
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/pom.xml?rev=990504&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/pom.xml (added)
+++ tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/pom.xml Sun Aug 29 08:47:18 2010
@@ -0,0 +1,143 @@
+<?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.
+-->
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-samples</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>sample-calculator-rest-osgi</artifactId>
+ <name>Apache Tuscany SCA Sample Calculator REST OSGi</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-feature-api</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-feature-core</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-rest-runtime</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Explicitly add slf4j so that jabsorb uses the latest versions -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.5.11</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>httpunit</groupId>
+ <artifactId>httpunit</artifactId>
+ <version>1.6.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>${artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.5.1</version>
+ <configuration>
+ <buildcommands>
+ <buildcommand>org.eclipse.pde.ManifestBuilder</buildcommand>
+ <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
+ </buildcommands>
+ <projectnatures>
+ <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+ <projectnature>org.eclipse.pde.PluginNature</projectnature>
+ </projectnatures>
+ <classpathContainers>
+ <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+ </classpathContainers>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>${basedir}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.tuscany.maven.plugins</groupId>
+ <artifactId>maven-osgi-junit-plugin</artifactId>
+ <version>1.0</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-launcher-equinox</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>osgi-test</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>osgi.configuration.area</name>
+ <value>${project.build.directory}/equinox</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/AddService.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/AddService.java?rev=990504&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/AddService.java (added)
+++ tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/AddService.java Sun Aug 29 08:47:18 2010
@@ -0,0 +1,28 @@
+/*
+ * 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 calculator;
+
+/**
+ * The Add service interface
+ */
+public interface AddService {
+
+ double add(double n1, double n2);
+
+}
Propchange: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/AddService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/AddService.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/AddServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/AddServiceImpl.java?rev=990504&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/AddServiceImpl.java (added)
+++ tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/AddServiceImpl.java Sun Aug 29 08:47:18 2010
@@ -0,0 +1,36 @@
+/*
+ * 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 calculator;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * An implementation of the Add service
+ */
+public class AddServiceImpl implements AddService {
+
+ public double add(double n1, double n2) {
+ Logger logger = Logger.getLogger("calculator");
+ logger.log(Level.FINEST, "Adding " + n1 + " and " + n2);
+
+ return n1 + n2;
+ }
+
+}
Propchange: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/AddServiceImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/AddServiceImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/CalculatorActivator.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/CalculatorActivator.java?rev=990504&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/CalculatorActivator.java (added)
+++ tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/CalculatorActivator.java Sun Aug 29 08:47:18 2010
@@ -0,0 +1,54 @@
+/*
+ * 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 calculator;
+
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.ContributionLocationHelper;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+/**
+ * Bundle Activator for Calculator
+ *
+ */
+public class CalculatorActivator implements BundleActivator {
+ private Node node;
+
+ public void start(BundleContext context) throws Exception {
+ try {
+ NodeFactory factory = NodeFactory.newInstance();
+ String url = ContributionLocationHelper.getContributionLocation(getClass());
+ Contribution contrib = new Contribution("c1", url);
+ node = factory.createNode("Calculator.composite", contrib);
+ node.start();
+ } catch (Throwable e) {
+ e.printStackTrace();
+ }
+ }
+
+ public void stop(BundleContext context) throws Exception {
+ if (node != null) {
+ node.stop();
+ node = null;
+ }
+ }
+
+}
Propchange: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/CalculatorActivator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/CalculatorActivator.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/CalculatorService.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/CalculatorService.java?rev=990504&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/CalculatorService.java (added)
+++ tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/CalculatorService.java Sun Aug 29 08:47:18 2010
@@ -0,0 +1,66 @@
+/*
+ * 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 calculator;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.oasisopen.sca.annotation.Remotable;
+
+/**
+ * The Calculator service interface.
+ */
+@Remotable
+public interface CalculatorService {
+
+ @GET
+ @Path("add/{n1}/{n2}")
+ @Consumes(MediaType.TEXT_PLAIN)
+ @Produces(MediaType.TEXT_PLAIN)
+ String add(@PathParam("n1") String n1, @PathParam("n2") String n2);
+
+ @GET
+ @Path("subtract/{n1}/{n2}")
+ @Consumes(MediaType.TEXT_PLAIN)
+ @Produces(MediaType.TEXT_PLAIN)
+ String subtract(@PathParam("n1") String n1, @PathParam("n2") String n2);
+
+ @GET
+ @Path("multiply/{n1}/{n2}")
+ @Consumes(MediaType.TEXT_PLAIN)
+ @Produces(MediaType.TEXT_PLAIN)
+ String multiply(@PathParam("n1") String n1, @PathParam("n2") String n2);
+
+ @GET
+ @Path("divide/{n1}/{n2}")
+ @Consumes(MediaType.TEXT_PLAIN)
+ @Produces(MediaType.TEXT_PLAIN)
+ String divide(@PathParam("n1") String n1, @PathParam("n2") String n2);
+
+ @GET
+ @Path("calculate/{formula}")
+ @Consumes(MediaType.TEXT_PLAIN)
+ @Produces(MediaType.TEXT_PLAIN)
+ String calculate(@PathParam("formula") String formula);
+
+}
Propchange: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/CalculatorService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/CalculatorService.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/CalculatorServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/CalculatorServiceImpl.java?rev=990504&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/CalculatorServiceImpl.java (added)
+++ tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/CalculatorServiceImpl.java Sun Aug 29 08:47:18 2010
@@ -0,0 +1,88 @@
+/*
+ * 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 calculator;
+
+import org.oasisopen.sca.annotation.Reference;
+
+/**
+ * An implementation of the Calculator service.
+ */
+public class CalculatorServiceImpl implements CalculatorService {
+
+ private AddService addService;
+ private SubtractService subtractService;
+ private MultiplyService multiplyService;
+ private DivideService divideService;
+
+ @Reference
+ public void setAddService(AddService addService) {
+ this.addService = addService;
+ }
+
+ @Reference
+ public void setSubtractService(SubtractService subtractService) {
+ this.subtractService = subtractService;
+ }
+
+ @Reference
+ public void setDivideService(DivideService divideService) {
+ this.divideService = divideService;
+ }
+
+ @Reference
+ public void setMultiplyService(MultiplyService multiplyService) {
+ this.multiplyService = multiplyService;
+ }
+
+ public String add(String n1, String n2) {
+ //System.out.println("ADD Operation ==> " + n1 + " + " + n2 + " = " + addService.add(Double.parseDouble(n1), Double.parseDouble(n2)));
+ return String.valueOf(addService.add(Double.parseDouble(n1), Double.parseDouble(n2)));
+ }
+
+ public String subtract(String n1, String n2) {
+ //System.out.println("SUBTRACT Operation ==> " + n1 + " + " + n2 + " = " + subtractService.subtract(Double.parseDouble(n1), Double.parseDouble(n2)));
+ return String.valueOf(subtractService.subtract(Double.parseDouble(n1), Double.parseDouble(n2)));
+ }
+
+ public String multiply(String n1, String n2) {
+ //System.out.println("MULTIPLY Operation ==> " + n1 + " + " + n2 + " = " + multiplyService.multiply(Double.parseDouble(n1), Double.parseDouble(n2)));
+ return String.valueOf(multiplyService.multiply(Double.parseDouble(n1), Double.parseDouble(n2)));
+ }
+
+ public String divide(String n1, String n2) {
+ //System.out.println("DIVIDE Operation ==> " + n1 + " + " + n2 + " = " + divideService.divide(Double.parseDouble(n1), Double.parseDouble(n2)));
+ return String.valueOf(divideService.divide(Double.parseDouble(n1), Double.parseDouble(n2)));
+ }
+
+ public String calculate(String formula) {
+ String[] operands = formula.split("[\\+\\-\\*\\:]");
+ if(formula.contains("+")) {
+ return add( operands[0], operands[1]);
+ } else if(formula.contains("-")) {
+ return subtract( operands[0], operands[1]);
+ } else if(formula.contains("*")) {
+ return multiply( operands[0], operands[1]);
+ } else if(formula.contains(":")) {
+ return divide( operands[0], operands[1]);
+ } else {
+ throw new IllegalArgumentException("Invalid formula: " + formula );
+ }
+ }
+
+}
Propchange: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/CalculatorServiceImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/CalculatorServiceImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/DivideService.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/DivideService.java?rev=990504&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/DivideService.java (added)
+++ tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/DivideService.java Sun Aug 29 08:47:18 2010
@@ -0,0 +1,28 @@
+/*
+ * 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 calculator;
+
+/**
+ * The divide service interface
+ */
+public interface DivideService {
+
+ double divide(double n1, double n2);
+
+}
Propchange: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/DivideService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/DivideService.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/DivideServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/DivideServiceImpl.java?rev=990504&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/DivideServiceImpl.java (added)
+++ tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/DivideServiceImpl.java Sun Aug 29 08:47:18 2010
@@ -0,0 +1,35 @@
+/*
+ * 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 calculator;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * An implementation of the Divide service.
+ */
+public class DivideServiceImpl implements DivideService {
+
+ public double divide(double n1, double n2) {
+ Logger logger = Logger.getLogger("calculator");
+ logger.log(Level.FINEST, "Dividing " + n1 + " with " + n2);
+ return n1 / n2;
+ }
+
+}
Propchange: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/DivideServiceImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/DivideServiceImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/MultiplyService.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/MultiplyService.java?rev=990504&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/MultiplyService.java (added)
+++ tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/MultiplyService.java Sun Aug 29 08:47:18 2010
@@ -0,0 +1,28 @@
+/*
+ * 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 calculator;
+
+/**
+ * The interface for the multiply service
+ */
+public interface MultiplyService {
+
+ double multiply(double n1, double n2);
+
+}
Propchange: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/MultiplyService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/MultiplyService.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/MultiplyServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/MultiplyServiceImpl.java?rev=990504&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/MultiplyServiceImpl.java (added)
+++ tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/MultiplyServiceImpl.java Sun Aug 29 08:47:18 2010
@@ -0,0 +1,35 @@
+/*
+ * 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 calculator;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * An implementation of the Multiply service.
+ */
+public class MultiplyServiceImpl implements MultiplyService {
+
+ public double multiply(double n1, double n2) {
+ Logger logger = Logger.getLogger("calculator");
+ logger.log(Level.FINEST, "Multiplying " + n1 + " with " + n2);
+ return n1 * n2;
+ }
+
+}
Propchange: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/MultiplyServiceImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/MultiplyServiceImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/SubtractService.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/SubtractService.java?rev=990504&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/SubtractService.java (added)
+++ tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/SubtractService.java Sun Aug 29 08:47:18 2010
@@ -0,0 +1,28 @@
+/*
+ * 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 calculator;
+
+/**
+ * The interface for the multiply service
+ */
+public interface SubtractService {
+
+ double subtract(double n1, double n2);
+
+}
Propchange: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/SubtractService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/SubtractService.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/SubtractServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/SubtractServiceImpl.java?rev=990504&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/SubtractServiceImpl.java (added)
+++ tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/SubtractServiceImpl.java Sun Aug 29 08:47:18 2010
@@ -0,0 +1,35 @@
+/*
+ * 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 calculator;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * An implementation of the subtract service.
+ */
+public class SubtractServiceImpl implements SubtractService {
+
+ public double subtract(double n1, double n2) {
+ Logger logger = Logger.getLogger("calculator");
+ logger.log(Level.FINEST, "Subtracting " + n1 + " from " + n2);
+ return n1 - n2;
+ }
+
+}
Propchange: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/SubtractServiceImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/java/calculator/SubtractServiceImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/resources/Calculator.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/resources/Calculator.composite?rev=990504&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/resources/Calculator.composite (added)
+++ tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/resources/Calculator.composite Sun Aug 29 08:47:18 2010
@@ -0,0 +1,55 @@
+<?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"
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
+ targetNamespace="http://sample"
+ xmlns:sample="http://sample"
+ name="Calculator">
+
+ <component name="CalculatorServiceComponent">
+ <implementation.java class="calculator.CalculatorServiceImpl"/>
+ <service name="CalculatorService">
+ <tuscany:binding.rest uri="http://localhost:8085/calculator">
+ <tuscany:operationSelector.jaxrs />
+ </tuscany:binding.rest>
+ </service>
+ <reference name="addService" target="AddServiceComponent" />
+ <reference name="subtractService" target="SubtractServiceComponent" />
+ <reference name="multiplyService" target="MultiplyServiceComponent" />
+ <reference name="divideService" target="DivideServiceComponent" />
+ </component>
+
+ <component name="AddServiceComponent">
+ <implementation.java class="calculator.AddServiceImpl"/>
+ </component>
+
+ <component name="SubtractServiceComponent">
+ <implementation.java class="calculator.SubtractServiceImpl"/>
+ </component>
+
+ <component name="MultiplyServiceComponent">
+ <implementation.java class="calculator.MultiplyServiceImpl"/>
+ </component>
+
+ <component name="DivideServiceComponent">
+ <implementation.java class="calculator.DivideServiceImpl"/>
+ </component>
+
+</composite>
Propchange: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/resources/Calculator.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/resources/Calculator.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/main/resources/Calculator.composite
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/test/java/calculator/CalculatorTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/test/java/calculator/CalculatorTestCase.java?rev=990504&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/test/java/calculator/CalculatorTestCase.java (added)
+++ tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/test/java/calculator/CalculatorTestCase.java Sun Aug 29 08:47:18 2010
@@ -0,0 +1,125 @@
+/*
+ * 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 calculator;
+
+import javax.ws.rs.core.MediaType;
+
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.ContributionLocationHelper;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import com.meterware.httpunit.GetMethodWebRequest;
+import com.meterware.httpunit.WebConversation;
+import com.meterware.httpunit.WebRequest;
+import com.meterware.httpunit.WebResponse;
+
+/**
+ * This shows how to test the Calculator composition.
+ */
+public class CalculatorTestCase {
+ private final static String SERVICE_URL = "http://localhost:8085/calculator/";
+
+ private static Node node;
+
+ @BeforeClass
+ public static void setUpBeforeClass() throws Exception {
+ String location = ContributionLocationHelper.getContributionLocation("Calculator.composite");
+ node = NodeFactory.newInstance().createNode("Calculator.composite", new Contribution("calculator", location));
+ System.out.println("SCA Node API ClassLoader: " + node.getClass().getClassLoader());
+ node.start();
+ }
+
+ @AfterClass
+ public static void tearDownAfterClass() throws Exception {
+ if (node != null) {
+ node.stop();
+ }
+ }
+
+ @Test
+ public void testAdd() throws Exception {
+ String queryString = "/add/3/2";
+
+ WebConversation wc = new WebConversation();
+ WebRequest request = new GetMethodWebRequest(SERVICE_URL + queryString);
+ request.setHeaderField("Content-Type", MediaType.TEXT_PLAIN);
+ WebResponse response = wc.getResource(request);
+
+ Assert.assertEquals(200, response.getResponseCode());
+ Assert.assertEquals("5.0", response.getText());
+ }
+
+ @Test
+ public void testSubtract() throws Exception {
+ String queryString = "/subtract/3/2";
+
+ WebConversation wc = new WebConversation();
+ WebRequest request = new GetMethodWebRequest(SERVICE_URL + queryString);
+ request.setHeaderField("Content-Type", MediaType.TEXT_PLAIN);
+ WebResponse response = wc.getResource(request);
+
+ Assert.assertEquals(200, response.getResponseCode());
+ Assert.assertEquals("1.0", response.getText());
+ }
+
+ @Test
+ public void testMultiply() throws Exception {
+ String queryString = "/multiply/3/2";
+
+ WebConversation wc = new WebConversation();
+ WebRequest request = new GetMethodWebRequest(SERVICE_URL + queryString);
+ request.setHeaderField("Content-Type", MediaType.TEXT_PLAIN);
+ WebResponse response = wc.getResource(request);
+
+ Assert.assertEquals(200, response.getResponseCode());
+ Assert.assertEquals("6.0", response.getText());
+ }
+
+ @Test
+ public void testDivide() throws Exception {
+ String queryString = "/divide/3/2";
+
+ WebConversation wc = new WebConversation();
+ WebRequest request = new GetMethodWebRequest(SERVICE_URL + queryString);
+ request.setHeaderField("Content-Type", MediaType.TEXT_PLAIN);
+ WebResponse response = wc.getResource(request);
+
+ Assert.assertEquals(200, response.getResponseCode());
+ Assert.assertEquals("1.5", response.getText());
+ }
+
+ @Test
+ public void testFormula() throws Exception {
+ String queryString = "/calculate/3+2";
+
+ WebConversation wc = new WebConversation();
+ WebRequest request = new GetMethodWebRequest(SERVICE_URL + queryString);
+ request.setHeaderField("Content-Type", MediaType.TEXT_PLAIN);
+ WebResponse response = wc.getResource(request);
+
+ Assert.assertEquals(200, response.getResponseCode());
+ Assert.assertEquals("5.0", response.getText());
+ }
+
+}
Propchange: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/test/java/calculator/CalculatorTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/samples/calculator-rest-osgi/src/test/java/calculator/CalculatorTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
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=990504&r1=990503&r2=990504&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/pom.xml Sun Aug 29 08:47:18 2010
@@ -31,6 +31,7 @@
<modules>
<module>calculator-osgi</module>
+ <module>calculator-rest-osgi</module>
<module>dosgi-calculator</module>
<module>dosgi-calculator-operations</module>
<module>dosgi-dynamic-calculator</module>