Add an alternative approach to the helloworld rest sample that reuses the helloworld sample

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1074480 13f79535-47bb-0310-9956-ffa450edef68

8 files changed, 369 insertions, 0 deletions

diff --git a/sca-java-2.x/trunk/unreleased/samples/helloworld-rest-contribution2/README b/sca-java-2.x/trunk/unreleased/samples/helloworld-rest-contribution2/README
new file mode 100644
index 0000000000..83e2302ac1
--- /dev/null
+++ b/sca-java-2.x/trunk/unreleased/samples/helloworld-rest-contribution2/README
@@ -0,0 +1,43 @@
+Tuscany - Getting Started - Helloworld Sample

+---------------------------------------------

+

+This sample demonstrates a simple helloworld style SCA application and how to run that with Tuscany.

+

+See the README in the top-level samples folder for general information on the Tuscany samples.

+

+This project creates an SCA contribution with a deployable composite named helloworld.comosite.

+The composite defines an SCA component, HelloworldComponent, which provides a Helloworld service, 

+the component is implemented by a Java class. 

+

+You can use the contribution by starting the composite in the Tuscany Shell. To do that run the 

+following command in the helloworld-contribution folder:

+

+   mvn tuscany:run 

+

+Alternatively, the Tuscany Shell can be started with the scripts in the Tuscany binary distribution 

+bin folder. To do that run the following command at the root of a Tuscany binary distribution:

+

+   bin\tuscany.bat samples\getting-started\helloworld-contribution  

+

+Once the Shell has been started with one of those methods you can use Shell commands to explore

+the SCA domain, for example, use the "installed" command to get the status of installed contributions, 

+"services" to see the available component services, and you may test calling the helloworld service by 

+using the "invoke" command:

+

+   invoke HelloworldComponent sayHello yourName

+

+---

+ 

+This sample was created by the Tuscany contribution-jar Maven archetype. You can use that archetype to 

+create your own SCA contribution projects by running the following Maven command:

+

+   mvn archetype:generate -DarchetypeCatalog=http://tuscany.apache.org

+

+then at the prompt select 1 to choose the contribution-jar archetype and then answer the questions. 

+This project used the following answers:

+

+   Define value for property 'groupId': : org.apache.tuscany.sca.samples

+   Define value for property 'artifactId': : helloworld-contribution

+   Define value for property 'version': 1.0-SNAPSHOT: 2.0-SNAPSHOT

+   Define value for property 'package': org.apache.tuscany.sca.samples: sample  

+

diff --git a/sca-java-2.x/trunk/unreleased/samples/helloworld-rest-contribution2/helloworld-metadata.xml b/sca-java-2.x/trunk/unreleased/samples/helloworld-rest-contribution2/helloworld-metadata.xml
new file mode 100644
index 0000000000..97f3fd9f10
--- /dev/null
+++ b/sca-java-2.x/trunk/unreleased/samples/helloworld-rest-contribution2/helloworld-metadata.xml
@@ -0,0 +1,25 @@
+<?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">
+   
+   <export.java package="sample" />
+   
+</contribution>
diff --git a/sca-java-2.x/trunk/unreleased/samples/helloworld-rest-contribution2/nodeConfig.xml b/sca-java-2.x/trunk/unreleased/samples/helloworld-rest-contribution2/nodeConfig.xml
new file mode 100644
index 0000000000..64ffd9c40c
--- /dev/null
+++ b/sca-java-2.x/trunk/unreleased/samples/helloworld-rest-contribution2/nodeConfig.xml
@@ -0,0 +1,28 @@
+<?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.
+-->
+<node xmlns="http://tuscany.apache.org/xmlns/sca/1.1">
+
+    <contribution location="../helloworld-contribution/target/helloworld-contribution.jar" 
+                  metaDataURL="helloworld-metadata.xml" />
+
+    <contribution location="target/classes" 
+                  startDeployables="true" />
+
+</node>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/unreleased/samples/helloworld-rest-contribution2/pom.xml b/sca-java-2.x/trunk/unreleased/samples/helloworld-rest-contribution2/pom.xml
new file mode 100644
index 0000000000..8c4f6e021e
--- /dev/null
+++ b/sca-java-2.x/trunk/unreleased/samples/helloworld-rest-contribution2/pom.xml
@@ -0,0 +1,109 @@
+<?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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.tuscany.sca.samples</groupId>
+        <artifactId>tuscany-samples</artifactId>
+        <version>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+   <groupId>org.apache.tuscany.sca.samples</groupId>
+   <artifactId>helloworld-rest-contribution2</artifactId>
+   <version>2.0-SNAPSHOT</version>
+   <packaging>jar</packaging>
+
+   <name>Tuscany Sample Helloworld Rest Contribution2</name>
+
+   <properties>
+      <tuscany.version>2.0-SNAPSHOT</tuscany.version>
+   </properties>
+
+   <dependencies>
+
+      <dependency>
+         <groupId>org.apache.tuscany.sca</groupId>
+         <artifactId>tuscany-sca-api</artifactId>
+         <version>${tuscany.version}</version>
+         <scope>provided</scope>
+      </dependency>
+      
+      <dependency>
+         <groupId>javax.ws.rs</groupId>
+         <artifactId>jsr311-api</artifactId>
+         <version>1.1.1</version>
+         <scope>provided</scope>
+      </dependency>
+
+      <dependency>
+         <groupId>junit</groupId>
+         <artifactId>junit</artifactId>
+         <version>4.8.1</version>
+         <scope>test</scope>
+      </dependency>
+
+      <dependency>
+         <groupId>org.apache.tuscany.sca</groupId>
+         <artifactId>tuscany-base-runtime</artifactId>
+         <version>${tuscany.version}</version>
+         <scope>test</scope>
+      </dependency>
+
+      <dependency>
+         <groupId>org.apache.tuscany.sca</groupId>
+         <artifactId>tuscany-binding-rest-runtime</artifactId>
+         <version>${tuscany.version}</version>
+         <scope>test</scope>
+      </dependency>
+
+      <dependency>
+          <groupId>org.mortbay.jetty</groupId>
+          <artifactId>jetty</artifactId>
+          <version>6.1.19</version>
+          <scope>test</scope>
+      </dependency>
+
+   </dependencies>
+
+   <build>
+      <defaultGoal>install</defaultGoal>
+      <finalName>helloworld-contribution</finalName>
+
+      <plugins>
+         <plugin>
+            <groupId>org.apache.tuscany.maven.plugins</groupId>
+            <artifactId>maven-tuscany-plugin</artifactId>
+            <version>${tuscany.version}</version>
+            <dependencies>
+               <dependency>
+                  <groupId>org.apache.tuscany.sca</groupId>
+                  <artifactId>tuscany-binding-rest-runtime</artifactId>
+                  <version>${tuscany.version}</version>
+               </dependency>
+            </dependencies>
+         </plugin>
+      </plugins>
+
+   </build>
+
+</project>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/unreleased/samples/helloworld-rest-contribution2/src/main/java/sample/JaxrsHelloworld.java b/sca-java-2.x/trunk/unreleased/samples/helloworld-rest-contribution2/src/main/java/sample/JaxrsHelloworld.java
new file mode 100644
index 0000000000..aa0918bbb1
--- /dev/null
+++ b/sca-java-2.x/trunk/unreleased/samples/helloworld-rest-contribution2/src/main/java/sample/JaxrsHelloworld.java
@@ -0,0 +1,34 @@
+/*
+ * 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 sample;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.QueryParam;
+
+import org.oasisopen.sca.annotation.Remotable;
+
+@Remotable
+public interface JaxrsHelloworld {
+
+    @GET
+    @Path("sayHello")
+    String sayHello(@QueryParam("name") String name);
+
+}
diff --git a/sca-java-2.x/trunk/unreleased/samples/helloworld-rest-contribution2/src/main/resources/META-INF/helloworld.composite b/sca-java-2.x/trunk/unreleased/samples/helloworld-rest-contribution2/src/main/resources/META-INF/helloworld.composite
new file mode 100644
index 0000000000..88df3636c3
--- /dev/null
+++ b/sca-java-2.x/trunk/unreleased/samples/helloworld-rest-contribution2/src/main/resources/META-INF/helloworld.composite
@@ -0,0 +1,33 @@
+<?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"

+           name="helloworld-contribution">

+

+    <component name="HelloworldComponent">

+        <implementation.java class="sample.HelloworldImpl"/>

+        <service name="Helloworld">

+            <interface.java interface="sample.JaxrsHelloworld"/>

+            <tuscany:binding.rest/>

+        </service>

+    </component>

+

+</composite>

diff --git a/sca-java-2.x/trunk/unreleased/samples/helloworld-rest-contribution2/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/unreleased/samples/helloworld-rest-contribution2/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..7d237ea63e
--- /dev/null
+++ b/sca-java-2.x/trunk/unreleased/samples/helloworld-rest-contribution2/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,26 @@
+<?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:helloworld-contribution" />
+   <import.java package="sample" />
+
+</contribution>
diff --git a/sca-java-2.x/trunk/unreleased/samples/helloworld-rest-contribution2/src/test/java/sample/HelloworldTestCase.java b/sca-java-2.x/trunk/unreleased/samples/helloworld-rest-contribution2/src/test/java/sample/HelloworldTestCase.java
new file mode 100644
index 0000000000..4749a2eb29
--- /dev/null
+++ b/sca-java-2.x/trunk/unreleased/samples/helloworld-rest-contribution2/src/test/java/sample/HelloworldTestCase.java
@@ -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.    
+ */
+package sample;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+
+import org.apache.tuscany.sca.Node;
+import org.apache.tuscany.sca.TuscanyRuntime;
+import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
+import org.apache.tuscany.sca.monitor.ValidationException;
+import org.apache.tuscany.sca.runtime.ActivationException;
+import org.junit.Assert;
+import org.junit.Test;
+import org.oasisopen.sca.NoSuchServiceException;
+
+public class HelloworldTestCase {
+
+    @Test
+    public void testSayHello() throws NoSuchServiceException, IOException, ContributionReadException, ActivationException, ValidationException {
+
+        // Run the SCA composite in a Tuscany runtime
+        Node node = TuscanyRuntime.newInstance().createNodeFromXML("nodeConfig.xml");
+        try {
+            
+            // test that has exposed an HTTP endpoint that works as expected
+            URL url = new URL("http://localhost:8080/HelloworldComponent/Helloworld/sayHello?name=Amelia");
+            Assert.assertEquals("Hello Amelia", read(url.openStream()));
+            
+        } finally {
+            // Stop the Tuscany runtime Node
+            node.stop();        
+        }
+    }
+    
+    private static String read(InputStream is) throws IOException {
+        BufferedReader reader = null;
+        try {
+            reader = new BufferedReader(new InputStreamReader(is));
+            StringBuffer sb = new StringBuffer();
+            String str;
+            while ((str = reader.readLine()) != null) {
+                sb.append(str);
+            }
+            return sb.toString();
+        } finally {
+            if (reader != null) {
+                reader.close();
+            }
+        }
+    }
+}