summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2010-05-06 10:21:28 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2010-05-06 10:21:28 +0000
commite481631e3e943ff5cb9abebafaa6a9c2d229e195 (patch)
tree2c8f45eb739c4c261e5a3a0ea7ed42072b9ab350 /sca-java-2.x/trunk
parent03e0e2517018ae42fe7b4be36eb5559806d69369 (diff)
Move never finished sample from trunk to contrib
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@941643 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk')
-rw-r--r--sca-java-2.x/trunk/samples/webapps/helloworld-rest/README37
-rw-r--r--sca-java-2.x/trunk/samples/webapps/helloworld-rest/pom.xml111
-rw-r--r--sca-java-2.x/trunk/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientJavaTestService.java47
-rw-r--r--sca-java-2.x/trunk/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientTestServiceWebapp.java126
-rw-r--r--sca-java-2.x/trunk/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldService.java31
-rw-r--r--sca-java-2.x/trunk/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldServiceImpl.java62
-rw-r--r--sca-java-2.x/trunk/samples/webapps/helloworld-rest/src/main/resources/rest.composite37
-rw-r--r--sca-java-2.x/trunk/samples/webapps/helloworld-rest/src/main/webapp/HelloWorldJSONRPC.html75
-rw-r--r--sca-java-2.x/trunk/samples/webapps/helloworld-rest/src/main/webapp/META-INF/sca-contribution.xml26
-rw-r--r--sca-java-2.x/trunk/samples/webapps/helloworld-rest/src/main/webapp/WEB-INF/web.xml35
-rw-r--r--sca-java-2.x/trunk/samples/webapps/helloworld-rest/src/main/webapp/style.css22
-rw-r--r--sca-java-2.x/trunk/samples/webapps/helloworld-rest/target/classes/rest.composite37
12 files changed, 0 insertions, 646 deletions
diff --git a/sca-java-2.x/trunk/samples/webapps/helloworld-rest/README b/sca-java-2.x/trunk/samples/webapps/helloworld-rest/README
deleted file mode 100644
index 00568d9bb0..0000000000
--- a/sca-java-2.x/trunk/samples/webapps/helloworld-rest/README
+++ /dev/null
@@ -1,37 +0,0 @@
-Hello World REST Sample
-=======================
-
-Sample Overview
----------------
-The service 'HelloWorldService' is exposed using the REST binding.
-
-helloworld-jsonrpc-webapp/
- src/
- main/
- java/
- helloworldjsonrpc/
- HelloWorldService.java - service interface
- HelloWorldServiceImpl.java - service implementation
- ClientTestServiceWebapp.java - Test class; uses java.net.HttpURLConnection to make 'GET', 'PUT', 'POST requests
- resources/
- rest.composite - the SCA assembly for this sample
- webapp
- META-INF/
- sca-contribution.xml - specifies the composite to be deployed
- WEB-INF/
- web.xml - defines the listener that starts up the
- Tuscany SCA runtime
- pom.xml - the Maven build file
-
-Build the sample using Maven.
-A war 'helloworld-rest-webapp.war' will be created in the target directory. Deploy it in your web container.
-You can access the service from the browser by making a simple GET request using the following URL:
-http://<host>:<port>/helloworld-rest-webapp/HelloWorldService/helloworld/getname
-
-Use the test class 'ClientTestServiceWebapp' to test PUT, POST operations.
-
-
-
-
-
-
diff --git a/sca-java-2.x/trunk/samples/webapps/helloworld-rest/pom.xml b/sca-java-2.x/trunk/samples/webapps/helloworld-rest/pom.xml
deleted file mode 100644
index 70aa3c751c..0000000000
--- a/sca-java-2.x/trunk/samples/webapps/helloworld-rest/pom.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?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-sca</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-helloworld-rest-webapp</artifactId>
- <packaging>war</packaging>
- <name>HelloWorld RESTFul Web Application</name>
-
- <repositories>
- <repository>
- <id>maven2-repository.dev.java.net</id>
- <name>Java.net Repository for Maven</name>
- <url>http://download.java.net/maven/2/</url>
- <layout>default</layout>
- </repository>
- <repository>
- <id>maven-repository.dev.java.net</id>
- <name>Java.net Maven 1 Repository (legacy)</name>
- <url>http://download.java.net/maven/1</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-web-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-rest-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>jsr311-api</artifactId>
- <version>1.0</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-bundle</artifactId>
- <version>1.0.3</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>helloworld-rest</finalName>
- </build>
-
-</project>
diff --git a/sca-java-2.x/trunk/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientJavaTestService.java b/sca-java-2.x/trunk/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientJavaTestService.java
deleted file mode 100644
index 8c84b4f372..0000000000
--- a/sca-java-2.x/trunk/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientJavaTestService.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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 helloworldrest;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-
-/*
- * To test, simply run the program
- * Access the service by invoking the getName() method of HelloWorldService
- */
-
-public class ClientJavaTestService {
-
- /**
- * @param args
- */
- public static void main(String[] args) {
- NodeFactory factory = NodeFactory.newInstance();
- Node node = factory.createNode("rest.composite", ClientJavaTestService.class.getClassLoader()).start();
- HelloWorldService helloService = node.getService(HelloWorldService.class, "HelloWorldRESTServiceComponent");
-
- //HelloWorldService helloService = new HelloWorldServiceImpl();
- System.out.println("### Message from REST service " + helloService.getName());
-
- node.stop();
- node.destroy();
- factory.destroy();
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientTestServiceWebapp.java b/sca-java-2.x/trunk/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientTestServiceWebapp.java
deleted file mode 100644
index 31ff956185..0000000000
--- a/sca-java-2.x/trunk/samples/webapps/helloworld-rest/src/main/java/helloworldrest/ClientTestServiceWebapp.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * 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 helloworldrest;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.Formatter;
-
-/**
- *
- * To test, deploy the application as a webapp.
- * Then, run this file to access the REST web service by making HTTP GET/POST requests
- *
- */
-public class ClientTestServiceWebapp {
-
- final static String UrlBase = "http://localhost:8080/helloworld-rest-webapp/HelloWorldService";
-
- final static class HttpResponse {
- Object content;
- int code;
- String message;
- }
-
- static HttpResponse makeHttpGetRequest(String method, String url, String contentType) throws Exception {
- HttpResponse response = new HttpResponse();
- URL urlAddress = new URL(url);
- HttpURLConnection huc = (HttpURLConnection)urlAddress.openConnection();
- huc.setRequestMethod(method);
- huc.setRequestProperty("Content-type", contentType);
- huc.connect();
- InputStreamReader isr = new InputStreamReader(huc.getInputStream());
-
- BufferedReader in = new BufferedReader(isr);
- String uline = in.readLine();
- response.content = uline;
-
- // huc.disconnect();
- // System.out.println("#### huc disconnected ###");
-
- return response;
- }
-
- static HttpResponse makeHttpRequest(String method, String url, String contentType, InputStream is) throws Exception {
- HttpResponse response = new HttpResponse();
- URL urlAddress = new URL(url);
- HttpURLConnection huc = (HttpURLConnection)urlAddress.openConnection();
- huc.setRequestMethod(method);
- if (null != is) {
- huc.setDoOutput(true);
- huc.setRequestProperty("Content-Type", contentType);
- OutputStream os = huc.getOutputStream();
- byte[] buf = new byte[1024];
- int read;
- while ((read = is.read(buf)) != -1) {
- os.write(buf, 0, read);
- }
- }
- InputStreamReader isr = new InputStreamReader(huc.getInputStream());
- BufferedReader in = new BufferedReader(isr);
- String uline = in.readLine();
- response.content = uline;
- return response;
- }
-
- static HttpResponse makeHttpGetRequest(String method, String url, String contentType, String content)
- throws Exception {
- return makeHttpRequest(method, url, contentType, new ByteArrayInputStream(content.getBytes("UTF-8")));
- }
-
- static HttpResponse makeHttpRequest(String method, String url) throws Exception {
- return makeHttpRequest(method, url, null, (InputStream)null);
- }
-
- public static void main(String[] args) {
- try {
-
- HttpResponse response;
-
- System.out.println("Getting the name *BEFORE* setting it:");
- response = makeHttpGetRequest("GET", UrlBase + "/helloworld/getname", "text/plain");
- System.out.println(new Formatter().format("---- Received String:\n%s", response.content.toString()));
-
- System.out.println("Setting the name:");
- String newText = "Morpheus";
- InputStream inputStream = new ByteArrayInputStream(newText.getBytes());
- response = makeHttpRequest("PUT", UrlBase + "/helloworld/setname", "text/plain", inputStream);
-
- System.out.println("Getting the name *AFTER* setting it:");
- response = makeHttpGetRequest("GET", UrlBase + "/helloworld/getname", "text/plain");
- System.out.println(new Formatter().format("---- Received String:\n%s", response.content.toString()));
-
- System.out.println("POST Operation:");
- response = makeHttpGetRequest("POST", UrlBase + "/helloworld/postoperation/prateek", "text/plain");
- //System.out.println(new Formatter().format("---- Received String:\n%s", response.content.toString()));
-
- System.out.println("Getting the name *AFTER* the POST operation:");
- response = makeHttpGetRequest("GET", UrlBase + "/helloworld/getname", "text/plain");
- System.out.println(new Formatter().format("---- Received String:\n%s", response.content.toString()));
- } catch (Exception e) {
- System.out.println("TEST FAILED! :-(");
- e.printStackTrace(System.out);
- }
- }
-}
diff --git a/sca-java-2.x/trunk/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldService.java b/sca-java-2.x/trunk/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldService.java
deleted file mode 100644
index 7e33b15efc..0000000000
--- a/sca-java-2.x/trunk/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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 helloworldrest;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface HelloWorldService {
-
- public void setName(String name);
-
- public String getName();
-
- public void postOperationTest(String name);
-}
diff --git a/sca-java-2.x/trunk/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldServiceImpl.java
deleted file mode 100644
index d4441c0ab8..0000000000
--- a/sca-java-2.x/trunk/samples/webapps/helloworld-rest/src/main/java/helloworldrest/HelloWorldServiceImpl.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * 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 helloworldrest;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(HelloWorldService.class)
-@Scope("Composite")
-@Path("/helloworld")
-public class HelloWorldServiceImpl implements HelloWorldService {
-
- private String name = new String("original!");
-
- @Path("/setname")
- @PUT
- @Consumes("text/plain")
- public void setName(String name) {
- this.name = name;
-
- }
-
- //http://<host>:<port>/helloworld-rest-webapp/HelloWorldService/helloworld/getname
- @Path("/getname")
- @GET
- @Produces("text/plain")
- public String getName() {
- return this.name;
- }
-
- @POST
- @Path("/postoperation/{name}/")
- @Consumes("text/plain")
- public void postOperationTest(@PathParam("name") String name) {
- this.name = name;
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/webapps/helloworld-rest/src/main/resources/rest.composite b/sca-java-2.x/trunk/samples/webapps/helloworld-rest/src/main/resources/rest.composite
deleted file mode 100644
index 7f76f5946d..0000000000
--- a/sca-java-2.x/trunk/samples/webapps/helloworld-rest/src/main/resources/rest.composite
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="helloworldrest">
-
- <service name="HelloWorldService" promote="HelloWorldRESTServiceComponent/HelloWorldService">
- <interface.java interface="helloworldrest.HelloWorldService"/>
- <tuscany:binding.rest />
- </service>
-
- <component name="HelloWorldRESTServiceComponent">
- <implementation.java class="helloworldrest.HelloWorldServiceImpl"/>
- </component>
-
-</composite>
-
diff --git a/sca-java-2.x/trunk/samples/webapps/helloworld-rest/src/main/webapp/HelloWorldJSONRPC.html b/sca-java-2.x/trunk/samples/webapps/helloworld-rest/src/main/webapp/HelloWorldJSONRPC.html
deleted file mode 100644
index 745164bf8d..0000000000
--- a/sca-java-2.x/trunk/samples/webapps/helloworld-rest/src/main/webapp/HelloWorldJSONRPC.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<html>
-<!--
- * 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.
- -->
- <head>
- <title>Tuscany JSON-RPC HelloWorld Example</TITLE>
-
- <script type="text/javascript" src="SCADomain/scaDomain.js"></script>
-
- <script language="JavaScript">
-
- function getGreeting() {
- var name = document.getElementById("name").value;
- HelloWorldService.getGreetings(name, handleResponse);
- }
-
- function handleResponse(result) {
- document.getElementById('greeting').innerHTML=result;
- }
-
- </script>
-
- <link rel="stylesheet" type="text/css" href="style.css" />
- </head>
-
- <body>
-
- <h2>Tuscany JSON-RPC HelloWorld Sample</h2>
-
- <table>
- <tr>
- <th colspan="2">Non-Dojo Example</th>
- </tr>
- <tr>
- <td colspan="2">
- This example uses the JavaScript served from
- <a href="SCADomain/scaDomain.js">SCADomain/scaDomain.js</a>
- to make JSON-RPC requests to the SCA service 'HelloWorldService'
- </tr>
- <tr>
- <td>Request</td>
- <td>Response</td>
- </tr>
- <tr>
- <td>
- <p>
- Name please: &nbsp;&nbsp;&nbsp;
- <input type="text" id="name" size="30" value="World" />
- <input type="button" value="Submit" onclick="getGreeting()" />
- </p>
-
- </td>
- <td>
- <div id='greeting'>None Yet.</div>
- </td>
- </tr>
- </table>
-
- </body>
-</html>
diff --git a/sca-java-2.x/trunk/samples/webapps/helloworld-rest/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/webapps/helloworld-rest/src/main/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index 9fc16372b3..0000000000
--- a/sca-java-2.x/trunk/samples/webapps/helloworld-rest/src/main/webapp/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample">
- <deployable composite="sample:helloworldrest"/>
-</contribution>
-
diff --git a/sca-java-2.x/trunk/samples/webapps/helloworld-rest/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/webapps/helloworld-rest/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 3a670696e4..0000000000
--- a/sca-java-2.x/trunk/samples/webapps/helloworld-rest/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- * 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.
--->
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
-Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-
- <filter>
- <filter-name>tuscany</filter-name>
- <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>tuscany</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
-</web-app>
diff --git a/sca-java-2.x/trunk/samples/webapps/helloworld-rest/src/main/webapp/style.css b/sca-java-2.x/trunk/samples/webapps/helloworld-rest/src/main/webapp/style.css
deleted file mode 100644
index 0f1cea3aaf..0000000000
--- a/sca-java-2.x/trunk/samples/webapps/helloworld-rest/src/main/webapp/style.css
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * 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.
- */
-* { font-family: arial; }
-
-table, th, td { border: 2px solid blue; border-collapse: collapse; }
-th { color: white; background-color: blue; }
diff --git a/sca-java-2.x/trunk/samples/webapps/helloworld-rest/target/classes/rest.composite b/sca-java-2.x/trunk/samples/webapps/helloworld-rest/target/classes/rest.composite
deleted file mode 100644
index 70b83fd986..0000000000
--- a/sca-java-2.x/trunk/samples/webapps/helloworld-rest/target/classes/rest.composite
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="helloworldrest">
-
- <service name="HelloWorldService" promote="HelloWorldRESTServiceComponent/HelloWorldService">
- <interface.java interface="helloworldrest.HelloWorldService"/>
- <tuscany:binding.rest />
- </service>
-
- <component name="HelloWorldRESTServiceComponent">
- <implementation.java class="helloworldrest.HelloWorldServiceImpl"/>
- </component>
-
-</composite>
-