From ef55c9dca035f81e5637c4af297ce2baafc8f060 Mon Sep 17 00:00:00 2001
From: fmoga <fmoga@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 20 Sep 2010 13:02:40 +0000
Subject: Moved some of the samples into the apropriate section.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@998913 13f79535-47bb-0310-9956-ffa450edef68
---
 .../implementation-web/helloworld-jaxrs/README     |   7 +
 .../implementation-web/helloworld-jaxrs/pom.xml    | 116 +++++++++++++
 .../src/main/java/sample/HelloWorldResource.java   |  68 ++++++++
 .../src/main/java/sample/HelloworldService.java    |  25 +++
 .../main/java/sample/HelloworldServiceImpl.java    |  28 +++
 .../src/main/webapp/WEB-INF/application            |  14 ++
 .../src/main/webapp/WEB-INF/web.composite          |  34 ++++
 .../src/main/webapp/WEB-INF/web.xml                |  49 ++++++
 .../src/test/java/itest/HelloworldTestCase.java    |  43 +++++
 .../implementation-web/helloworld-js-client/README |   7 +
 .../helloworld-js-client/pom.xml                   | 104 +++++++++++
 .../src/main/java/sample/HelloworldService.java    |  25 +++
 .../main/java/sample/HelloworldServiceImpl.java    |  28 +++
 .../src/main/webapp/WEB-INF/web.composite          |  36 ++++
 .../src/main/webapp/WEB-INF/web.xml                |  41 +++++
 .../src/main/webapp/hello.html                     |  51 ++++++
 .../src/test/java/itest/HelloworldTestCase.java    |  75 ++++++++
 .../implementation-web/helloworld-jsf/pom.xml      |  99 +++++++++++
 .../src/main/java/sample/HelloWorldController.java |  56 ++++++
 .../src/main/java/sample/HelloworldService.java    |  25 +++
 .../main/java/sample/HelloworldServiceImpl.java    |  27 +++
 .../src/main/webapp/WEB-INF/faces-config.xml       |  51 ++++++
 .../src/main/webapp/WEB-INF/web.composite          |  34 ++++
 .../helloworld-jsf/src/main/webapp/WEB-INF/web.xml | 191 +++++++++++++++++++++
 .../helloworld-jsf/src/main/webapp/helloWorld.jsp  |  40 +++++
 .../helloworld-jsf/src/main/webapp/index.jsp       |  23 +++
 .../helloworld-jsf/src/main/webapp/page2.jsp       |  38 ++++
 .../helloworld-spring-contribution/pom.xml         |  67 ++++++++
 .../src/main/java/sample/DateService.java          |  29 ++++
 .../src/main/java/sample/DateServiceImpl.java      |  37 ++++
 .../src/main/java/sample/Helloworld.java           |  28 +++
 .../src/main/java/sample/HelloworldClientImpl.java |  48 ++++++
 .../src/main/java/sample/HelloworldImpl.java       |  34 ++++
 .../main/resources/META-INF/sca-contribution.xml   |  23 +++
 .../main/resources/helloworld-client-context.xml   |  37 ++++
 .../src/main/resources/helloworld-context.xml      |  30 ++++
 .../src/main/resources/helloworld.composite        |  36 ++++
 .../src/test/java/sample/HelloworldTestCase.java   |  33 ++++
 .../helloworld-spring-webapp/pom.xml               | 186 ++++++++++++++++++++
 .../src/main/webapp/WEB-INF/web.xml                |  51 ++++++
 .../test/java/sample/HelloworldClientTestCase.java |  58 +++++++
 .../src/test/resources/test-web.xml                |  25 +++
 .../implementation-web/helloworld-jsp/README       |   7 +
 .../implementation-web/helloworld-jsp/pom.xml      |  98 +++++++++++
 .../src/main/java/sample/HelloworldService.java    |  25 +++
 .../main/java/sample/HelloworldServiceImpl.java    |  28 +++
 .../src/main/webapp/WEB-INF/web.composite          |  34 ++++
 .../helloworld-jsp/src/main/webapp/WEB-INF/web.xml |  41 +++++
 .../helloworld-jsp/src/main/webapp/hello.jsp       |  37 ++++
 .../src/test/java/itest/HelloworldTestCase.java    |  53 ++++++
 .../implementation-web/helloworld-servlet/README   |   7 +
 .../implementation-web/helloworld-servlet/pom.xml  | 105 +++++++++++
 .../src/main/java/sample/HelloworldService.java    |  25 +++
 .../main/java/sample/HelloworldServiceImpl.java    |  27 +++
 .../src/main/java/sample/HelloworldServlet.java    |  64 +++++++
 .../src/main/webapp/WEB-INF/web.composite          |  34 ++++
 .../src/main/webapp/WEB-INF/web.xml                |  44 +++++
 .../helloworld-servlet/src/main/webapp/hello.html  |  46 +++++
 .../src/test/java/itest/HelloworldTestCase.java    |  55 ++++++
 sandbox/samples/temp/helloworld-jaxrs/README       |   7 -
 sandbox/samples/temp/helloworld-jaxrs/pom.xml      | 116 -------------
 .../src/main/java/sample/HelloWorldResource.java   |  68 --------
 .../src/main/java/sample/HelloworldService.java    |  25 ---
 .../main/java/sample/HelloworldServiceImpl.java    |  28 ---
 .../src/main/webapp/WEB-INF/application            |  14 --
 .../src/main/webapp/WEB-INF/web.composite          |  34 ----
 .../src/main/webapp/WEB-INF/web.xml                |  49 ------
 .../src/test/java/itest/HelloworldTestCase.java    |  43 -----
 sandbox/samples/temp/helloworld-js-client/README   |   7 -
 sandbox/samples/temp/helloworld-js-client/pom.xml  | 104 -----------
 .../src/main/java/sample/HelloworldService.java    |  25 ---
 .../main/java/sample/HelloworldServiceImpl.java    |  28 ---
 .../src/main/webapp/WEB-INF/web.composite          |  36 ----
 .../src/main/webapp/WEB-INF/web.xml                |  41 -----
 .../src/main/webapp/hello.html                     |  51 ------
 .../src/test/java/itest/HelloworldTestCase.java    |  75 --------
 sandbox/samples/temp/helloworld-jsf/pom.xml        |  99 -----------
 .../src/main/java/sample/HelloWorldController.java |  56 ------
 .../src/main/java/sample/HelloworldService.java    |  25 ---
 .../main/java/sample/HelloworldServiceImpl.java    |  27 ---
 .../src/main/webapp/WEB-INF/faces-config.xml       |  51 ------
 .../src/main/webapp/WEB-INF/web.composite          |  34 ----
 .../helloworld-jsf/src/main/webapp/WEB-INF/web.xml | 191 ---------------------
 .../helloworld-jsf/src/main/webapp/helloWorld.jsp  |  40 -----
 .../temp/helloworld-jsf/src/main/webapp/index.jsp  |  23 ---
 .../temp/helloworld-jsf/src/main/webapp/page2.jsp  |  38 ----
 sandbox/samples/temp/helloworld-jsp/README         |   7 -
 sandbox/samples/temp/helloworld-jsp/pom.xml        |  98 -----------
 .../src/main/java/sample/HelloworldService.java    |  25 ---
 .../main/java/sample/HelloworldServiceImpl.java    |  28 ---
 .../src/main/webapp/WEB-INF/web.composite          |  34 ----
 .../helloworld-jsp/src/main/webapp/WEB-INF/web.xml |  41 -----
 .../temp/helloworld-jsp/src/main/webapp/hello.jsp  |  37 ----
 .../src/test/java/itest/HelloworldTestCase.java    |  53 ------
 sandbox/samples/temp/helloworld-servlet/README     |   7 -
 sandbox/samples/temp/helloworld-servlet/pom.xml    | 105 -----------
 .../src/main/java/sample/HelloworldService.java    |  25 ---
 .../main/java/sample/HelloworldServiceImpl.java    |  27 ---
 .../src/main/java/sample/HelloworldServlet.java    |  64 -------
 .../src/main/webapp/WEB-INF/web.composite          |  34 ----
 .../src/main/webapp/WEB-INF/web.xml                |  44 -----
 .../helloworld-servlet/src/main/webapp/hello.html  |  46 -----
 .../src/test/java/itest/HelloworldTestCase.java    |  55 ------
 .../temp/helloworld-spring-contribution/pom.xml    |  67 --------
 .../src/main/java/sample/DateService.java          |  29 ----
 .../src/main/java/sample/DateServiceImpl.java      |  37 ----
 .../src/main/java/sample/Helloworld.java           |  28 ---
 .../src/main/java/sample/HelloworldClientImpl.java |  48 ------
 .../src/main/java/sample/HelloworldImpl.java       |  34 ----
 .../main/resources/META-INF/sca-contribution.xml   |  23 ---
 .../main/resources/helloworld-client-context.xml   |  37 ----
 .../src/main/resources/helloworld-context.xml      |  30 ----
 .../src/main/resources/helloworld.composite        |  36 ----
 .../src/test/java/sample/HelloworldTestCase.java   |  33 ----
 .../samples/temp/helloworld-spring-webapp/pom.xml  | 186 --------------------
 .../src/main/webapp/WEB-INF/web.xml                |  51 ------
 .../test/java/sample/HelloworldClientTestCase.java |  58 -------
 .../src/test/resources/test-web.xml                |  25 ---
 118 files changed, 2787 insertions(+), 2787 deletions(-)
 create mode 100644 sandbox/samples/sca-extensions/implementation-web/helloworld-jaxrs/README
 create mode 100644 sandbox/samples/sca-extensions/implementation-web/helloworld-jaxrs/pom.xml
 create mode 100644 sandbox/samples/sca-extensions/implementation-web/helloworld-jaxrs/src/main/java/sample/HelloWorldResource.java
 create mode 100644 sandbox/samples/sca-extensions/implementation-web/helloworld-jaxrs/src/main/java/sample/HelloworldService.java
 create mode 100644 sandbox/samples/sca-extensions/implementation-web/helloworld-jaxrs/src/main/java/sample/HelloworldServiceImpl.java
 create mode 100644 sandbox/samples/sca-extensions/implementation-web/helloworld-jaxrs/src/main/webapp/WEB-INF/application
 create mode 100644 sandbox/samples/sca-extensions/implementation-web/helloworld-jaxrs/src/main/webapp/WEB-INF/web.composite
 create mode 100644 sandbox/samples/sca-extensions/implementation-web/helloworld-jaxrs/src/main/webapp/WEB-INF/web.xml
 create mode 100644 sandbox/samples/sca-extensions/implementation-web/helloworld-jaxrs/src/test/java/itest/HelloworldTestCase.java
 create mode 100644 sandbox/samples/sca-extensions/implementation-web/helloworld-js-client/README
 create mode 100644 sandbox/samples/sca-extensions/implementation-web/helloworld-js-client/pom.xml
 create mode 100644 sandbox/samples/sca-extensions/implementation-web/helloworld-js-client/src/main/java/sample/HelloworldService.java
 create mode 100644 sandbox/samples/sca-extensions/implementation-web/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java
 create mode 100644 sandbox/samples/sca-extensions/implementation-web/helloworld-js-client/src/main/webapp/WEB-INF/web.composite
 create mode 100644 sandbox/samples/sca-extensions/implementation-web/helloworld-js-client/src/main/webapp/WEB-INF/web.xml
 create mode 100644 sandbox/samples/sca-extensions/implementation-web/helloworld-js-client/src/main/webapp/hello.html
 create mode 100644 sandbox/samples/sca-extensions/implementation-web/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java
 create mode 100644 sandbox/samples/sca-extensions/implementation-web/helloworld-jsf/pom.xml
 create mode 100644 sandbox/samples/sca-extensions/implementation-web/helloworld-jsf/src/main/java/sample/HelloWorldController.java
 create mode 100644 sandbox/samples/sca-extensions/implementation-web/helloworld-jsf/src/main/java/sample/HelloworldService.java
 create mode 100644 sandbox/samples/sca-extensions/implementation-web/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java
 create mode 100644 sandbox/samples/sca-extensions/implementation-web/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml
 create mode 100644 sandbox/samples/sca-extensions/implementation-web/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
 create mode 100644 sandbox/samples/sca-extensions/implementation-web/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
 create mode 100644 sandbox/samples/sca-extensions/implementation-web/helloworld-jsf/src/main/webapp/helloWorld.jsp
 create mode 100644 sandbox/samples/sca-extensions/implementation-web/helloworld-jsf/src/main/webapp/index.jsp
 create mode 100644 sandbox/samples/sca-extensions/implementation-web/helloworld-jsf/src/main/webapp/page2.jsp
 create mode 100644 sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/pom.xml
 create mode 100644 sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/java/sample/DateService.java
 create mode 100644 sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/java/sample/DateServiceImpl.java
 create mode 100644 sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/java/sample/Helloworld.java
 create mode 100644 sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/java/sample/HelloworldClientImpl.java
 create mode 100644 sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/java/sample/HelloworldImpl.java
 create mode 100644 sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/resources/META-INF/sca-contribution.xml
 create mode 100644 sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-client-context.xml
 create mode 100644 sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-context.xml
 create mode 100644 sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld.composite
 create mode 100644 sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/test/java/sample/HelloworldTestCase.java
 create mode 100644 sandbox/samples/sca-features/implementation-spring/helloworld-spring-webapp/pom.xml
 create mode 100644 sandbox/samples/sca-features/implementation-spring/helloworld-spring-webapp/src/main/webapp/WEB-INF/web.xml
 create mode 100644 sandbox/samples/sca-features/implementation-spring/helloworld-spring-webapp/src/test/java/sample/HelloworldClientTestCase.java
 create mode 100644 sandbox/samples/sca-features/implementation-spring/helloworld-spring-webapp/src/test/resources/test-web.xml
 create mode 100644 sandbox/samples/sca-features/implementation-web/helloworld-jsp/README
 create mode 100644 sandbox/samples/sca-features/implementation-web/helloworld-jsp/pom.xml
 create mode 100644 sandbox/samples/sca-features/implementation-web/helloworld-jsp/src/main/java/sample/HelloworldService.java
 create mode 100644 sandbox/samples/sca-features/implementation-web/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
 create mode 100644 sandbox/samples/sca-features/implementation-web/helloworld-jsp/src/main/webapp/WEB-INF/web.composite
 create mode 100644 sandbox/samples/sca-features/implementation-web/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
 create mode 100644 sandbox/samples/sca-features/implementation-web/helloworld-jsp/src/main/webapp/hello.jsp
 create mode 100644 sandbox/samples/sca-features/implementation-web/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java
 create mode 100644 sandbox/samples/sca-features/implementation-web/helloworld-servlet/README
 create mode 100644 sandbox/samples/sca-features/implementation-web/helloworld-servlet/pom.xml
 create mode 100644 sandbox/samples/sca-features/implementation-web/helloworld-servlet/src/main/java/sample/HelloworldService.java
 create mode 100644 sandbox/samples/sca-features/implementation-web/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
 create mode 100644 sandbox/samples/sca-features/implementation-web/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
 create mode 100644 sandbox/samples/sca-features/implementation-web/helloworld-servlet/src/main/webapp/WEB-INF/web.composite
 create mode 100644 sandbox/samples/sca-features/implementation-web/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
 create mode 100644 sandbox/samples/sca-features/implementation-web/helloworld-servlet/src/main/webapp/hello.html
 create mode 100644 sandbox/samples/sca-features/implementation-web/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java
 delete mode 100644 sandbox/samples/temp/helloworld-jaxrs/README
 delete mode 100644 sandbox/samples/temp/helloworld-jaxrs/pom.xml
 delete mode 100644 sandbox/samples/temp/helloworld-jaxrs/src/main/java/sample/HelloWorldResource.java
 delete mode 100644 sandbox/samples/temp/helloworld-jaxrs/src/main/java/sample/HelloworldService.java
 delete mode 100644 sandbox/samples/temp/helloworld-jaxrs/src/main/java/sample/HelloworldServiceImpl.java
 delete mode 100644 sandbox/samples/temp/helloworld-jaxrs/src/main/webapp/WEB-INF/application
 delete mode 100644 sandbox/samples/temp/helloworld-jaxrs/src/main/webapp/WEB-INF/web.composite
 delete mode 100644 sandbox/samples/temp/helloworld-jaxrs/src/main/webapp/WEB-INF/web.xml
 delete mode 100644 sandbox/samples/temp/helloworld-jaxrs/src/test/java/itest/HelloworldTestCase.java
 delete mode 100644 sandbox/samples/temp/helloworld-js-client/README
 delete mode 100644 sandbox/samples/temp/helloworld-js-client/pom.xml
 delete mode 100644 sandbox/samples/temp/helloworld-js-client/src/main/java/sample/HelloworldService.java
 delete mode 100644 sandbox/samples/temp/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java
 delete mode 100644 sandbox/samples/temp/helloworld-js-client/src/main/webapp/WEB-INF/web.composite
 delete mode 100644 sandbox/samples/temp/helloworld-js-client/src/main/webapp/WEB-INF/web.xml
 delete mode 100644 sandbox/samples/temp/helloworld-js-client/src/main/webapp/hello.html
 delete mode 100644 sandbox/samples/temp/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java
 delete mode 100644 sandbox/samples/temp/helloworld-jsf/pom.xml
 delete mode 100644 sandbox/samples/temp/helloworld-jsf/src/main/java/sample/HelloWorldController.java
 delete mode 100644 sandbox/samples/temp/helloworld-jsf/src/main/java/sample/HelloworldService.java
 delete mode 100644 sandbox/samples/temp/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java
 delete mode 100644 sandbox/samples/temp/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml
 delete mode 100644 sandbox/samples/temp/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
 delete mode 100644 sandbox/samples/temp/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
 delete mode 100644 sandbox/samples/temp/helloworld-jsf/src/main/webapp/helloWorld.jsp
 delete mode 100644 sandbox/samples/temp/helloworld-jsf/src/main/webapp/index.jsp
 delete mode 100644 sandbox/samples/temp/helloworld-jsf/src/main/webapp/page2.jsp
 delete mode 100644 sandbox/samples/temp/helloworld-jsp/README
 delete mode 100644 sandbox/samples/temp/helloworld-jsp/pom.xml
 delete mode 100644 sandbox/samples/temp/helloworld-jsp/src/main/java/sample/HelloworldService.java
 delete mode 100644 sandbox/samples/temp/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
 delete mode 100644 sandbox/samples/temp/helloworld-jsp/src/main/webapp/WEB-INF/web.composite
 delete mode 100644 sandbox/samples/temp/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
 delete mode 100644 sandbox/samples/temp/helloworld-jsp/src/main/webapp/hello.jsp
 delete mode 100644 sandbox/samples/temp/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java
 delete mode 100644 sandbox/samples/temp/helloworld-servlet/README
 delete mode 100644 sandbox/samples/temp/helloworld-servlet/pom.xml
 delete mode 100644 sandbox/samples/temp/helloworld-servlet/src/main/java/sample/HelloworldService.java
 delete mode 100644 sandbox/samples/temp/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
 delete mode 100644 sandbox/samples/temp/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
 delete mode 100644 sandbox/samples/temp/helloworld-servlet/src/main/webapp/WEB-INF/web.composite
 delete mode 100644 sandbox/samples/temp/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
 delete mode 100644 sandbox/samples/temp/helloworld-servlet/src/main/webapp/hello.html
 delete mode 100644 sandbox/samples/temp/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java
 delete mode 100644 sandbox/samples/temp/helloworld-spring-contribution/pom.xml
 delete mode 100644 sandbox/samples/temp/helloworld-spring-contribution/src/main/java/sample/DateService.java
 delete mode 100644 sandbox/samples/temp/helloworld-spring-contribution/src/main/java/sample/DateServiceImpl.java
 delete mode 100644 sandbox/samples/temp/helloworld-spring-contribution/src/main/java/sample/Helloworld.java
 delete mode 100644 sandbox/samples/temp/helloworld-spring-contribution/src/main/java/sample/HelloworldClientImpl.java
 delete mode 100644 sandbox/samples/temp/helloworld-spring-contribution/src/main/java/sample/HelloworldImpl.java
 delete mode 100644 sandbox/samples/temp/helloworld-spring-contribution/src/main/resources/META-INF/sca-contribution.xml
 delete mode 100644 sandbox/samples/temp/helloworld-spring-contribution/src/main/resources/helloworld-client-context.xml
 delete mode 100644 sandbox/samples/temp/helloworld-spring-contribution/src/main/resources/helloworld-context.xml
 delete mode 100644 sandbox/samples/temp/helloworld-spring-contribution/src/main/resources/helloworld.composite
 delete mode 100644 sandbox/samples/temp/helloworld-spring-contribution/src/test/java/sample/HelloworldTestCase.java
 delete mode 100644 sandbox/samples/temp/helloworld-spring-webapp/pom.xml
 delete mode 100644 sandbox/samples/temp/helloworld-spring-webapp/src/main/webapp/WEB-INF/web.xml
 delete mode 100644 sandbox/samples/temp/helloworld-spring-webapp/src/test/java/sample/HelloworldClientTestCase.java
 delete mode 100644 sandbox/samples/temp/helloworld-spring-webapp/src/test/resources/test-web.xml

(limited to 'sandbox/samples')

diff --git a/sandbox/samples/sca-extensions/implementation-web/helloworld-jaxrs/README b/sandbox/samples/sca-extensions/implementation-web/helloworld-jaxrs/README
new file mode 100644
index 0000000000..828aadb0f1
--- /dev/null
+++ b/sandbox/samples/sca-extensions/implementation-web/helloworld-jaxrs/README
@@ -0,0 +1,7 @@
+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). 
+
+TODO - finish
\ No newline at end of file
diff --git a/sandbox/samples/sca-extensions/implementation-web/helloworld-jaxrs/pom.xml b/sandbox/samples/sca-extensions/implementation-web/helloworld-jaxrs/pom.xml
new file mode 100644
index 0000000000..f414d87837
--- /dev/null
+++ b/sandbox/samples/sca-extensions/implementation-web/helloworld-jaxrs/pom.xml
@@ -0,0 +1,116 @@
+<?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-helloworld-jaxrs-webapp</artifactId>
+    <packaging>war</packaging>
+    <name>Apache Tuscany SCA Sample Helloworld JAX-RS</name>
+
+    <dependencies>
+
+        <!-- Tuscany dependency -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca.shades</groupId>
+            <artifactId>tuscany-base-nodep</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <!-- Wink dependency for JAX-RS support -->
+        <dependency>
+            <groupId>org.apache.wink</groupId>
+            <artifactId>wink-common</artifactId>
+            <version>1.1.1-incubating</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.wink</groupId>
+            <artifactId>wink-server</artifactId>
+            <version>1.1.1-incubating</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.6.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>net.sourceforge.htmlunit</groupId>
+            <artifactId>htmlunit</artifactId>
+            <version>2.6</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+       <finalName>helloworld-jaxrs</finalName>
+       <plugins>
+          <plugin>
+             <groupId>org.mortbay.jetty</groupId>
+             <artifactId>maven-jetty-plugin</artifactId>
+             <version>6.1.18</version>
+             <configuration>
+                <contextPath>helloworld-jaxrs</contextPath>
+                <stopKey>foo</stopKey>
+                <stopPort>9999</stopPort>
+             </configuration>
+             <executions>
+                <execution>
+                   <id>start-jetty</id>
+                   <phase>process-test-classes</phase>
+                   <goals>
+                       <goal>run</goal>
+                   </goals>
+                   <configuration>
+                       <scanIntervalSeconds>0</scanIntervalSeconds>
+                       <daemon>true</daemon>
+                       <connectors>
+                          <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+                             <port>8085</port>
+                          </connector>
+                       </connectors>
+                   </configuration>
+                </execution>
+                <execution>
+                   <id>stop-jetty</id>
+                   <phase>prepare-package</phase>
+                   <goals>
+                       <goal>stop</goal>
+                   </goals>
+                </execution>
+             </executions>
+          </plugin>
+       </plugins>
+    </build>
+
+</project>
diff --git a/sandbox/samples/sca-extensions/implementation-web/helloworld-jaxrs/src/main/java/sample/HelloWorldResource.java b/sandbox/samples/sca-extensions/implementation-web/helloworld-jaxrs/src/main/java/sample/HelloWorldResource.java
new file mode 100644
index 0000000000..42625b8a78
--- /dev/null
+++ b/sandbox/samples/sca-extensions/implementation-web/helloworld-jaxrs/src/main/java/sample/HelloWorldResource.java
@@ -0,0 +1,68 @@
+/*******************************************************************************
+ * 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.util.Date;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+
+import org.oasisopen.sca.annotation.Reference;
+
+/**
+ * Simple example - Hello World!
+ * <p/>
+ * The SDK dispatches HTTP requests for URI
+ * <code>http://[host]:[port]/helloworld-jaxrs/rest/world</code>, where
+ * <code>helloworld-jaxrs</code> is the context root, to this class. A simple 
+ * plain text entry is returned in HTTP response.
+ * <p/>
+ * The service document is available at URI
+ * <code>http://[host]:[port]/helloworld-jaxrs/rest</code> but it is empty because
+ * this simple demo doesn't contain any collection of resources.
+ * <p/>
+ * This resource must be registered within a JAX-RS application, this example
+ * uses the default usage of application /WEB-INF/application
+ */
+@Path("/world")
+public class HelloWorldResource {
+
+    @Reference
+    protected HelloworldService service;
+
+
+    /**
+     * This method is called by the SDK for HTTP GET method requests where the
+     * Accept header allows the Atom media type application/atom+xml. A
+     * SyndEntry is created with basic information. Serialization of the
+     * SyndEntry to Atom entry is performed by the SDK automatically. The
+     * default status code of 200 (OK) is returned in the response.
+     * 
+     * @return SyndEntry of the requested resource
+     */
+    @GET
+    @Produces("text/plain") 
+    public String getClichedMessage() {
+       return service == null ? "SCA reference not injected" : service.sayHello("World");
+    }    
+
+}
diff --git a/sandbox/samples/sca-extensions/implementation-web/helloworld-jaxrs/src/main/java/sample/HelloworldService.java b/sandbox/samples/sca-extensions/implementation-web/helloworld-jaxrs/src/main/java/sample/HelloworldService.java
new file mode 100644
index 0000000000..123774b936
--- /dev/null
+++ b/sandbox/samples/sca-extensions/implementation-web/helloworld-jaxrs/src/main/java/sample/HelloworldService.java
@@ -0,0 +1,25 @@
+/*
+ * 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;
+
+public interface HelloworldService {
+
+    String sayHello(String name);
+
+}
diff --git a/sandbox/samples/sca-extensions/implementation-web/helloworld-jaxrs/src/main/java/sample/HelloworldServiceImpl.java b/sandbox/samples/sca-extensions/implementation-web/helloworld-jaxrs/src/main/java/sample/HelloworldServiceImpl.java
new file mode 100644
index 0000000000..66cef71a25
--- /dev/null
+++ b/sandbox/samples/sca-extensions/implementation-web/helloworld-jaxrs/src/main/java/sample/HelloworldServiceImpl.java
@@ -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 sample;
+
+
+public class HelloworldServiceImpl implements HelloworldService {
+
+    public String sayHello(String name) {
+        return "Hello " + name;
+    }
+
+}
diff --git a/sandbox/samples/sca-extensions/implementation-web/helloworld-jaxrs/src/main/webapp/WEB-INF/application b/sandbox/samples/sca-extensions/implementation-web/helloworld-jaxrs/src/main/webapp/WEB-INF/application
new file mode 100644
index 0000000000..8ce781d6c8
--- /dev/null
+++ b/sandbox/samples/sca-extensions/implementation-web/helloworld-jaxrs/src/main/webapp/WEB-INF/application
@@ -0,0 +1,14 @@
+#	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.
+sample.HelloWorldResource
\ No newline at end of file
diff --git a/sandbox/samples/sca-extensions/implementation-web/helloworld-jaxrs/src/main/webapp/WEB-INF/web.composite b/sandbox/samples/sca-extensions/implementation-web/helloworld-jaxrs/src/main/webapp/WEB-INF/web.composite
new file mode 100644
index 0000000000..7ff71519e9
--- /dev/null
+++ b/sandbox/samples/sca-extensions/implementation-web/helloworld-jaxrs/src/main/webapp/WEB-INF/web.composite
@@ -0,0 +1,34 @@
+<?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://samples"
+           name="Helloworld">
+
+    <component name="HelloworldJAXRSComponent">
+        <implementation.web web-uri=""/>
+        <reference name="service" target="HelloworldComponent"/>
+    </component>
+
+    <component name="HelloworldComponent">
+        <implementation.java class="sample.HelloworldServiceImpl"/>
+    </component>
+
+</composite>
diff --git a/sandbox/samples/sca-extensions/implementation-web/helloworld-jaxrs/src/main/webapp/WEB-INF/web.xml b/sandbox/samples/sca-extensions/implementation-web/helloworld-jaxrs/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..3c5726a818
--- /dev/null
+++ b/sandbox/samples/sca-extensions/implementation-web/helloworld-jaxrs/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,49 @@
+<?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.
+-->
+<web-app version="2.4"
+         xmlns="http://java.sun.com/xml/ns/j2ee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >
+
+      <display-name>Apache Tuscany Helloworld JAX-RS Sample</display-name>
+
+      <!-- Listener to start the Tuscany webapp embedded runtime -->
+	<listener><listener-class>org.apache.tuscany.sca.host.webapp.TuscanyContextListener</listener-class></listener>
+
+      <!-- Apache Wink JAX-RS Servlet -->
+	<servlet>
+		<servlet-name>restSdkService</servlet-name>
+		<servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
+		<init-param>
+			<param-name>applicationConfigLocation</param-name>
+			<param-value>/WEB-INF/application</param-value>
+		</init-param>
+		<init-param>
+                  <!-- Custom init param to tell Wink to use Tuscany -->
+			<param-name>deploymentConfiguration</param-name>
+			<param-value>org.apache.tuscany.sca.wink.TuscanyDeploymentConfiguration</param-value>
+		</init-param>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>restSdkService</servlet-name>
+		<url-pattern>/rest/*</url-pattern>
+	</servlet-mapping>
+
+</web-app>
diff --git a/sandbox/samples/sca-extensions/implementation-web/helloworld-jaxrs/src/test/java/itest/HelloworldTestCase.java b/sandbox/samples/sca-extensions/implementation-web/helloworld-jaxrs/src/test/java/itest/HelloworldTestCase.java
new file mode 100644
index 0000000000..50197cdfcb
--- /dev/null
+++ b/sandbox/samples/sca-extensions/implementation-web/helloworld-jaxrs/src/test/java/itest/HelloworldTestCase.java
@@ -0,0 +1,43 @@
+/*
+ * 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 itest;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+
+import org.junit.Test;
+
+import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
+import com.gargoylesoftware.htmlunit.TextPage;
+import com.gargoylesoftware.htmlunit.WebClient;
+
+/**
+ */
+public class HelloworldTestCase {
+
+    @Test
+    public void testA() throws FailingHttpStatusCodeException, MalformedURLException, IOException {
+        TextPage page = (TextPage)new WebClient().getPage("http://localhost:8085/helloworld-jaxrs/rest/world");
+        assertEquals("Hello World", page.getContent());
+    }
+
+}
diff --git a/sandbox/samples/sca-extensions/implementation-web/helloworld-js-client/README b/sandbox/samples/sca-extensions/implementation-web/helloworld-js-client/README
new file mode 100644
index 0000000000..828aadb0f1
--- /dev/null
+++ b/sandbox/samples/sca-extensions/implementation-web/helloworld-js-client/README
@@ -0,0 +1,7 @@
+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). 
+
+TODO - finish
\ No newline at end of file
diff --git a/sandbox/samples/sca-extensions/implementation-web/helloworld-js-client/pom.xml b/sandbox/samples/sca-extensions/implementation-web/helloworld-js-client/pom.xml
new file mode 100644
index 0000000000..388df0913e
--- /dev/null
+++ b/sandbox/samples/sca-extensions/implementation-web/helloworld-js-client/pom.xml
@@ -0,0 +1,104 @@
+<?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-helloworld-js-client-webapp</artifactId>
+    <packaging>war</packaging>
+    <name>Apache Tuscany SCA Sample Helloworld Javascript Client</name>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca.shades</groupId>
+            <artifactId>tuscany-base</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca.shades</groupId>
+            <artifactId>tuscany-json-nodep</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>net.sourceforge.htmlunit</groupId>
+            <artifactId>htmlunit</artifactId>
+            <version>2.6</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+       <finalName>helloworld-js-client</finalName>
+       <plugins>
+          <plugin>
+             <groupId>org.mortbay.jetty</groupId>
+             <artifactId>maven-jetty-plugin</artifactId>
+             <version>6.1.18</version>
+             <configuration>
+                <contextPath>helloworld-js-client</contextPath>
+                <stopKey>foo</stopKey>
+                <stopPort>9999</stopPort>
+             </configuration>
+             <executions>
+                <execution>
+                   <id>start-jetty</id>
+                   <phase>process-test-classes</phase>
+                   <goals>
+                       <goal>run</goal>
+                   </goals>
+                   <configuration>
+                       <scanIntervalSeconds>0</scanIntervalSeconds>
+                       <daemon>true</daemon>
+                       <connectors>
+                          <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+                             <port>8085</port>
+                          </connector>
+                       </connectors>
+                   </configuration>
+                </execution>
+                <execution>
+                   <id>stop-jetty</id>
+                   <phase>prepare-package</phase>
+                   <goals>
+                       <goal>stop</goal>
+                   </goals>
+                </execution>
+             </executions>
+          </plugin>
+       </plugins>
+    </build>
+
+</project>
diff --git a/sandbox/samples/sca-extensions/implementation-web/helloworld-js-client/src/main/java/sample/HelloworldService.java b/sandbox/samples/sca-extensions/implementation-web/helloworld-js-client/src/main/java/sample/HelloworldService.java
new file mode 100644
index 0000000000..123774b936
--- /dev/null
+++ b/sandbox/samples/sca-extensions/implementation-web/helloworld-js-client/src/main/java/sample/HelloworldService.java
@@ -0,0 +1,25 @@
+/*
+ * 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;
+
+public interface HelloworldService {
+
+    String sayHello(String name);
+
+}
diff --git a/sandbox/samples/sca-extensions/implementation-web/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java b/sandbox/samples/sca-extensions/implementation-web/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java
new file mode 100644
index 0000000000..66cef71a25
--- /dev/null
+++ b/sandbox/samples/sca-extensions/implementation-web/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java
@@ -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 sample;
+
+
+public class HelloworldServiceImpl implements HelloworldService {
+
+    public String sayHello(String name) {
+        return "Hello " + name;
+    }
+
+}
diff --git a/sandbox/samples/sca-extensions/implementation-web/helloworld-js-client/src/main/webapp/WEB-INF/web.composite b/sandbox/samples/sca-extensions/implementation-web/helloworld-js-client/src/main/webapp/WEB-INF/web.composite
new file mode 100644
index 0000000000..d41a8535e2
--- /dev/null
+++ b/sandbox/samples/sca-extensions/implementation-web/helloworld-js-client/src/main/webapp/WEB-INF/web.composite
@@ -0,0 +1,36 @@
+<?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://samples"
+           name="Helloworld">
+
+    <component name="foo">
+        <implementation.web web-uri=""/>
+        <reference name="service" target="HelloworldComponent">
+             <interface.java interface="sample.HelloworldService" />
+        </reference>
+    </component>
+
+    <component name="HelloworldComponent">
+        <implementation.java class="sample.HelloworldServiceImpl"/>
+    </component>
+
+</composite>
diff --git a/sandbox/samples/sca-extensions/implementation-web/helloworld-js-client/src/main/webapp/WEB-INF/web.xml b/sandbox/samples/sca-extensions/implementation-web/helloworld-js-client/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..babeb7b203
--- /dev/null
+++ b/sandbox/samples/sca-extensions/implementation-web/helloworld-js-client/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,41 @@
+<?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.
+-->
+<web-app version="2.4"
+         xmlns="http://java.sun.com/xml/ns/j2ee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >
+
+  <display-name>Apache Tuscany Helloworld JSP Sample</display-name>
+
+  <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>
+
+  <welcome-file-list id="WelcomeFileList">
+    <welcome-file>hello.html</welcome-file>
+  </welcome-file-list>
+
+</web-app>
diff --git a/sandbox/samples/sca-extensions/implementation-web/helloworld-js-client/src/main/webapp/hello.html b/sandbox/samples/sca-extensions/implementation-web/helloworld-js-client/src/main/webapp/hello.html
new file mode 100644
index 0000000000..12024cc4d3
--- /dev/null
+++ b/sandbox/samples/sca-extensions/implementation-web/helloworld-js-client/src/main/webapp/hello.html
@@ -0,0 +1,51 @@
+<!--
+ * 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.
+-->
+<html>
+
+<head>
+   <title>Apache Tuscany Helloworld Javascript Client Sample</title>
+
+   <script type="text/javascript" src="org.oasisopen.sca.componentContext.js"></script>
+
+   <script language="JavaScript">
+   
+      function callSayHello() {
+         componentContext.getService("service").sayHello(document.getElementById('name').value, sayHelloResponse);
+      }
+
+      function sayHelloResponse(reply) {
+         document.getElementById('result').innerHTML=reply;
+      }
+
+   </script>
+
+</head>
+
+<body>
+
+<h2>Apache Tuscany Helloworld Javascript Client Sample</h2>
+
+    <input type="text" id="name" width="10">
+
+    <button name="submit" onclick="callSayHello()">Say hello</button>
+
+    <div id='result'></div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/sandbox/samples/sca-extensions/implementation-web/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java b/sandbox/samples/sca-extensions/implementation-web/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java
new file mode 100644
index 0000000000..099b442050
--- /dev/null
+++ b/sandbox/samples/sca-extensions/implementation-web/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java
@@ -0,0 +1,75 @@
+/*
+ * 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 itest;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLEncoder;
+
+import org.junit.Test;
+
+/**
+ * Verfiy the serverside code is working, not sure how to easily itest the browser javascript code 
+ */
+public class HelloworldTestCase {
+
+    @Test
+    public void testA() throws MalformedURLException, IOException {
+        
+        URL url = new URL("http://localhost:8085/helloworld-js-client/org.oasisopen.sca.componentContext.js/foo/call/plaincall/service.sayHello.dwr");
+        URLConnection conn = url.openConnection();
+        conn.setDoOutput(true);
+        OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream());
+
+        // to find this run the sample through TCPMON to capture the messages        
+        
+        String data = URLEncoder.encode("callCount", "UTF-8") + "=" + URLEncoder.encode("1", "UTF-8");
+        data += "&" + URLEncoder.encode("page", "UTF-8") + "=" + URLEncoder.encode("/helloworld-js-client/", "UTF-8");       
+        data += "&" + URLEncoder.encode("httpSessionId", "UTF-8") + "=" + URLEncoder.encode("", "UTF-8");       
+        data += "&" + URLEncoder.encode("scriptSessionId", "UTF-8") + "=" + URLEncoder.encode("A023DA664E56F075491BE1B87B37B02671", "UTF-8");       
+        data += "&" + URLEncoder.encode("c0-scriptName", "UTF-8") + "=" + URLEncoder.encode("service", "UTF-8");       
+        data += "&" + URLEncoder.encode("c0-methodName", "UTF-8") + "=" + URLEncoder.encode("sayHello", "UTF-8");       
+        data += "&" + URLEncoder.encode("c0-id", "UTF-8") + "=" + URLEncoder.encode("0", "UTF-8");       
+        data += "&" + URLEncoder.encode("c0-param0", "UTF-8") + "=" + URLEncoder.encode("string:petra", "UTF-8");       
+        data += "&" + URLEncoder.encode("batchId", "UTF-8") + "=" + URLEncoder.encode("0", "UTF-8");       
+        
+        wr.write(data);
+        wr.flush();
+        
+        BufferedReader rd = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+        rd.readLine(); // throw 'allowScriptTagRemoting is false.';
+        rd.readLine(); //#DWR-INSERT
+        rd.readLine(); //#DWR-REPLY
+        String line = rd.readLine(); // dwr.engine._remoteHandleCallback('0','0',"Hello petra");
+        wr.close();
+        rd.close();
+        
+        assertTrue(line.endsWith("\"Hello petra\");"));
+
+    }
+
+}
diff --git a/sandbox/samples/sca-extensions/implementation-web/helloworld-jsf/pom.xml b/sandbox/samples/sca-extensions/implementation-web/helloworld-jsf/pom.xml
new file mode 100644
index 0000000000..6f2b820e4c
--- /dev/null
+++ b/sandbox/samples/sca-extensions/implementation-web/helloworld-jsf/pom.xml
@@ -0,0 +1,99 @@
+<?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-helloworld-jsf-webapp</artifactId>
+    <name>Apache Tuscany SCA Sample Helloworld JSF</name>
+    <packaging>war</packaging>
+
+    <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-implementation-web-runtime</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-myfaces</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+       <finalName>helloworld-jsf</finalName>
+       <plugins>
+          <plugin>
+             <groupId>org.mortbay.jetty</groupId>
+             <artifactId>maven-jetty-plugin</artifactId>
+             <version>6.1.18</version>
+             <configuration>
+                <contextPath>helloworld-jsf</contextPath>
+                <stopKey>foo</stopKey>
+                <stopPort>9999</stopPort>
+             </configuration>
+             <executions>
+                <execution>
+                   <id>start-jetty</id>
+                   <phase>process-test-classes</phase>
+                   <goals>
+                       <goal>run</goal>
+                   </goals>
+                   <configuration>
+                       <scanIntervalSeconds>0</scanIntervalSeconds>
+                       <daemon>true</daemon>
+                       <connectors>
+                          <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+                             <port>8085</port>
+                          </connector>
+                       </connectors>
+                   </configuration>
+                </execution>
+                <execution>
+                   <id>stop-jetty</id>
+                   <phase>prepare-package</phase>
+                   <goals>
+                       <goal>stop</goal>
+                   </goals>
+                </execution>
+             </executions>
+          </plugin>
+       </plugins>
+    </build>
+
+</project>
diff --git a/sandbox/samples/sca-extensions/implementation-web/helloworld-jsf/src/main/java/sample/HelloWorldController.java b/sandbox/samples/sca-extensions/implementation-web/helloworld-jsf/src/main/java/sample/HelloWorldController.java
new file mode 100644
index 0000000000..9c9f541997
--- /dev/null
+++ b/sandbox/samples/sca-extensions/implementation-web/helloworld-jsf/src/main/java/sample/HelloWorldController.java
@@ -0,0 +1,56 @@
+/*
+ * 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 org.oasisopen.sca.annotation.Reference;
+
+/**
+ * 
+ */
+public class HelloWorldController {
+
+    @Reference
+    protected HelloworldService service;
+
+    private String name;
+
+    public HelloWorldController() {
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * Method that is backed to a submit button of a form.
+     */
+    public String send() {
+        if (service == null) {
+            name = "reference not injected!";
+        } else {
+            name = service.sayHello(name);
+        }
+        return "success";
+    }
+
+}
diff --git a/sandbox/samples/sca-extensions/implementation-web/helloworld-jsf/src/main/java/sample/HelloworldService.java b/sandbox/samples/sca-extensions/implementation-web/helloworld-jsf/src/main/java/sample/HelloworldService.java
new file mode 100644
index 0000000000..53ff7a5ca1
--- /dev/null
+++ b/sandbox/samples/sca-extensions/implementation-web/helloworld-jsf/src/main/java/sample/HelloworldService.java
@@ -0,0 +1,25 @@
+/*
+ * 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;
+
+public interface HelloworldService {
+
+    String sayHello(String name);
+
+}
diff --git a/sandbox/samples/sca-extensions/implementation-web/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java b/sandbox/samples/sca-extensions/implementation-web/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java
new file mode 100644
index 0000000000..23925d6c69
--- /dev/null
+++ b/sandbox/samples/sca-extensions/implementation-web/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java
@@ -0,0 +1,27 @@
+/*
+ * 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;
+
+public class HelloworldServiceImpl implements HelloworldService {
+
+    public String sayHello(String name) {
+        return "Hello " + name;
+    }
+
+}
diff --git a/sandbox/samples/sca-extensions/implementation-web/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml b/sandbox/samples/sca-extensions/implementation-web/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml
new file mode 100644
index 0000000000..99cee9faeb
--- /dev/null
+++ b/sandbox/samples/sca-extensions/implementation-web/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml
@@ -0,0 +1,51 @@
+<?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.    
+-->
+<faces-config version="1.2" 
+    xmlns="http://java.sun.com/xml/ns/javaee"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
+    
+    <!-- managed beans of the simple hello world app -->
+    <managed-bean>
+        <managed-bean-name>helloWorld</managed-bean-name>
+        <managed-bean-class>sample.HelloWorldController</managed-bean-class>
+        <managed-bean-scope>request</managed-bean-scope>
+    </managed-bean>
+    
+    <!-- navigation rules for helloWorld.jsp -->
+    <navigation-rule>
+        <from-view-id>/helloWorld.jsp</from-view-id>
+        <navigation-case>
+            <from-outcome>success</from-outcome>
+            <to-view-id>/page2.jsp</to-view-id>
+        </navigation-case>
+    </navigation-rule>
+    
+    <!-- navigation rules for page2.jsp -->
+    <navigation-rule>
+        <from-view-id>/page2.jsp</from-view-id>
+        <navigation-case>
+            <from-outcome>back</from-outcome>
+            <to-view-id>/helloWorld.jsp</to-view-id>
+        </navigation-case>
+    </navigation-rule>
+
+</faces-config>
diff --git a/sandbox/samples/sca-extensions/implementation-web/helloworld-jsf/src/main/webapp/WEB-INF/web.composite b/sandbox/samples/sca-extensions/implementation-web/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
new file mode 100644
index 0000000000..8976adde3c
--- /dev/null
+++ b/sandbox/samples/sca-extensions/implementation-web/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
@@ -0,0 +1,34 @@
+<?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://samples"
+           name="Helloworld">
+
+    <component name="foo">
+        <implementation.web web-uri=""/>
+        <reference name="service" target="HelloworldComponent"/>
+    </component>
+
+    <component name="HelloworldComponent">
+        <implementation.java class="sample.HelloworldServiceImpl"/>
+    </component>
+
+</composite>
diff --git a/sandbox/samples/sca-extensions/implementation-web/helloworld-jsf/src/main/webapp/WEB-INF/web.xml b/sandbox/samples/sca-extensions/implementation-web/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..fecbd7c79b
--- /dev/null
+++ b/sandbox/samples/sca-extensions/implementation-web/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,191 @@
+<?xml version="1.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.
+-->
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+         version="2.4">
+
+    <description>MyProject web.xml</description>
+
+    <!-- The only web.xml change to the MyFaces Helloworld sample is to add
+         the Tuscany listener and annotation processor context parameter -->
+    <listener>
+       <listener-class>org.apache.tuscany.sca.host.webapp.TuscanyContextListener</listener-class>
+    </listener>
+    <context-param>
+        <param-name>org.apache.myfaces.config.annotation.LifecycleProvider</param-name>
+        <param-value>org.apache.tuscany.sca.myfaces.TuscanyAnnotationLifecycleProvider</param-value>
+    </context-param>
+
+    <!--optional: context-param>
+        <description>Comma separated list of URIs of (additional) faces config files.
+            (e.g. /WEB-INF/my-config.xml)
+            See JSF 1.0 PRD2, 10.3.2
+            Attention: You do not need to put /WEB-INF/faces-config.xml in here.
+        </description>
+        <param-name>javax.faces.CONFIG_FILES</param-name>
+        <param-value>/WEB-INF/examples-config.xml</param-value>
+    </context-param-->
+    <context-param>
+        <description>State saving method: "client" or "server" (= default)
+            See JSF Specification 2.5.3</description>
+        <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+        <param-value>client</param-value>
+    </context-param>
+    <context-param>
+        <description>Only applicable if state saving method is "server" (= default).
+            Defines the amount (default = 20) of the latest views are stored in session.</description>
+        <param-name>org.apache.myfaces.NUMBER_OF_VIEWS_IN_SESSION</param-name>
+        <param-value>20</param-value>
+    </context-param>
+    <context-param>
+        <description>Only applicable if state saving method is "server" (= default).
+            If true (default) the state will be serialized to a byte stream before it
+            is written to the session.
+            If false the state will not be serialized to a byte stream.</description>
+        <param-name>org.apache.myfaces.SERIALIZE_STATE_IN_SESSION</param-name>
+        <param-value>true</param-value>
+    </context-param>
+    <context-param>
+        <description>Only applicable if state saving method is "server" (= default) and if
+            org.apache.myfaces.SERIALIZE_STATE_IN_SESSION is true (= default)
+            If true (default) the serialized state will be compressed before it
+            is written to the session. If false the state will not be compressed.</description>
+        <param-name>org.apache.myfaces.COMPRESS_STATE_IN_SESSION</param-name>
+        <param-value>true</param-value>
+    </context-param>
+    <context-param>
+        <description>This parameter tells MyFaces if javascript code should be allowed in the
+            rendered HTML output.
+            If javascript is allowed, command_link anchors will have javascript code
+            that submits the corresponding form.
+            If javascript is not allowed, the state saving info and nested parameters
+            will be added as url parameters.
+            Default: "true"</description>
+        <param-name>org.apache.myfaces.ALLOW_JAVASCRIPT</param-name>
+        <param-value>true</param-value>
+    </context-param>
+    <context-param>
+        <param-name>org.apache.myfaces.DETECT_JAVASCRIPT</param-name>
+        <param-value>false</param-value>
+    </context-param>
+    <context-param>
+        <description>If true, rendered HTML code will be formatted, so that it is "human readable".
+            i.e. additional line separators and whitespace will be written, that do not
+            influence the HTML code.
+            Default: "true"</description>
+        <param-name>org.apache.myfaces.PRETTY_HTML</param-name>
+        <param-value>true</param-value>
+    </context-param>
+    <context-param>
+        <description>If true, a javascript function will be rendered that is able to restore the
+            former vertical scroll on every request. Convenient feature if you have pages
+            with long lists and you do not want the browser page to always jump to the top
+            if you trigger a link or button action that stays on the same page.
+            Default: "false"</description>
+        <param-name>org.apache.myfaces.AUTO_SCROLL</param-name>
+        <param-value>true</param-value>
+    </context-param>
+
+    <context-param>
+        <description>Used for encrypting view state. Only relevant for client side
+            state saving. See MyFaces wiki/web site documentation for instructions
+            on how to configure an application for diffenent encryption strengths.
+        </description>
+        <param-name>org.apache.myfaces.SECRET</param-name>
+        <param-value>NzY1NDMyMTA=</param-value>
+    </context-param>
+
+    <context-param>
+        <description>
+            Validate managed beans, navigation rules and ensure that forms are not nested.
+        </description>
+        <param-name>org.apache.myfaces.VALIDATE</param-name>
+        <param-value>true</param-value>
+    </context-param>
+    
+    <context-param>
+        <description>
+            Treat readonly same as if disabled attribute was set for select elements.
+        </description>
+        <param-name>org.apache.myfaces.READONLY_AS_DISABLED_FOR_SELECTS</param-name>
+        <param-value>true</param-value>
+    </context-param>    
+    
+    <context-param>
+        <description>
+            Use the defined class as the class which will be called when a resource is added to the
+            ExtensionFilter handling. Using StreamingAddResource here helps with performance. If you want to add
+            custom components and want to use the ExtensionFilter, you need to provide your custom implementation here.
+        </description>
+        <param-name>org.apache.myfaces.ADD_RESOURCE_CLASS</param-name>
+        <param-value>org.apache.myfaces.renderkit.html.util.DefaultAddResource</param-value>
+    </context-param>        
+
+    <context-param>
+        <description>
+            Virtual path in the URL which triggers loading of resources for the MyFaces extended components
+            in the ExtensionFilter.
+        </description>
+        <param-name>org.apache.myfaces.RESOURCE_VIRTUAL_PATH</param-name>
+        <param-value>/faces/myFacesExtensionResource</param-value>
+    </context-param>
+    
+    <context-param>
+        <description>
+            Check if the extensions-filter has been properly configured.
+        </description>
+        <param-name>org.apache.myfaces.CHECK_EXTENSIONS_FILTER</param-name>
+        <param-value>true</param-value>
+    </context-param>    
+
+    <context-param>
+        <description>
+            Define partial state saving as true/false.
+        </description>
+        <param-name>javax.faces.PARTIAL_STATE_SAVING_METHOD</param-name>
+        <param-value>false</param-value>
+    </context-param>    
+
+    <!-- Listener, to allow Jetty serving MyFaces apps -->
+    <listener>
+        <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
+    </listener>
+
+    <!-- Faces Servlet -->
+    <servlet>
+        <servlet-name>Faces Servlet</servlet-name>
+        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <!-- Faces Servlet Mapping -->
+    <servlet-mapping>
+        <servlet-name>Faces Servlet</servlet-name>
+        <url-pattern>*.jsf</url-pattern>
+    </servlet-mapping>
+
+    <!-- Welcome files -->
+    <welcome-file-list>
+        <welcome-file>index.jsp</welcome-file>
+        <welcome-file>index.html</welcome-file>
+    </welcome-file-list>
+
+</web-app>
diff --git a/sandbox/samples/sca-extensions/implementation-web/helloworld-jsf/src/main/webapp/helloWorld.jsp b/sandbox/samples/sca-extensions/implementation-web/helloworld-jsf/src/main/webapp/helloWorld.jsp
new file mode 100644
index 0000000000..189c142c99
--- /dev/null
+++ b/sandbox/samples/sca-extensions/implementation-web/helloworld-jsf/src/main/webapp/helloWorld.jsp
@@ -0,0 +1,40 @@
+<!--
+ * 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.    
+-->
+
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+
+<html>
+    <head>
+        <title>Apache Tuscany Helloworld JSF sample</title>
+    </head>
+    <body>
+        <h2>Apache Tuscany Helloworld JSF sample</h2>
+        <f:view>
+            <h:form id="mainForm">
+              <h:panelGrid columns="2">
+                <h:outputLabel for="name" value="Please enter your name" />
+                <h:inputText id="name" value="#{helloWorld.name}" required="true"/>
+                <h:commandButton value="Press me" action="#{helloWorld.send}"/>
+                <h:messages showDetail="true" showSummary="false"/>
+              </h:panelGrid>
+            </h:form>
+        </f:view>
+    </body>
+</html>
diff --git a/sandbox/samples/sca-extensions/implementation-web/helloworld-jsf/src/main/webapp/index.jsp b/sandbox/samples/sca-extensions/implementation-web/helloworld-jsf/src/main/webapp/index.jsp
new file mode 100644
index 0000000000..5ca296e115
--- /dev/null
+++ b/sandbox/samples/sca-extensions/implementation-web/helloworld-jsf/src/main/webapp/index.jsp
@@ -0,0 +1,23 @@
+<!--
+ * 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.    
+-->
+
+<%@ page session="false"%>
+<%
+response.sendRedirect("helloWorld.jsf");
+%>
diff --git a/sandbox/samples/sca-extensions/implementation-web/helloworld-jsf/src/main/webapp/page2.jsp b/sandbox/samples/sca-extensions/implementation-web/helloworld-jsf/src/main/webapp/page2.jsp
new file mode 100644
index 0000000000..89259021c7
--- /dev/null
+++ b/sandbox/samples/sca-extensions/implementation-web/helloworld-jsf/src/main/webapp/page2.jsp
@@ -0,0 +1,38 @@
+<!--
+ * 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.    
+-->
+
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<html>
+    <head>
+        <title>Apache Tuscany Helloworld JSF sample</title>
+    </head>
+    <body>
+        <h2>Apache Tuscany Helloworld JSF sample</h2>
+        <f:view>
+            <h:form id="mainForm">
+                <h:inputTextarea readonly="true" rows="20" cols="80" value="#{helloWorld.name}"/>
+                <br>
+                <h:commandLink action="back">
+                    <h:outputText value="Home"/>
+                </h:commandLink>
+            </h:form>
+        </f:view>
+    </body>
+</html>
diff --git a/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/pom.xml b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/pom.xml
new file mode 100644
index 0000000000..b8cb765c38
--- /dev/null
+++ b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/pom.xml
@@ -0,0 +1,67 @@
+<?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-helloworld-spring</artifactId>
+    <name>Apache Tuscany SCA Sample HelloWorld using Spring</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <scope>provided</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 to support using mvn tuscany:run to run this contribution -->
+         <plugin>
+             <groupId>org.apache.tuscany.maven.plugins</groupId>
+             <artifactId>maven-tuscany-plugin</artifactId>
+             <version>2.0-SNAPSHOT</version>
+             <dependencies>
+                <dependency>
+                   <groupId>org.apache.tuscany.sca.shades</groupId>
+                   <artifactId>tuscany-spring</artifactId>
+                   <version>2.0-SNAPSHOT</version>
+                </dependency>
+             </dependencies>
+         </plugin>
+
+       </plugins>
+    </build>
+</project>
diff --git a/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/java/sample/DateService.java b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/java/sample/DateService.java
new file mode 100644
index 0000000000..7c50d66a9c
--- /dev/null
+++ b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/java/sample/DateService.java
@@ -0,0 +1,29 @@
+/*
+ * 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.util.Date;
+
+/**
+ * 
+ */
+public interface DateService {
+    Date getDate();
+}
diff --git a/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/java/sample/DateServiceImpl.java b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/java/sample/DateServiceImpl.java
new file mode 100644
index 0000000000..64bdd86f7c
--- /dev/null
+++ b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/java/sample/DateServiceImpl.java
@@ -0,0 +1,37 @@
+/*
+ * 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.util.Date;
+
+import org.oasisopen.sca.annotation.Service;
+
+/**
+ * 
+ */
+@Service(DateService.class)
+public class DateServiceImpl implements DateService {
+
+    public Date getDate() {
+        System.out.println("DateServiceImpl.getDate()");
+        return new Date();
+    }
+
+}
diff --git a/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/java/sample/Helloworld.java b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/java/sample/Helloworld.java
new file mode 100644
index 0000000000..f4e8c50448
--- /dev/null
+++ b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/java/sample/Helloworld.java
@@ -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 sample;
+
+import org.oasisopen.sca.annotation.Remotable;
+
+@Remotable
+public interface Helloworld {
+
+    String sayHello(String name);
+
+}
diff --git a/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/java/sample/HelloworldClientImpl.java b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/java/sample/HelloworldClientImpl.java
new file mode 100644
index 0000000000..ddcb1d9bc3
--- /dev/null
+++ b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/java/sample/HelloworldClientImpl.java
@@ -0,0 +1,48 @@
+/*
+ * 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 org.oasisopen.sca.annotation.Reference;
+
+public class HelloworldClientImpl implements Helloworld {
+    private Helloworld helloworld;
+
+    // SCA reference
+    @Reference(required = false)
+    private DateService dateService;
+
+    public HelloworldClientImpl() {
+        System.out.println("HelloworldClientImpl()");
+    }
+
+    public String sayHello(String name) {
+        System.out.println("HelloworldClientImpl.sayHello(" + name + ")");
+        if (dateService == null) {
+            return "Hello " + name;
+        }
+        return "[" + dateService.getDate() + "] " + helloworld.sayHello(name);
+    }
+
+    // Setter for spring injection
+    public void setHelloworld(Helloworld helloworld) {
+        System.out.println("Injected with " + helloworld);
+        this.helloworld = helloworld;
+    }
+
+}
diff --git a/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/java/sample/HelloworldImpl.java b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/java/sample/HelloworldImpl.java
new file mode 100644
index 0000000000..125c333ddc
--- /dev/null
+++ b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/java/sample/HelloworldImpl.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;
+
+
+public class HelloworldImpl implements Helloworld {
+
+    public HelloworldImpl() {
+        super();
+        System.out.println("HelloworldImpl()");
+    }
+
+    public String sayHello(String name) {
+        System.out.println("HelloworldImpl.sayHello(" + name + ")");
+        return "Hello " + name;
+    }
+
+}
diff --git a/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..552d100638
--- /dev/null
+++ b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,23 @@
+<?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>
\ No newline at end of file
diff --git a/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-client-context.xml b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-client-context.xml
new file mode 100644
index 0000000000..15e9647bb0
--- /dev/null
+++ b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-client-context.xml
@@ -0,0 +1,37 @@
+<?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.    
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:sca="http://www.springframework.org/schema/sca"
+       xsi:schemaLocation="
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+       http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
+
+    <bean id="HelloworldClientBean" class="sample.HelloworldClientImpl">
+        <property name="helloworld">
+            <ref bean="HelloworldBean"/>
+        </property>
+    </bean>
+    
+    <!-- 
+    <sca:reference name="dateService" type="sample.DateService"/>
+    -->
+
+</beans>
\ No newline at end of file
diff --git a/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-context.xml b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-context.xml
new file mode 100644
index 0000000000..9ecd09974e
--- /dev/null
+++ b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-context.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:sca="http://www.springframework.org/schema/sca"
+       xsi:schemaLocation="
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+       http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
+
+    <bean id="HelloworldBean" class="sample.HelloworldImpl">
+    </bean>
+
+</beans>
\ No newline at end of file
diff --git a/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld.composite b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld.composite
new file mode 100644
index 0000000000..6d356758ae
--- /dev/null
+++ b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld.composite
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+      targetNamespace="http://sample"
+      xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
+      name="helloworld">
+    
+    <component name="HelloworldClientComponent">
+        <implementation.spring location="helloworld-client-context.xml"/>
+        <service name="HelloworldClientBean">
+            <tuscany:binding.jsonrpc/>
+        </service>
+        <reference name="dateService" target="DateServiceComponent"/>
+    </component>
+    
+    <component name="DateServiceComponent">
+        <implementation.java class="sample.DateServiceImpl"/>
+    </component>
+</composite>
diff --git a/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/test/java/sample/HelloworldTestCase.java b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/test/java/sample/HelloworldTestCase.java
new file mode 100644
index 0000000000..7e679ec0e9
--- /dev/null
+++ b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-contribution/src/test/java/sample/HelloworldTestCase.java
@@ -0,0 +1,33 @@
+/*
+ * 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 static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class HelloworldTestCase {
+
+    @Test
+    public void testSayHello() {
+        HelloworldImpl helloworld = new HelloworldImpl();
+        assertEquals("Hello Petra", helloworld.sayHello("Petra"));
+    }
+
+}
diff --git a/sandbox/samples/sca-features/implementation-spring/helloworld-spring-webapp/pom.xml b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-webapp/pom.xml
new file mode 100644
index 0000000000..59f3a25696
--- /dev/null
+++ b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-webapp/pom.xml
@@ -0,0 +1,186 @@
+<?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-helloworld-spring-webapp</artifactId>
+    <name>Apache Tuscany SCA Sample Spring Helloworld</name>
+    <packaging>war</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-feature-web20</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <type>pom</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-spring-webapp</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-spring-runtime</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-webapp</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>sample-helloworld-spring</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>httpunit</groupId>
+            <artifactId>httpunit</artifactId>
+            <version>1.6.1</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>helloworld-spring</finalName>
+        <plugins>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <!-- Skip the normal tests, we'll run them in the integration-test phase -->
+                    <skip>true</skip>
+                </configuration>
+
+                <executions>
+                    <execution>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                        <configuration>
+                            <!-- Ingore the test failures so that the build will proceed to stop the tomcat server -->
+                            <testFailureIgnore>true</testFailureIgnore>
+                            <skip>false</skip>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <overlays>
+                        <overlay>
+                            <groupId>org.apache.tuscany.sca</groupId>
+                            <artifactId>sample-helloworld-spring</artifactId>
+                            <type>jar</type>
+                            <targetPath>WEB-INF/classes</targetPath>
+                            <excludes>
+                                <exclude>META-INF/**/*</exclude>
+                            </excludes>
+                        </overlay>
+                        
+                        <overlay>
+                            <groupId>org.apache.tuscany.sca</groupId>
+                            <artifactId>sample-helloworld-spring</artifactId>
+                            <type>jar</type>
+                            <includes>
+                                <include>META-INF/**/*</include>
+                            </includes>
+                        </overlay>
+
+                        <overlay>
+                            <groupId>org.apache.tuscany.sca</groupId>
+                            <artifactId>tuscany-implementation-spring-webapp</artifactId>
+                            <type>jar</type>
+                            <targetPath>WEB-INF/classes</targetPath>
+                            <includes>
+                                <include>org/apache/tuscany/sca/implementation/spring/webapp/spring-webapp-context.xml</include>
+                            </includes>
+                        </overlay>
+                    </overlays>                        
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>maven-jetty-plugin</artifactId>
+                <version>6.1.18</version>
+                <configuration>
+                    <contextPath>helloworld</contextPath>
+                    <stopKey>foo</stopKey>
+                    <stopPort>9999</stopPort>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>start-jetty</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <overrideWebXml>src/test/resources/test-web.xml</overrideWebXml>
+                            <webAppSourceDirectory>${project.build.directory}/${project.build.finalName}</webAppSourceDirectory>
+                            <webXml>${project.build.directory}/${project.build.finalName}/WEB-INF/web.xml</webXml>
+                            <classesDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</classesDirectory>                            
+                            <scanIntervalSeconds>0</scanIntervalSeconds>
+                            <daemon>true</daemon>
+                            <connectors>
+                                <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+                                    <port>8085</port>
+                                </connector>
+                            </connectors>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>stop-jetty</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>stop</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/sandbox/samples/sca-features/implementation-spring/helloworld-spring-webapp/src/main/webapp/WEB-INF/web.xml b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-webapp/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..49590e00a2
--- /dev/null
+++ b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-webapp/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,51 @@
+<?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.
+-->
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+    <display-name>Apache Tuscany Helloworld Spring Sample</display-name>
+
+    <context-param>
+        <param-name>contextConfigLocation</param-name>
+        <param-value>
+        /WEB-INF/classes/helloworld-context.xml
+        /WEB-INF/classes/org/apache/tuscany/sca/implementation/spring/webapp/spring-webapp-context.xml
+        </param-value>
+    </context-param>
+
+    <listener>
+        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+    </listener>
+    
+    <listener>
+        <listener-class>org.apache.tuscany.sca.host.webapp.TuscanyContextListener</listener-class>
+    </listener>
+
+    <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/sandbox/samples/sca-features/implementation-spring/helloworld-spring-webapp/src/test/java/sample/HelloworldClientTestCase.java b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-webapp/src/test/java/sample/HelloworldClientTestCase.java
new file mode 100644
index 0000000000..fa77f08ee2
--- /dev/null
+++ b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-webapp/src/test/java/sample/HelloworldClientTestCase.java
@@ -0,0 +1,58 @@
+/*
+ * 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.ByteArrayInputStream;
+
+import junit.framework.Assert;
+
+import org.json.JSONObject;
+import org.junit.Test;
+
+import com.meterware.httpunit.PostMethodWebRequest;
+import com.meterware.httpunit.WebConversation;
+import com.meterware.httpunit.WebRequest;
+import com.meterware.httpunit.WebResponse;
+
+
+/**
+ * 
+ */
+public class HelloworldClientTestCase {
+    private static final String SERVICE_URL =
+        "http://localhost:8085/helloworld/HelloworldClientComponent/HelloworldClientBean";
+
+    @Test
+    public void testJSONRPCBinding() throws Exception {
+        JSONObject jsonRequest = new JSONObject("{ \"method\": \"sayHello\", \"params\": [\"Ray\"], \"id\": 1}");
+
+        WebConversation wc = new WebConversation();
+        WebRequest request =
+            new PostMethodWebRequest(SERVICE_URL, new ByteArrayInputStream(jsonRequest.toString().getBytes("UTF-8")),
+                                     "application/json");
+        WebResponse response = wc.getResource(request);
+
+        Assert.assertEquals(200, response.getResponseCode());
+
+        JSONObject jsonResp = new JSONObject(response.getText());
+        String text = jsonResp.getString("result");
+        Assert.assertTrue(text.endsWith("Hello Ray"));
+    }
+}
diff --git a/sandbox/samples/sca-features/implementation-spring/helloworld-spring-webapp/src/test/resources/test-web.xml b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-webapp/src/test/resources/test-web.xml
new file mode 100644
index 0000000000..ac5c134454
--- /dev/null
+++ b/sandbox/samples/sca-features/implementation-spring/helloworld-spring-webapp/src/test/resources/test-web.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.
+-->
+<web-app version="2.4"
+         xmlns="http://java.sun.com/xml/ns/j2ee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >
+
+</web-app>
diff --git a/sandbox/samples/sca-features/implementation-web/helloworld-jsp/README b/sandbox/samples/sca-features/implementation-web/helloworld-jsp/README
new file mode 100644
index 0000000000..828aadb0f1
--- /dev/null
+++ b/sandbox/samples/sca-features/implementation-web/helloworld-jsp/README
@@ -0,0 +1,7 @@
+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). 
+
+TODO - finish
\ No newline at end of file
diff --git a/sandbox/samples/sca-features/implementation-web/helloworld-jsp/pom.xml b/sandbox/samples/sca-features/implementation-web/helloworld-jsp/pom.xml
new file mode 100644
index 0000000000..05a3e23895
--- /dev/null
+++ b/sandbox/samples/sca-features/implementation-web/helloworld-jsp/pom.xml
@@ -0,0 +1,98 @@
+<?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-helloworld-jsp-webapp</artifactId>
+    <packaging>war</packaging>
+    <name>Apache Tuscany SCA Sample Helloworld JSP</name>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca.shades</groupId>
+            <artifactId>tuscany-base</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>net.sourceforge.htmlunit</groupId>
+            <artifactId>htmlunit</artifactId>
+            <version>2.6</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+       <finalName>helloworld-jsp</finalName>
+       <plugins>
+          <plugin>
+             <groupId>org.mortbay.jetty</groupId>
+             <artifactId>maven-jetty-plugin</artifactId>
+             <version>6.1.18</version>
+             <configuration>
+                <contextPath>helloworld-jsp</contextPath>
+                <stopKey>foo</stopKey>
+                <stopPort>9999</stopPort>
+             </configuration>
+             <executions>
+                <execution>
+                   <id>start-jetty</id>
+                   <phase>process-test-classes</phase>
+                   <goals>
+                       <goal>run</goal>
+                   </goals>
+                   <configuration>
+                       <scanIntervalSeconds>0</scanIntervalSeconds>
+                       <daemon>true</daemon>
+                       <connectors>
+                          <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+                             <port>8085</port>
+                          </connector>
+                       </connectors>
+                   </configuration>
+                </execution>
+                <execution>
+                   <id>stop-jetty</id>
+                   <phase>prepare-package</phase>
+                   <goals>
+                       <goal>stop</goal>
+                   </goals>
+                </execution>
+             </executions>
+          </plugin>
+       </plugins>
+    </build>
+
+</project>
diff --git a/sandbox/samples/sca-features/implementation-web/helloworld-jsp/src/main/java/sample/HelloworldService.java b/sandbox/samples/sca-features/implementation-web/helloworld-jsp/src/main/java/sample/HelloworldService.java
new file mode 100644
index 0000000000..53ff7a5ca1
--- /dev/null
+++ b/sandbox/samples/sca-features/implementation-web/helloworld-jsp/src/main/java/sample/HelloworldService.java
@@ -0,0 +1,25 @@
+/*
+ * 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;
+
+public interface HelloworldService {
+
+    String sayHello(String name);
+
+}
diff --git a/sandbox/samples/sca-features/implementation-web/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java b/sandbox/samples/sca-features/implementation-web/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
new file mode 100644
index 0000000000..a22c095f29
--- /dev/null
+++ b/sandbox/samples/sca-features/implementation-web/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
@@ -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 sample;
+
+
+public class HelloworldServiceImpl implements HelloworldService {
+
+    public String sayHello(String name) {
+        return "Hello " + name;
+    }
+
+}
diff --git a/sandbox/samples/sca-features/implementation-web/helloworld-jsp/src/main/webapp/WEB-INF/web.composite b/sandbox/samples/sca-features/implementation-web/helloworld-jsp/src/main/webapp/WEB-INF/web.composite
new file mode 100644
index 0000000000..8976adde3c
--- /dev/null
+++ b/sandbox/samples/sca-features/implementation-web/helloworld-jsp/src/main/webapp/WEB-INF/web.composite
@@ -0,0 +1,34 @@
+<?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://samples"
+           name="Helloworld">
+
+    <component name="foo">
+        <implementation.web web-uri=""/>
+        <reference name="service" target="HelloworldComponent"/>
+    </component>
+
+    <component name="HelloworldComponent">
+        <implementation.java class="sample.HelloworldServiceImpl"/>
+    </component>
+
+</composite>
diff --git a/sandbox/samples/sca-features/implementation-web/helloworld-jsp/src/main/webapp/WEB-INF/web.xml b/sandbox/samples/sca-features/implementation-web/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..fa1f7ad7b9
--- /dev/null
+++ b/sandbox/samples/sca-features/implementation-web/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,41 @@
+<?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.
+-->
+<web-app version="2.4"
+         xmlns="http://java.sun.com/xml/ns/j2ee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >
+
+  <display-name>Apache Tuscany Helloworld JSP Sample</display-name>
+
+  <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>
+
+  <welcome-file-list id="WelcomeFileList">
+    <welcome-file>hello.jsp</welcome-file>
+  </welcome-file-list>
+
+</web-app>
diff --git a/sandbox/samples/sca-features/implementation-web/helloworld-jsp/src/main/webapp/hello.jsp b/sandbox/samples/sca-features/implementation-web/helloworld-jsp/src/main/webapp/hello.jsp
new file mode 100644
index 0000000000..ffd01cca73
--- /dev/null
+++ b/sandbox/samples/sca-features/implementation-web/helloworld-jsp/src/main/webapp/hello.jsp
@@ -0,0 +1,37 @@
+<!--
+ * 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.    
+-->
+
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://www.osoa.org/sca/sca_jsp.tld" prefix="sca" %>
+
+<sca:reference name="service" type="sample.HelloworldService" />
+
+<html>
+  <body >
+
+    <h2>Apache Tuscany Helloworld JSP Sample</h2>
+
+    Calling HelloworldService sayHello("world") returns:
+
+    <p>
+
+    <%= service.sayHello("world") %>
+
+  </body>
+</html>
diff --git a/sandbox/samples/sca-features/implementation-web/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java b/sandbox/samples/sca-features/implementation-web/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java
new file mode 100644
index 0000000000..665957b0eb
--- /dev/null
+++ b/sandbox/samples/sca-features/implementation-web/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java
@@ -0,0 +1,53 @@
+/*
+ * 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 itest;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.util.Iterator;
+
+import org.junit.Test;
+
+import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HtmlElement;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.gargoylesoftware.htmlunit.html.HtmlParagraph;
+
+/**
+ */
+public class HelloworldTestCase {
+
+    @Test
+    public void testA() throws FailingHttpStatusCodeException, MalformedURLException, IOException {
+        HtmlPage page = (HtmlPage)new WebClient().getPage("http://localhost:8085/helloworld-jsp");
+        Iterator<?> ss = page.getAllHtmlChildElements().iterator();
+        while(ss.hasNext()) {
+            HtmlElement htmlElement = (HtmlElement) ss.next();
+            if( htmlElement instanceof HtmlParagraph) {
+                assertEquals("Hello world", htmlElement.asText());
+                break;
+            }
+        }
+    }
+
+}
diff --git a/sandbox/samples/sca-features/implementation-web/helloworld-servlet/README b/sandbox/samples/sca-features/implementation-web/helloworld-servlet/README
new file mode 100644
index 0000000000..828aadb0f1
--- /dev/null
+++ b/sandbox/samples/sca-features/implementation-web/helloworld-servlet/README
@@ -0,0 +1,7 @@
+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). 
+
+TODO - finish
\ No newline at end of file
diff --git a/sandbox/samples/sca-features/implementation-web/helloworld-servlet/pom.xml b/sandbox/samples/sca-features/implementation-web/helloworld-servlet/pom.xml
new file mode 100644
index 0000000000..45725aaf72
--- /dev/null
+++ b/sandbox/samples/sca-features/implementation-web/helloworld-servlet/pom.xml
@@ -0,0 +1,105 @@
+<?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-helloworld-servlet-webapp</artifactId>
+    <packaging>war</packaging>
+    <name>Apache Tuscany SCA Sample Helloworld Servlet</name>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca.shades</groupId>
+            <artifactId>tuscany-base-nodep</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.5</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>net.sourceforge.htmlunit</groupId>
+            <artifactId>htmlunit</artifactId>
+            <version>2.6</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+       <finalName>helloworld-servlet</finalName>
+       <plugins>
+          <plugin>
+             <groupId>org.mortbay.jetty</groupId>
+             <artifactId>maven-jetty-plugin</artifactId>
+             <version>6.1.18</version>
+             <configuration>
+                <contextPath>helloworld-servlet</contextPath>
+                <stopKey>foo</stopKey>
+                <stopPort>9999</stopPort>
+             </configuration>
+             <executions>
+                <execution>
+                   <id>start-jetty</id>
+                   <phase>process-test-classes</phase>
+                   <goals>
+                       <goal>run</goal>
+                   </goals>
+                   <configuration>
+                       <scanIntervalSeconds>0</scanIntervalSeconds>
+                       <daemon>true</daemon>
+                       <connectors>
+                          <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+                             <port>8085</port>
+                          </connector>
+                       </connectors>
+                   </configuration>
+                </execution>
+                <execution>
+                   <id>stop-jetty</id>
+                   <phase>prepare-package</phase>
+                   <goals>
+                       <goal>stop</goal>
+                   </goals>
+                </execution>
+             </executions>
+          </plugin>
+       </plugins>
+    </build>
+</project>
+
diff --git a/sandbox/samples/sca-features/implementation-web/helloworld-servlet/src/main/java/sample/HelloworldService.java b/sandbox/samples/sca-features/implementation-web/helloworld-servlet/src/main/java/sample/HelloworldService.java
new file mode 100644
index 0000000000..2e43e09897
--- /dev/null
+++ b/sandbox/samples/sca-features/implementation-web/helloworld-servlet/src/main/java/sample/HelloworldService.java
@@ -0,0 +1,25 @@
+/*
+ * 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;
+
+public interface HelloworldService {
+
+    String sayHello(String name);
+
+}
diff --git a/sandbox/samples/sca-features/implementation-web/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java b/sandbox/samples/sca-features/implementation-web/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
new file mode 100644
index 0000000000..9e79276704
--- /dev/null
+++ b/sandbox/samples/sca-features/implementation-web/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
@@ -0,0 +1,27 @@
+/*
+ * 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;
+
+public class HelloworldServiceImpl implements HelloworldService {
+
+    public String sayHello(String name) {
+        return "Hello " + name;
+    }
+
+}
diff --git a/sandbox/samples/sca-features/implementation-web/helloworld-servlet/src/main/java/sample/HelloworldServlet.java b/sandbox/samples/sca-features/implementation-web/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
new file mode 100644
index 0000000000..bb72c50f6a
--- /dev/null
+++ b/sandbox/samples/sca-features/implementation-web/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
@@ -0,0 +1,64 @@
+/*
+ * 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.IOException;
+import java.io.Writer;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.oasisopen.sca.ComponentContext;
+import org.oasisopen.sca.annotation.Reference;
+
+/**
+ */
+public class HelloworldServlet extends HttpServlet {
+    private static final long serialVersionUID = 1L;
+
+    @Reference
+    protected HelloworldService service;
+
+    @Override
+    public void init(ServletConfig servletConfig) throws ServletException {
+        if (service == null) {
+            System.out.println("HelloworldServlet reference injection failed, using ComponentContext");
+            ComponentContext cc = (ComponentContext)servletConfig.getServletContext().getAttribute("org.oasisopen.sca.ComponentContext");
+            service = cc.getService(HelloworldService.class, "service");
+        }
+    }
+
+    @Override
+    protected void service(HttpServletRequest request, HttpServletResponse response) throws IOException {
+
+    	String name = request.getParameter("name");
+    	String greeting = service.sayHello(name);
+
+        Writer out = response.getWriter();
+        out.write("<html><head><title>Apache Tuscany Helloworld Servlet Sample</title></head><body>");
+        out.write("<h2>Apache Tuscany Helloworld Servlet Sample</h2>");
+        out.write("<br><strong>Result: </strong>" + greeting);
+        out.write("</body></html>");
+        out.flush();
+        out.close();
+    }
+}
diff --git a/sandbox/samples/sca-features/implementation-web/helloworld-servlet/src/main/webapp/WEB-INF/web.composite b/sandbox/samples/sca-features/implementation-web/helloworld-servlet/src/main/webapp/WEB-INF/web.composite
new file mode 100644
index 0000000000..8976adde3c
--- /dev/null
+++ b/sandbox/samples/sca-features/implementation-web/helloworld-servlet/src/main/webapp/WEB-INF/web.composite
@@ -0,0 +1,34 @@
+<?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://samples"
+           name="Helloworld">
+
+    <component name="foo">
+        <implementation.web web-uri=""/>
+        <reference name="service" target="HelloworldComponent"/>
+    </component>
+
+    <component name="HelloworldComponent">
+        <implementation.java class="sample.HelloworldServiceImpl"/>
+    </component>
+
+</composite>
diff --git a/sandbox/samples/sca-features/implementation-web/helloworld-servlet/src/main/webapp/WEB-INF/web.xml b/sandbox/samples/sca-features/implementation-web/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..a91b3fc96b
--- /dev/null
+++ b/sandbox/samples/sca-features/implementation-web/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,44 @@
+<?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.
+-->
+<web-app version="2.4"
+         xmlns="http://java.sun.com/xml/ns/j2ee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >
+
+    <display-name>Apache Tuscany Helloworld Servlet Sample</display-name>
+
+	<listener><listener-class>org.apache.tuscany.sca.host.webapp.TuscanyContextListener</listener-class></listener>
+
+    <servlet>
+        <servlet-name>HelloworldServlet</servlet-name>
+        <servlet-class>sample.HelloworldServlet</servlet-class>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>HelloworldServlet</servlet-name>
+        <url-pattern>/HelloworldServlet</url-pattern>
+    </servlet-mapping>
+
+    <welcome-file-list id="WelcomeFileList">
+        <welcome-file>hello.html</welcome-file>
+    </welcome-file-list>
+
+</web-app>
+
diff --git a/sandbox/samples/sca-features/implementation-web/helloworld-servlet/src/main/webapp/hello.html b/sandbox/samples/sca-features/implementation-web/helloworld-servlet/src/main/webapp/hello.html
new file mode 100644
index 0000000000..c4484916aa
--- /dev/null
+++ b/sandbox/samples/sca-features/implementation-web/helloworld-servlet/src/main/webapp/hello.html
@@ -0,0 +1,46 @@
+<!--
+ * 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.
+-->
+<html>
+
+<head>
+<title>Apache Tuscany Helloworld Servlet Sample</title>
+</head>
+
+<body>
+
+<h2>Apache Tuscany Helloworld Servlet Sample</h2>
+
+<form action="HelloworldServlet" method="post">
+    <table>
+        <tr>
+            <td>Enter your name:</td>
+            <td>
+                <input type="text" name="name" width="10">
+            </td>
+        </tr>
+        <tr>
+            <td align="left" colspan="2">
+                <button name="submit" type="submit">Say hello</button>
+            </td>
+        </tr>
+    </table>
+</form>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/sandbox/samples/sca-features/implementation-web/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java b/sandbox/samples/sca-features/implementation-web/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java
new file mode 100644
index 0000000000..61d722da1f
--- /dev/null
+++ b/sandbox/samples/sca-features/implementation-web/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java
@@ -0,0 +1,55 @@
+/*
+ * 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 itest;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+
+import org.junit.Test;
+
+import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HtmlButton;
+import com.gargoylesoftware.htmlunit.html.HtmlForm;
+import com.gargoylesoftware.htmlunit.html.HtmlInput;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+
+/**
+ */
+public class HelloworldTestCase {
+
+    @Test
+    public void testA() throws FailingHttpStatusCodeException, MalformedURLException, IOException {
+        HtmlPage page = (HtmlPage)new WebClient().getPage("http://localhost:8085/helloworld-servlet");
+
+        HtmlForm form = (HtmlForm) page.getForms().get(0);
+
+        HtmlInput textField = form.getInputByName("name");
+        textField.setValueAttribute("petra");
+
+        HtmlButton button = (HtmlButton) form.getButtonsByName("submit").get(0);
+
+        HtmlPage pageResponse = (HtmlPage) button.click();
+        
+        assertTrue(pageResponse.getWebResponse().getContentAsString().endsWith("</strong>Hello petra</body></html>"));
+    }
+
+}
diff --git a/sandbox/samples/temp/helloworld-jaxrs/README b/sandbox/samples/temp/helloworld-jaxrs/README
deleted file mode 100644
index 828aadb0f1..0000000000
--- a/sandbox/samples/temp/helloworld-jaxrs/README
+++ /dev/null
@@ -1,7 +0,0 @@
-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). 
-
-TODO - finish
\ No newline at end of file
diff --git a/sandbox/samples/temp/helloworld-jaxrs/pom.xml b/sandbox/samples/temp/helloworld-jaxrs/pom.xml
deleted file mode 100644
index f414d87837..0000000000
--- a/sandbox/samples/temp/helloworld-jaxrs/pom.xml
+++ /dev/null
@@ -1,116 +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-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>sample-helloworld-jaxrs-webapp</artifactId>
-    <packaging>war</packaging>
-    <name>Apache Tuscany SCA Sample Helloworld JAX-RS</name>
-
-    <dependencies>
-
-        <!-- Tuscany dependency -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca.shades</groupId>
-            <artifactId>tuscany-base-nodep</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Wink dependency for JAX-RS support -->
-        <dependency>
-            <groupId>org.apache.wink</groupId>
-            <artifactId>wink-common</artifactId>
-            <version>1.1.1-incubating</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.wink</groupId>
-            <artifactId>wink-server</artifactId>
-            <version>1.1.1-incubating</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.6.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.8.1</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>net.sourceforge.htmlunit</groupId>
-            <artifactId>htmlunit</artifactId>
-            <version>2.6</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>helloworld-jaxrs</finalName>
-       <plugins>
-          <plugin>
-             <groupId>org.mortbay.jetty</groupId>
-             <artifactId>maven-jetty-plugin</artifactId>
-             <version>6.1.18</version>
-             <configuration>
-                <contextPath>helloworld-jaxrs</contextPath>
-                <stopKey>foo</stopKey>
-                <stopPort>9999</stopPort>
-             </configuration>
-             <executions>
-                <execution>
-                   <id>start-jetty</id>
-                   <phase>process-test-classes</phase>
-                   <goals>
-                       <goal>run</goal>
-                   </goals>
-                   <configuration>
-                       <scanIntervalSeconds>0</scanIntervalSeconds>
-                       <daemon>true</daemon>
-                       <connectors>
-                          <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-                             <port>8085</port>
-                          </connector>
-                       </connectors>
-                   </configuration>
-                </execution>
-                <execution>
-                   <id>stop-jetty</id>
-                   <phase>prepare-package</phase>
-                   <goals>
-                       <goal>stop</goal>
-                   </goals>
-                </execution>
-             </executions>
-          </plugin>
-       </plugins>
-    </build>
-
-</project>
diff --git a/sandbox/samples/temp/helloworld-jaxrs/src/main/java/sample/HelloWorldResource.java b/sandbox/samples/temp/helloworld-jaxrs/src/main/java/sample/HelloWorldResource.java
deleted file mode 100644
index 42625b8a78..0000000000
--- a/sandbox/samples/temp/helloworld-jaxrs/src/main/java/sample/HelloWorldResource.java
+++ /dev/null
@@ -1,68 +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 sample;
-
-import java.util.Date;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-
-import org.oasisopen.sca.annotation.Reference;
-
-/**
- * Simple example - Hello World!
- * <p/>
- * The SDK dispatches HTTP requests for URI
- * <code>http://[host]:[port]/helloworld-jaxrs/rest/world</code>, where
- * <code>helloworld-jaxrs</code> is the context root, to this class. A simple 
- * plain text entry is returned in HTTP response.
- * <p/>
- * The service document is available at URI
- * <code>http://[host]:[port]/helloworld-jaxrs/rest</code> but it is empty because
- * this simple demo doesn't contain any collection of resources.
- * <p/>
- * This resource must be registered within a JAX-RS application, this example
- * uses the default usage of application /WEB-INF/application
- */
-@Path("/world")
-public class HelloWorldResource {
-
-    @Reference
-    protected HelloworldService service;
-
-
-    /**
-     * This method is called by the SDK for HTTP GET method requests where the
-     * Accept header allows the Atom media type application/atom+xml. A
-     * SyndEntry is created with basic information. Serialization of the
-     * SyndEntry to Atom entry is performed by the SDK automatically. The
-     * default status code of 200 (OK) is returned in the response.
-     * 
-     * @return SyndEntry of the requested resource
-     */
-    @GET
-    @Produces("text/plain") 
-    public String getClichedMessage() {
-       return service == null ? "SCA reference not injected" : service.sayHello("World");
-    }    
-
-}
diff --git a/sandbox/samples/temp/helloworld-jaxrs/src/main/java/sample/HelloworldService.java b/sandbox/samples/temp/helloworld-jaxrs/src/main/java/sample/HelloworldService.java
deleted file mode 100644
index 123774b936..0000000000
--- a/sandbox/samples/temp/helloworld-jaxrs/src/main/java/sample/HelloworldService.java
+++ /dev/null
@@ -1,25 +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 sample;
-
-public interface HelloworldService {
-
-    String sayHello(String name);
-
-}
diff --git a/sandbox/samples/temp/helloworld-jaxrs/src/main/java/sample/HelloworldServiceImpl.java b/sandbox/samples/temp/helloworld-jaxrs/src/main/java/sample/HelloworldServiceImpl.java
deleted file mode 100644
index 66cef71a25..0000000000
--- a/sandbox/samples/temp/helloworld-jaxrs/src/main/java/sample/HelloworldServiceImpl.java
+++ /dev/null
@@ -1,28 +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 sample;
-
-
-public class HelloworldServiceImpl implements HelloworldService {
-
-    public String sayHello(String name) {
-        return "Hello " + name;
-    }
-
-}
diff --git a/sandbox/samples/temp/helloworld-jaxrs/src/main/webapp/WEB-INF/application b/sandbox/samples/temp/helloworld-jaxrs/src/main/webapp/WEB-INF/application
deleted file mode 100644
index 8ce781d6c8..0000000000
--- a/sandbox/samples/temp/helloworld-jaxrs/src/main/webapp/WEB-INF/application
+++ /dev/null
@@ -1,14 +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.
-sample.HelloWorldResource
\ No newline at end of file
diff --git a/sandbox/samples/temp/helloworld-jaxrs/src/main/webapp/WEB-INF/web.composite b/sandbox/samples/temp/helloworld-jaxrs/src/main/webapp/WEB-INF/web.composite
deleted file mode 100644
index 7ff71519e9..0000000000
--- a/sandbox/samples/temp/helloworld-jaxrs/src/main/webapp/WEB-INF/web.composite
+++ /dev/null
@@ -1,34 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-           targetNamespace="http://samples"
-           name="Helloworld">
-
-    <component name="HelloworldJAXRSComponent">
-        <implementation.web web-uri=""/>
-        <reference name="service" target="HelloworldComponent"/>
-    </component>
-
-    <component name="HelloworldComponent">
-        <implementation.java class="sample.HelloworldServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/sandbox/samples/temp/helloworld-jaxrs/src/main/webapp/WEB-INF/web.xml b/sandbox/samples/temp/helloworld-jaxrs/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 3c5726a818..0000000000
--- a/sandbox/samples/temp/helloworld-jaxrs/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,49 +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.
--->
-<web-app version="2.4"
-         xmlns="http://java.sun.com/xml/ns/j2ee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >
-
-      <display-name>Apache Tuscany Helloworld JAX-RS Sample</display-name>
-
-      <!-- Listener to start the Tuscany webapp embedded runtime -->
-	<listener><listener-class>org.apache.tuscany.sca.host.webapp.TuscanyContextListener</listener-class></listener>
-
-      <!-- Apache Wink JAX-RS Servlet -->
-	<servlet>
-		<servlet-name>restSdkService</servlet-name>
-		<servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
-		<init-param>
-			<param-name>applicationConfigLocation</param-name>
-			<param-value>/WEB-INF/application</param-value>
-		</init-param>
-		<init-param>
-                  <!-- Custom init param to tell Wink to use Tuscany -->
-			<param-name>deploymentConfiguration</param-name>
-			<param-value>org.apache.tuscany.sca.wink.TuscanyDeploymentConfiguration</param-value>
-		</init-param>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>restSdkService</servlet-name>
-		<url-pattern>/rest/*</url-pattern>
-	</servlet-mapping>
-
-</web-app>
diff --git a/sandbox/samples/temp/helloworld-jaxrs/src/test/java/itest/HelloworldTestCase.java b/sandbox/samples/temp/helloworld-jaxrs/src/test/java/itest/HelloworldTestCase.java
deleted file mode 100644
index 50197cdfcb..0000000000
--- a/sandbox/samples/temp/helloworld-jaxrs/src/test/java/itest/HelloworldTestCase.java
+++ /dev/null
@@ -1,43 +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 itest;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-
-import org.junit.Test;
-
-import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
-import com.gargoylesoftware.htmlunit.TextPage;
-import com.gargoylesoftware.htmlunit.WebClient;
-
-/**
- */
-public class HelloworldTestCase {
-
-    @Test
-    public void testA() throws FailingHttpStatusCodeException, MalformedURLException, IOException {
-        TextPage page = (TextPage)new WebClient().getPage("http://localhost:8085/helloworld-jaxrs/rest/world");
-        assertEquals("Hello World", page.getContent());
-    }
-
-}
diff --git a/sandbox/samples/temp/helloworld-js-client/README b/sandbox/samples/temp/helloworld-js-client/README
deleted file mode 100644
index 828aadb0f1..0000000000
--- a/sandbox/samples/temp/helloworld-js-client/README
+++ /dev/null
@@ -1,7 +0,0 @@
-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). 
-
-TODO - finish
\ No newline at end of file
diff --git a/sandbox/samples/temp/helloworld-js-client/pom.xml b/sandbox/samples/temp/helloworld-js-client/pom.xml
deleted file mode 100644
index 388df0913e..0000000000
--- a/sandbox/samples/temp/helloworld-js-client/pom.xml
+++ /dev/null
@@ -1,104 +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-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>sample-helloworld-js-client-webapp</artifactId>
-    <packaging>war</packaging>
-    <name>Apache Tuscany SCA Sample Helloworld Javascript Client</name>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca.shades</groupId>
-            <artifactId>tuscany-base</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca.shades</groupId>
-            <artifactId>tuscany-json-nodep</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.8.1</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>net.sourceforge.htmlunit</groupId>
-            <artifactId>htmlunit</artifactId>
-            <version>2.6</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>helloworld-js-client</finalName>
-       <plugins>
-          <plugin>
-             <groupId>org.mortbay.jetty</groupId>
-             <artifactId>maven-jetty-plugin</artifactId>
-             <version>6.1.18</version>
-             <configuration>
-                <contextPath>helloworld-js-client</contextPath>
-                <stopKey>foo</stopKey>
-                <stopPort>9999</stopPort>
-             </configuration>
-             <executions>
-                <execution>
-                   <id>start-jetty</id>
-                   <phase>process-test-classes</phase>
-                   <goals>
-                       <goal>run</goal>
-                   </goals>
-                   <configuration>
-                       <scanIntervalSeconds>0</scanIntervalSeconds>
-                       <daemon>true</daemon>
-                       <connectors>
-                          <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-                             <port>8085</port>
-                          </connector>
-                       </connectors>
-                   </configuration>
-                </execution>
-                <execution>
-                   <id>stop-jetty</id>
-                   <phase>prepare-package</phase>
-                   <goals>
-                       <goal>stop</goal>
-                   </goals>
-                </execution>
-             </executions>
-          </plugin>
-       </plugins>
-    </build>
-
-</project>
diff --git a/sandbox/samples/temp/helloworld-js-client/src/main/java/sample/HelloworldService.java b/sandbox/samples/temp/helloworld-js-client/src/main/java/sample/HelloworldService.java
deleted file mode 100644
index 123774b936..0000000000
--- a/sandbox/samples/temp/helloworld-js-client/src/main/java/sample/HelloworldService.java
+++ /dev/null
@@ -1,25 +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 sample;
-
-public interface HelloworldService {
-
-    String sayHello(String name);
-
-}
diff --git a/sandbox/samples/temp/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java b/sandbox/samples/temp/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java
deleted file mode 100644
index 66cef71a25..0000000000
--- a/sandbox/samples/temp/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java
+++ /dev/null
@@ -1,28 +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 sample;
-
-
-public class HelloworldServiceImpl implements HelloworldService {
-
-    public String sayHello(String name) {
-        return "Hello " + name;
-    }
-
-}
diff --git a/sandbox/samples/temp/helloworld-js-client/src/main/webapp/WEB-INF/web.composite b/sandbox/samples/temp/helloworld-js-client/src/main/webapp/WEB-INF/web.composite
deleted file mode 100644
index d41a8535e2..0000000000
--- a/sandbox/samples/temp/helloworld-js-client/src/main/webapp/WEB-INF/web.composite
+++ /dev/null
@@ -1,36 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-           targetNamespace="http://samples"
-           name="Helloworld">
-
-    <component name="foo">
-        <implementation.web web-uri=""/>
-        <reference name="service" target="HelloworldComponent">
-             <interface.java interface="sample.HelloworldService" />
-        </reference>
-    </component>
-
-    <component name="HelloworldComponent">
-        <implementation.java class="sample.HelloworldServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/sandbox/samples/temp/helloworld-js-client/src/main/webapp/WEB-INF/web.xml b/sandbox/samples/temp/helloworld-js-client/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index babeb7b203..0000000000
--- a/sandbox/samples/temp/helloworld-js-client/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,41 +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.
--->
-<web-app version="2.4"
-         xmlns="http://java.sun.com/xml/ns/j2ee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >
-
-  <display-name>Apache Tuscany Helloworld JSP Sample</display-name>
-
-  <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>
-
-  <welcome-file-list id="WelcomeFileList">
-    <welcome-file>hello.html</welcome-file>
-  </welcome-file-list>
-
-</web-app>
diff --git a/sandbox/samples/temp/helloworld-js-client/src/main/webapp/hello.html b/sandbox/samples/temp/helloworld-js-client/src/main/webapp/hello.html
deleted file mode 100644
index 12024cc4d3..0000000000
--- a/sandbox/samples/temp/helloworld-js-client/src/main/webapp/hello.html
+++ /dev/null
@@ -1,51 +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.
--->
-<html>
-
-<head>
-   <title>Apache Tuscany Helloworld Javascript Client Sample</title>
-
-   <script type="text/javascript" src="org.oasisopen.sca.componentContext.js"></script>
-
-   <script language="JavaScript">
-   
-      function callSayHello() {
-         componentContext.getService("service").sayHello(document.getElementById('name').value, sayHelloResponse);
-      }
-
-      function sayHelloResponse(reply) {
-         document.getElementById('result').innerHTML=reply;
-      }
-
-   </script>
-
-</head>
-
-<body>
-
-<h2>Apache Tuscany Helloworld Javascript Client Sample</h2>
-
-    <input type="text" id="name" width="10">
-
-    <button name="submit" onclick="callSayHello()">Say hello</button>
-
-    <div id='result'></div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/sandbox/samples/temp/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java b/sandbox/samples/temp/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java
deleted file mode 100644
index 099b442050..0000000000
--- a/sandbox/samples/temp/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java
+++ /dev/null
@@ -1,75 +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 itest;
-
-import static org.junit.Assert.assertTrue;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLEncoder;
-
-import org.junit.Test;
-
-/**
- * Verfiy the serverside code is working, not sure how to easily itest the browser javascript code 
- */
-public class HelloworldTestCase {
-
-    @Test
-    public void testA() throws MalformedURLException, IOException {
-        
-        URL url = new URL("http://localhost:8085/helloworld-js-client/org.oasisopen.sca.componentContext.js/foo/call/plaincall/service.sayHello.dwr");
-        URLConnection conn = url.openConnection();
-        conn.setDoOutput(true);
-        OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream());
-
-        // to find this run the sample through TCPMON to capture the messages        
-        
-        String data = URLEncoder.encode("callCount", "UTF-8") + "=" + URLEncoder.encode("1", "UTF-8");
-        data += "&" + URLEncoder.encode("page", "UTF-8") + "=" + URLEncoder.encode("/helloworld-js-client/", "UTF-8");       
-        data += "&" + URLEncoder.encode("httpSessionId", "UTF-8") + "=" + URLEncoder.encode("", "UTF-8");       
-        data += "&" + URLEncoder.encode("scriptSessionId", "UTF-8") + "=" + URLEncoder.encode("A023DA664E56F075491BE1B87B37B02671", "UTF-8");       
-        data += "&" + URLEncoder.encode("c0-scriptName", "UTF-8") + "=" + URLEncoder.encode("service", "UTF-8");       
-        data += "&" + URLEncoder.encode("c0-methodName", "UTF-8") + "=" + URLEncoder.encode("sayHello", "UTF-8");       
-        data += "&" + URLEncoder.encode("c0-id", "UTF-8") + "=" + URLEncoder.encode("0", "UTF-8");       
-        data += "&" + URLEncoder.encode("c0-param0", "UTF-8") + "=" + URLEncoder.encode("string:petra", "UTF-8");       
-        data += "&" + URLEncoder.encode("batchId", "UTF-8") + "=" + URLEncoder.encode("0", "UTF-8");       
-        
-        wr.write(data);
-        wr.flush();
-        
-        BufferedReader rd = new BufferedReader(new InputStreamReader(conn.getInputStream()));
-        rd.readLine(); // throw 'allowScriptTagRemoting is false.';
-        rd.readLine(); //#DWR-INSERT
-        rd.readLine(); //#DWR-REPLY
-        String line = rd.readLine(); // dwr.engine._remoteHandleCallback('0','0',"Hello petra");
-        wr.close();
-        rd.close();
-        
-        assertTrue(line.endsWith("\"Hello petra\");"));
-
-    }
-
-}
diff --git a/sandbox/samples/temp/helloworld-jsf/pom.xml b/sandbox/samples/temp/helloworld-jsf/pom.xml
deleted file mode 100644
index 6f2b820e4c..0000000000
--- a/sandbox/samples/temp/helloworld-jsf/pom.xml
+++ /dev/null
@@ -1,99 +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-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>sample-helloworld-jsf-webapp</artifactId>
-    <name>Apache Tuscany SCA Sample Helloworld JSF</name>
-    <packaging>war</packaging>
-
-    <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-implementation-web-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-myfaces</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>helloworld-jsf</finalName>
-       <plugins>
-          <plugin>
-             <groupId>org.mortbay.jetty</groupId>
-             <artifactId>maven-jetty-plugin</artifactId>
-             <version>6.1.18</version>
-             <configuration>
-                <contextPath>helloworld-jsf</contextPath>
-                <stopKey>foo</stopKey>
-                <stopPort>9999</stopPort>
-             </configuration>
-             <executions>
-                <execution>
-                   <id>start-jetty</id>
-                   <phase>process-test-classes</phase>
-                   <goals>
-                       <goal>run</goal>
-                   </goals>
-                   <configuration>
-                       <scanIntervalSeconds>0</scanIntervalSeconds>
-                       <daemon>true</daemon>
-                       <connectors>
-                          <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-                             <port>8085</port>
-                          </connector>
-                       </connectors>
-                   </configuration>
-                </execution>
-                <execution>
-                   <id>stop-jetty</id>
-                   <phase>prepare-package</phase>
-                   <goals>
-                       <goal>stop</goal>
-                   </goals>
-                </execution>
-             </executions>
-          </plugin>
-       </plugins>
-    </build>
-
-</project>
diff --git a/sandbox/samples/temp/helloworld-jsf/src/main/java/sample/HelloWorldController.java b/sandbox/samples/temp/helloworld-jsf/src/main/java/sample/HelloWorldController.java
deleted file mode 100644
index 9c9f541997..0000000000
--- a/sandbox/samples/temp/helloworld-jsf/src/main/java/sample/HelloWorldController.java
+++ /dev/null
@@ -1,56 +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 sample;
-
-import org.oasisopen.sca.annotation.Reference;
-
-/**
- * 
- */
-public class HelloWorldController {
-
-    @Reference
-    protected HelloworldService service;
-
-    private String name;
-
-    public HelloWorldController() {
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    /**
-     * Method that is backed to a submit button of a form.
-     */
-    public String send() {
-        if (service == null) {
-            name = "reference not injected!";
-        } else {
-            name = service.sayHello(name);
-        }
-        return "success";
-    }
-
-}
diff --git a/sandbox/samples/temp/helloworld-jsf/src/main/java/sample/HelloworldService.java b/sandbox/samples/temp/helloworld-jsf/src/main/java/sample/HelloworldService.java
deleted file mode 100644
index 53ff7a5ca1..0000000000
--- a/sandbox/samples/temp/helloworld-jsf/src/main/java/sample/HelloworldService.java
+++ /dev/null
@@ -1,25 +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 sample;
-
-public interface HelloworldService {
-
-    String sayHello(String name);
-
-}
diff --git a/sandbox/samples/temp/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java b/sandbox/samples/temp/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java
deleted file mode 100644
index 23925d6c69..0000000000
--- a/sandbox/samples/temp/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java
+++ /dev/null
@@ -1,27 +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 sample;
-
-public class HelloworldServiceImpl implements HelloworldService {
-
-    public String sayHello(String name) {
-        return "Hello " + name;
-    }
-
-}
diff --git a/sandbox/samples/temp/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml b/sandbox/samples/temp/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml
deleted file mode 100644
index 99cee9faeb..0000000000
--- a/sandbox/samples/temp/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml
+++ /dev/null
@@ -1,51 +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.    
--->
-<faces-config version="1.2" 
-    xmlns="http://java.sun.com/xml/ns/javaee"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
-    
-    <!-- managed beans of the simple hello world app -->
-    <managed-bean>
-        <managed-bean-name>helloWorld</managed-bean-name>
-        <managed-bean-class>sample.HelloWorldController</managed-bean-class>
-        <managed-bean-scope>request</managed-bean-scope>
-    </managed-bean>
-    
-    <!-- navigation rules for helloWorld.jsp -->
-    <navigation-rule>
-        <from-view-id>/helloWorld.jsp</from-view-id>
-        <navigation-case>
-            <from-outcome>success</from-outcome>
-            <to-view-id>/page2.jsp</to-view-id>
-        </navigation-case>
-    </navigation-rule>
-    
-    <!-- navigation rules for page2.jsp -->
-    <navigation-rule>
-        <from-view-id>/page2.jsp</from-view-id>
-        <navigation-case>
-            <from-outcome>back</from-outcome>
-            <to-view-id>/helloWorld.jsp</to-view-id>
-        </navigation-case>
-    </navigation-rule>
-
-</faces-config>
diff --git a/sandbox/samples/temp/helloworld-jsf/src/main/webapp/WEB-INF/web.composite b/sandbox/samples/temp/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
deleted file mode 100644
index 8976adde3c..0000000000
--- a/sandbox/samples/temp/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
+++ /dev/null
@@ -1,34 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-           targetNamespace="http://samples"
-           name="Helloworld">
-
-    <component name="foo">
-        <implementation.web web-uri=""/>
-        <reference name="service" target="HelloworldComponent"/>
-    </component>
-
-    <component name="HelloworldComponent">
-        <implementation.java class="sample.HelloworldServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/sandbox/samples/temp/helloworld-jsf/src/main/webapp/WEB-INF/web.xml b/sandbox/samples/temp/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index fecbd7c79b..0000000000
--- a/sandbox/samples/temp/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.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.
--->
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-         version="2.4">
-
-    <description>MyProject web.xml</description>
-
-    <!-- The only web.xml change to the MyFaces Helloworld sample is to add
-         the Tuscany listener and annotation processor context parameter -->
-    <listener>
-       <listener-class>org.apache.tuscany.sca.host.webapp.TuscanyContextListener</listener-class>
-    </listener>
-    <context-param>
-        <param-name>org.apache.myfaces.config.annotation.LifecycleProvider</param-name>
-        <param-value>org.apache.tuscany.sca.myfaces.TuscanyAnnotationLifecycleProvider</param-value>
-    </context-param>
-
-    <!--optional: context-param>
-        <description>Comma separated list of URIs of (additional) faces config files.
-            (e.g. /WEB-INF/my-config.xml)
-            See JSF 1.0 PRD2, 10.3.2
-            Attention: You do not need to put /WEB-INF/faces-config.xml in here.
-        </description>
-        <param-name>javax.faces.CONFIG_FILES</param-name>
-        <param-value>/WEB-INF/examples-config.xml</param-value>
-    </context-param-->
-    <context-param>
-        <description>State saving method: "client" or "server" (= default)
-            See JSF Specification 2.5.3</description>
-        <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
-        <param-value>client</param-value>
-    </context-param>
-    <context-param>
-        <description>Only applicable if state saving method is "server" (= default).
-            Defines the amount (default = 20) of the latest views are stored in session.</description>
-        <param-name>org.apache.myfaces.NUMBER_OF_VIEWS_IN_SESSION</param-name>
-        <param-value>20</param-value>
-    </context-param>
-    <context-param>
-        <description>Only applicable if state saving method is "server" (= default).
-            If true (default) the state will be serialized to a byte stream before it
-            is written to the session.
-            If false the state will not be serialized to a byte stream.</description>
-        <param-name>org.apache.myfaces.SERIALIZE_STATE_IN_SESSION</param-name>
-        <param-value>true</param-value>
-    </context-param>
-    <context-param>
-        <description>Only applicable if state saving method is "server" (= default) and if
-            org.apache.myfaces.SERIALIZE_STATE_IN_SESSION is true (= default)
-            If true (default) the serialized state will be compressed before it
-            is written to the session. If false the state will not be compressed.</description>
-        <param-name>org.apache.myfaces.COMPRESS_STATE_IN_SESSION</param-name>
-        <param-value>true</param-value>
-    </context-param>
-    <context-param>
-        <description>This parameter tells MyFaces if javascript code should be allowed in the
-            rendered HTML output.
-            If javascript is allowed, command_link anchors will have javascript code
-            that submits the corresponding form.
-            If javascript is not allowed, the state saving info and nested parameters
-            will be added as url parameters.
-            Default: "true"</description>
-        <param-name>org.apache.myfaces.ALLOW_JAVASCRIPT</param-name>
-        <param-value>true</param-value>
-    </context-param>
-    <context-param>
-        <param-name>org.apache.myfaces.DETECT_JAVASCRIPT</param-name>
-        <param-value>false</param-value>
-    </context-param>
-    <context-param>
-        <description>If true, rendered HTML code will be formatted, so that it is "human readable".
-            i.e. additional line separators and whitespace will be written, that do not
-            influence the HTML code.
-            Default: "true"</description>
-        <param-name>org.apache.myfaces.PRETTY_HTML</param-name>
-        <param-value>true</param-value>
-    </context-param>
-    <context-param>
-        <description>If true, a javascript function will be rendered that is able to restore the
-            former vertical scroll on every request. Convenient feature if you have pages
-            with long lists and you do not want the browser page to always jump to the top
-            if you trigger a link or button action that stays on the same page.
-            Default: "false"</description>
-        <param-name>org.apache.myfaces.AUTO_SCROLL</param-name>
-        <param-value>true</param-value>
-    </context-param>
-
-    <context-param>
-        <description>Used for encrypting view state. Only relevant for client side
-            state saving. See MyFaces wiki/web site documentation for instructions
-            on how to configure an application for diffenent encryption strengths.
-        </description>
-        <param-name>org.apache.myfaces.SECRET</param-name>
-        <param-value>NzY1NDMyMTA=</param-value>
-    </context-param>
-
-    <context-param>
-        <description>
-            Validate managed beans, navigation rules and ensure that forms are not nested.
-        </description>
-        <param-name>org.apache.myfaces.VALIDATE</param-name>
-        <param-value>true</param-value>
-    </context-param>
-    
-    <context-param>
-        <description>
-            Treat readonly same as if disabled attribute was set for select elements.
-        </description>
-        <param-name>org.apache.myfaces.READONLY_AS_DISABLED_FOR_SELECTS</param-name>
-        <param-value>true</param-value>
-    </context-param>    
-    
-    <context-param>
-        <description>
-            Use the defined class as the class which will be called when a resource is added to the
-            ExtensionFilter handling. Using StreamingAddResource here helps with performance. If you want to add
-            custom components and want to use the ExtensionFilter, you need to provide your custom implementation here.
-        </description>
-        <param-name>org.apache.myfaces.ADD_RESOURCE_CLASS</param-name>
-        <param-value>org.apache.myfaces.renderkit.html.util.DefaultAddResource</param-value>
-    </context-param>        
-
-    <context-param>
-        <description>
-            Virtual path in the URL which triggers loading of resources for the MyFaces extended components
-            in the ExtensionFilter.
-        </description>
-        <param-name>org.apache.myfaces.RESOURCE_VIRTUAL_PATH</param-name>
-        <param-value>/faces/myFacesExtensionResource</param-value>
-    </context-param>
-    
-    <context-param>
-        <description>
-            Check if the extensions-filter has been properly configured.
-        </description>
-        <param-name>org.apache.myfaces.CHECK_EXTENSIONS_FILTER</param-name>
-        <param-value>true</param-value>
-    </context-param>    
-
-    <context-param>
-        <description>
-            Define partial state saving as true/false.
-        </description>
-        <param-name>javax.faces.PARTIAL_STATE_SAVING_METHOD</param-name>
-        <param-value>false</param-value>
-    </context-param>    
-
-    <!-- Listener, to allow Jetty serving MyFaces apps -->
-    <listener>
-        <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
-    </listener>
-
-    <!-- Faces Servlet -->
-    <servlet>
-        <servlet-name>Faces Servlet</servlet-name>
-        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <!-- Faces Servlet Mapping -->
-    <servlet-mapping>
-        <servlet-name>Faces Servlet</servlet-name>
-        <url-pattern>*.jsf</url-pattern>
-    </servlet-mapping>
-
-    <!-- Welcome files -->
-    <welcome-file-list>
-        <welcome-file>index.jsp</welcome-file>
-        <welcome-file>index.html</welcome-file>
-    </welcome-file-list>
-
-</web-app>
diff --git a/sandbox/samples/temp/helloworld-jsf/src/main/webapp/helloWorld.jsp b/sandbox/samples/temp/helloworld-jsf/src/main/webapp/helloWorld.jsp
deleted file mode 100644
index 189c142c99..0000000000
--- a/sandbox/samples/temp/helloworld-jsf/src/main/webapp/helloWorld.jsp
+++ /dev/null
@@ -1,40 +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.    
--->
-
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-
-<html>
-    <head>
-        <title>Apache Tuscany Helloworld JSF sample</title>
-    </head>
-    <body>
-        <h2>Apache Tuscany Helloworld JSF sample</h2>
-        <f:view>
-            <h:form id="mainForm">
-              <h:panelGrid columns="2">
-                <h:outputLabel for="name" value="Please enter your name" />
-                <h:inputText id="name" value="#{helloWorld.name}" required="true"/>
-                <h:commandButton value="Press me" action="#{helloWorld.send}"/>
-                <h:messages showDetail="true" showSummary="false"/>
-              </h:panelGrid>
-            </h:form>
-        </f:view>
-    </body>
-</html>
diff --git a/sandbox/samples/temp/helloworld-jsf/src/main/webapp/index.jsp b/sandbox/samples/temp/helloworld-jsf/src/main/webapp/index.jsp
deleted file mode 100644
index 5ca296e115..0000000000
--- a/sandbox/samples/temp/helloworld-jsf/src/main/webapp/index.jsp
+++ /dev/null
@@ -1,23 +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.    
--->
-
-<%@ page session="false"%>
-<%
-response.sendRedirect("helloWorld.jsf");
-%>
diff --git a/sandbox/samples/temp/helloworld-jsf/src/main/webapp/page2.jsp b/sandbox/samples/temp/helloworld-jsf/src/main/webapp/page2.jsp
deleted file mode 100644
index 89259021c7..0000000000
--- a/sandbox/samples/temp/helloworld-jsf/src/main/webapp/page2.jsp
+++ /dev/null
@@ -1,38 +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.    
--->
-
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<html>
-    <head>
-        <title>Apache Tuscany Helloworld JSF sample</title>
-    </head>
-    <body>
-        <h2>Apache Tuscany Helloworld JSF sample</h2>
-        <f:view>
-            <h:form id="mainForm">
-                <h:inputTextarea readonly="true" rows="20" cols="80" value="#{helloWorld.name}"/>
-                <br>
-                <h:commandLink action="back">
-                    <h:outputText value="Home"/>
-                </h:commandLink>
-            </h:form>
-        </f:view>
-    </body>
-</html>
diff --git a/sandbox/samples/temp/helloworld-jsp/README b/sandbox/samples/temp/helloworld-jsp/README
deleted file mode 100644
index 828aadb0f1..0000000000
--- a/sandbox/samples/temp/helloworld-jsp/README
+++ /dev/null
@@ -1,7 +0,0 @@
-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). 
-
-TODO - finish
\ No newline at end of file
diff --git a/sandbox/samples/temp/helloworld-jsp/pom.xml b/sandbox/samples/temp/helloworld-jsp/pom.xml
deleted file mode 100644
index 05a3e23895..0000000000
--- a/sandbox/samples/temp/helloworld-jsp/pom.xml
+++ /dev/null
@@ -1,98 +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-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>sample-helloworld-jsp-webapp</artifactId>
-    <packaging>war</packaging>
-    <name>Apache Tuscany SCA Sample Helloworld JSP</name>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca.shades</groupId>
-            <artifactId>tuscany-base</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.8.1</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>net.sourceforge.htmlunit</groupId>
-            <artifactId>htmlunit</artifactId>
-            <version>2.6</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>helloworld-jsp</finalName>
-       <plugins>
-          <plugin>
-             <groupId>org.mortbay.jetty</groupId>
-             <artifactId>maven-jetty-plugin</artifactId>
-             <version>6.1.18</version>
-             <configuration>
-                <contextPath>helloworld-jsp</contextPath>
-                <stopKey>foo</stopKey>
-                <stopPort>9999</stopPort>
-             </configuration>
-             <executions>
-                <execution>
-                   <id>start-jetty</id>
-                   <phase>process-test-classes</phase>
-                   <goals>
-                       <goal>run</goal>
-                   </goals>
-                   <configuration>
-                       <scanIntervalSeconds>0</scanIntervalSeconds>
-                       <daemon>true</daemon>
-                       <connectors>
-                          <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-                             <port>8085</port>
-                          </connector>
-                       </connectors>
-                   </configuration>
-                </execution>
-                <execution>
-                   <id>stop-jetty</id>
-                   <phase>prepare-package</phase>
-                   <goals>
-                       <goal>stop</goal>
-                   </goals>
-                </execution>
-             </executions>
-          </plugin>
-       </plugins>
-    </build>
-
-</project>
diff --git a/sandbox/samples/temp/helloworld-jsp/src/main/java/sample/HelloworldService.java b/sandbox/samples/temp/helloworld-jsp/src/main/java/sample/HelloworldService.java
deleted file mode 100644
index 53ff7a5ca1..0000000000
--- a/sandbox/samples/temp/helloworld-jsp/src/main/java/sample/HelloworldService.java
+++ /dev/null
@@ -1,25 +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 sample;
-
-public interface HelloworldService {
-
-    String sayHello(String name);
-
-}
diff --git a/sandbox/samples/temp/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java b/sandbox/samples/temp/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
deleted file mode 100644
index a22c095f29..0000000000
--- a/sandbox/samples/temp/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
+++ /dev/null
@@ -1,28 +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 sample;
-
-
-public class HelloworldServiceImpl implements HelloworldService {
-
-    public String sayHello(String name) {
-        return "Hello " + name;
-    }
-
-}
diff --git a/sandbox/samples/temp/helloworld-jsp/src/main/webapp/WEB-INF/web.composite b/sandbox/samples/temp/helloworld-jsp/src/main/webapp/WEB-INF/web.composite
deleted file mode 100644
index 8976adde3c..0000000000
--- a/sandbox/samples/temp/helloworld-jsp/src/main/webapp/WEB-INF/web.composite
+++ /dev/null
@@ -1,34 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-           targetNamespace="http://samples"
-           name="Helloworld">
-
-    <component name="foo">
-        <implementation.web web-uri=""/>
-        <reference name="service" target="HelloworldComponent"/>
-    </component>
-
-    <component name="HelloworldComponent">
-        <implementation.java class="sample.HelloworldServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/sandbox/samples/temp/helloworld-jsp/src/main/webapp/WEB-INF/web.xml b/sandbox/samples/temp/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index fa1f7ad7b9..0000000000
--- a/sandbox/samples/temp/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,41 +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.
--->
-<web-app version="2.4"
-         xmlns="http://java.sun.com/xml/ns/j2ee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >
-
-  <display-name>Apache Tuscany Helloworld JSP Sample</display-name>
-
-  <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>
-
-  <welcome-file-list id="WelcomeFileList">
-    <welcome-file>hello.jsp</welcome-file>
-  </welcome-file-list>
-
-</web-app>
diff --git a/sandbox/samples/temp/helloworld-jsp/src/main/webapp/hello.jsp b/sandbox/samples/temp/helloworld-jsp/src/main/webapp/hello.jsp
deleted file mode 100644
index ffd01cca73..0000000000
--- a/sandbox/samples/temp/helloworld-jsp/src/main/webapp/hello.jsp
+++ /dev/null
@@ -1,37 +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.    
--->
-
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="http://www.osoa.org/sca/sca_jsp.tld" prefix="sca" %>
-
-<sca:reference name="service" type="sample.HelloworldService" />
-
-<html>
-  <body >
-
-    <h2>Apache Tuscany Helloworld JSP Sample</h2>
-
-    Calling HelloworldService sayHello("world") returns:
-
-    <p>
-
-    <%= service.sayHello("world") %>
-
-  </body>
-</html>
diff --git a/sandbox/samples/temp/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java b/sandbox/samples/temp/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java
deleted file mode 100644
index 665957b0eb..0000000000
--- a/sandbox/samples/temp/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java
+++ /dev/null
@@ -1,53 +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 itest;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.util.Iterator;
-
-import org.junit.Test;
-
-import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlElement;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.gargoylesoftware.htmlunit.html.HtmlParagraph;
-
-/**
- */
-public class HelloworldTestCase {
-
-    @Test
-    public void testA() throws FailingHttpStatusCodeException, MalformedURLException, IOException {
-        HtmlPage page = (HtmlPage)new WebClient().getPage("http://localhost:8085/helloworld-jsp");
-        Iterator<?> ss = page.getAllHtmlChildElements().iterator();
-        while(ss.hasNext()) {
-            HtmlElement htmlElement = (HtmlElement) ss.next();
-            if( htmlElement instanceof HtmlParagraph) {
-                assertEquals("Hello world", htmlElement.asText());
-                break;
-            }
-        }
-    }
-
-}
diff --git a/sandbox/samples/temp/helloworld-servlet/README b/sandbox/samples/temp/helloworld-servlet/README
deleted file mode 100644
index 828aadb0f1..0000000000
--- a/sandbox/samples/temp/helloworld-servlet/README
+++ /dev/null
@@ -1,7 +0,0 @@
-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). 
-
-TODO - finish
\ No newline at end of file
diff --git a/sandbox/samples/temp/helloworld-servlet/pom.xml b/sandbox/samples/temp/helloworld-servlet/pom.xml
deleted file mode 100644
index 45725aaf72..0000000000
--- a/sandbox/samples/temp/helloworld-servlet/pom.xml
+++ /dev/null
@@ -1,105 +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-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>sample-helloworld-servlet-webapp</artifactId>
-    <packaging>war</packaging>
-    <name>Apache Tuscany SCA Sample Helloworld Servlet</name>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca.shades</groupId>
-            <artifactId>tuscany-base-nodep</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.8.1</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>net.sourceforge.htmlunit</groupId>
-            <artifactId>htmlunit</artifactId>
-            <version>2.6</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>helloworld-servlet</finalName>
-       <plugins>
-          <plugin>
-             <groupId>org.mortbay.jetty</groupId>
-             <artifactId>maven-jetty-plugin</artifactId>
-             <version>6.1.18</version>
-             <configuration>
-                <contextPath>helloworld-servlet</contextPath>
-                <stopKey>foo</stopKey>
-                <stopPort>9999</stopPort>
-             </configuration>
-             <executions>
-                <execution>
-                   <id>start-jetty</id>
-                   <phase>process-test-classes</phase>
-                   <goals>
-                       <goal>run</goal>
-                   </goals>
-                   <configuration>
-                       <scanIntervalSeconds>0</scanIntervalSeconds>
-                       <daemon>true</daemon>
-                       <connectors>
-                          <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-                             <port>8085</port>
-                          </connector>
-                       </connectors>
-                   </configuration>
-                </execution>
-                <execution>
-                   <id>stop-jetty</id>
-                   <phase>prepare-package</phase>
-                   <goals>
-                       <goal>stop</goal>
-                   </goals>
-                </execution>
-             </executions>
-          </plugin>
-       </plugins>
-    </build>
-</project>
-
diff --git a/sandbox/samples/temp/helloworld-servlet/src/main/java/sample/HelloworldService.java b/sandbox/samples/temp/helloworld-servlet/src/main/java/sample/HelloworldService.java
deleted file mode 100644
index 2e43e09897..0000000000
--- a/sandbox/samples/temp/helloworld-servlet/src/main/java/sample/HelloworldService.java
+++ /dev/null
@@ -1,25 +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 sample;
-
-public interface HelloworldService {
-
-    String sayHello(String name);
-
-}
diff --git a/sandbox/samples/temp/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java b/sandbox/samples/temp/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
deleted file mode 100644
index 9e79276704..0000000000
--- a/sandbox/samples/temp/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
+++ /dev/null
@@ -1,27 +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 sample;
-
-public class HelloworldServiceImpl implements HelloworldService {
-
-    public String sayHello(String name) {
-        return "Hello " + name;
-    }
-
-}
diff --git a/sandbox/samples/temp/helloworld-servlet/src/main/java/sample/HelloworldServlet.java b/sandbox/samples/temp/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
deleted file mode 100644
index bb72c50f6a..0000000000
--- a/sandbox/samples/temp/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
+++ /dev/null
@@ -1,64 +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 sample;
-
-import java.io.IOException;
-import java.io.Writer;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.oasisopen.sca.ComponentContext;
-import org.oasisopen.sca.annotation.Reference;
-
-/**
- */
-public class HelloworldServlet extends HttpServlet {
-    private static final long serialVersionUID = 1L;
-
-    @Reference
-    protected HelloworldService service;
-
-    @Override
-    public void init(ServletConfig servletConfig) throws ServletException {
-        if (service == null) {
-            System.out.println("HelloworldServlet reference injection failed, using ComponentContext");
-            ComponentContext cc = (ComponentContext)servletConfig.getServletContext().getAttribute("org.oasisopen.sca.ComponentContext");
-            service = cc.getService(HelloworldService.class, "service");
-        }
-    }
-
-    @Override
-    protected void service(HttpServletRequest request, HttpServletResponse response) throws IOException {
-
-    	String name = request.getParameter("name");
-    	String greeting = service.sayHello(name);
-
-        Writer out = response.getWriter();
-        out.write("<html><head><title>Apache Tuscany Helloworld Servlet Sample</title></head><body>");
-        out.write("<h2>Apache Tuscany Helloworld Servlet Sample</h2>");
-        out.write("<br><strong>Result: </strong>" + greeting);
-        out.write("</body></html>");
-        out.flush();
-        out.close();
-    }
-}
diff --git a/sandbox/samples/temp/helloworld-servlet/src/main/webapp/WEB-INF/web.composite b/sandbox/samples/temp/helloworld-servlet/src/main/webapp/WEB-INF/web.composite
deleted file mode 100644
index 8976adde3c..0000000000
--- a/sandbox/samples/temp/helloworld-servlet/src/main/webapp/WEB-INF/web.composite
+++ /dev/null
@@ -1,34 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-           targetNamespace="http://samples"
-           name="Helloworld">
-
-    <component name="foo">
-        <implementation.web web-uri=""/>
-        <reference name="service" target="HelloworldComponent"/>
-    </component>
-
-    <component name="HelloworldComponent">
-        <implementation.java class="sample.HelloworldServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/sandbox/samples/temp/helloworld-servlet/src/main/webapp/WEB-INF/web.xml b/sandbox/samples/temp/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index a91b3fc96b..0000000000
--- a/sandbox/samples/temp/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,44 +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.
--->
-<web-app version="2.4"
-         xmlns="http://java.sun.com/xml/ns/j2ee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >
-
-    <display-name>Apache Tuscany Helloworld Servlet Sample</display-name>
-
-	<listener><listener-class>org.apache.tuscany.sca.host.webapp.TuscanyContextListener</listener-class></listener>
-
-    <servlet>
-        <servlet-name>HelloworldServlet</servlet-name>
-        <servlet-class>sample.HelloworldServlet</servlet-class>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>HelloworldServlet</servlet-name>
-        <url-pattern>/HelloworldServlet</url-pattern>
-    </servlet-mapping>
-
-    <welcome-file-list id="WelcomeFileList">
-        <welcome-file>hello.html</welcome-file>
-    </welcome-file-list>
-
-</web-app>
-
diff --git a/sandbox/samples/temp/helloworld-servlet/src/main/webapp/hello.html b/sandbox/samples/temp/helloworld-servlet/src/main/webapp/hello.html
deleted file mode 100644
index c4484916aa..0000000000
--- a/sandbox/samples/temp/helloworld-servlet/src/main/webapp/hello.html
+++ /dev/null
@@ -1,46 +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.
--->
-<html>
-
-<head>
-<title>Apache Tuscany Helloworld Servlet Sample</title>
-</head>
-
-<body>
-
-<h2>Apache Tuscany Helloworld Servlet Sample</h2>
-
-<form action="HelloworldServlet" method="post">
-    <table>
-        <tr>
-            <td>Enter your name:</td>
-            <td>
-                <input type="text" name="name" width="10">
-            </td>
-        </tr>
-        <tr>
-            <td align="left" colspan="2">
-                <button name="submit" type="submit">Say hello</button>
-            </td>
-        </tr>
-    </table>
-</form>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/sandbox/samples/temp/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java b/sandbox/samples/temp/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java
deleted file mode 100644
index 61d722da1f..0000000000
--- a/sandbox/samples/temp/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java
+++ /dev/null
@@ -1,55 +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 itest;
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-
-import org.junit.Test;
-
-import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlButton;
-import com.gargoylesoftware.htmlunit.html.HtmlForm;
-import com.gargoylesoftware.htmlunit.html.HtmlInput;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-
-/**
- */
-public class HelloworldTestCase {
-
-    @Test
-    public void testA() throws FailingHttpStatusCodeException, MalformedURLException, IOException {
-        HtmlPage page = (HtmlPage)new WebClient().getPage("http://localhost:8085/helloworld-servlet");
-
-        HtmlForm form = (HtmlForm) page.getForms().get(0);
-
-        HtmlInput textField = form.getInputByName("name");
-        textField.setValueAttribute("petra");
-
-        HtmlButton button = (HtmlButton) form.getButtonsByName("submit").get(0);
-
-        HtmlPage pageResponse = (HtmlPage) button.click();
-        
-        assertTrue(pageResponse.getWebResponse().getContentAsString().endsWith("</strong>Hello petra</body></html>"));
-    }
-
-}
diff --git a/sandbox/samples/temp/helloworld-spring-contribution/pom.xml b/sandbox/samples/temp/helloworld-spring-contribution/pom.xml
deleted file mode 100644
index b8cb765c38..0000000000
--- a/sandbox/samples/temp/helloworld-spring-contribution/pom.xml
+++ /dev/null
@@ -1,67 +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-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>sample-helloworld-spring</artifactId>
-    <name>Apache Tuscany SCA Sample HelloWorld using Spring</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>provided</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 to support using mvn tuscany:run to run this contribution -->
-         <plugin>
-             <groupId>org.apache.tuscany.maven.plugins</groupId>
-             <artifactId>maven-tuscany-plugin</artifactId>
-             <version>2.0-SNAPSHOT</version>
-             <dependencies>
-                <dependency>
-                   <groupId>org.apache.tuscany.sca.shades</groupId>
-                   <artifactId>tuscany-spring</artifactId>
-                   <version>2.0-SNAPSHOT</version>
-                </dependency>
-             </dependencies>
-         </plugin>
-
-       </plugins>
-    </build>
-</project>
diff --git a/sandbox/samples/temp/helloworld-spring-contribution/src/main/java/sample/DateService.java b/sandbox/samples/temp/helloworld-spring-contribution/src/main/java/sample/DateService.java
deleted file mode 100644
index 7c50d66a9c..0000000000
--- a/sandbox/samples/temp/helloworld-spring-contribution/src/main/java/sample/DateService.java
+++ /dev/null
@@ -1,29 +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 sample;
-
-import java.util.Date;
-
-/**
- * 
- */
-public interface DateService {
-    Date getDate();
-}
diff --git a/sandbox/samples/temp/helloworld-spring-contribution/src/main/java/sample/DateServiceImpl.java b/sandbox/samples/temp/helloworld-spring-contribution/src/main/java/sample/DateServiceImpl.java
deleted file mode 100644
index 64bdd86f7c..0000000000
--- a/sandbox/samples/temp/helloworld-spring-contribution/src/main/java/sample/DateServiceImpl.java
+++ /dev/null
@@ -1,37 +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 sample;
-
-import java.util.Date;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * 
- */
-@Service(DateService.class)
-public class DateServiceImpl implements DateService {
-
-    public Date getDate() {
-        System.out.println("DateServiceImpl.getDate()");
-        return new Date();
-    }
-
-}
diff --git a/sandbox/samples/temp/helloworld-spring-contribution/src/main/java/sample/Helloworld.java b/sandbox/samples/temp/helloworld-spring-contribution/src/main/java/sample/Helloworld.java
deleted file mode 100644
index f4e8c50448..0000000000
--- a/sandbox/samples/temp/helloworld-spring-contribution/src/main/java/sample/Helloworld.java
+++ /dev/null
@@ -1,28 +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 sample;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Helloworld {
-
-    String sayHello(String name);
-
-}
diff --git a/sandbox/samples/temp/helloworld-spring-contribution/src/main/java/sample/HelloworldClientImpl.java b/sandbox/samples/temp/helloworld-spring-contribution/src/main/java/sample/HelloworldClientImpl.java
deleted file mode 100644
index ddcb1d9bc3..0000000000
--- a/sandbox/samples/temp/helloworld-spring-contribution/src/main/java/sample/HelloworldClientImpl.java
+++ /dev/null
@@ -1,48 +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 sample;
-
-import org.oasisopen.sca.annotation.Reference;
-
-public class HelloworldClientImpl implements Helloworld {
-    private Helloworld helloworld;
-
-    // SCA reference
-    @Reference(required = false)
-    private DateService dateService;
-
-    public HelloworldClientImpl() {
-        System.out.println("HelloworldClientImpl()");
-    }
-
-    public String sayHello(String name) {
-        System.out.println("HelloworldClientImpl.sayHello(" + name + ")");
-        if (dateService == null) {
-            return "Hello " + name;
-        }
-        return "[" + dateService.getDate() + "] " + helloworld.sayHello(name);
-    }
-
-    // Setter for spring injection
-    public void setHelloworld(Helloworld helloworld) {
-        System.out.println("Injected with " + helloworld);
-        this.helloworld = helloworld;
-    }
-
-}
diff --git a/sandbox/samples/temp/helloworld-spring-contribution/src/main/java/sample/HelloworldImpl.java b/sandbox/samples/temp/helloworld-spring-contribution/src/main/java/sample/HelloworldImpl.java
deleted file mode 100644
index 125c333ddc..0000000000
--- a/sandbox/samples/temp/helloworld-spring-contribution/src/main/java/sample/HelloworldImpl.java
+++ /dev/null
@@ -1,34 +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 sample;
-
-
-public class HelloworldImpl implements Helloworld {
-
-    public HelloworldImpl() {
-        super();
-        System.out.println("HelloworldImpl()");
-    }
-
-    public String sayHello(String name) {
-        System.out.println("HelloworldImpl.sayHello(" + name + ")");
-        return "Hello " + name;
-    }
-
-}
diff --git a/sandbox/samples/temp/helloworld-spring-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/samples/temp/helloworld-spring-contribution/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 552d100638..0000000000
--- a/sandbox/samples/temp/helloworld-spring-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
-              xmlns:sample="http://sample">
-   <deployable composite="sample:helloworld"/>
-</contribution>
\ No newline at end of file
diff --git a/sandbox/samples/temp/helloworld-spring-contribution/src/main/resources/helloworld-client-context.xml b/sandbox/samples/temp/helloworld-spring-contribution/src/main/resources/helloworld-client-context.xml
deleted file mode 100644
index 15e9647bb0..0000000000
--- a/sandbox/samples/temp/helloworld-spring-contribution/src/main/resources/helloworld-client-context.xml
+++ /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.    
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-       http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-
-    <bean id="HelloworldClientBean" class="sample.HelloworldClientImpl">
-        <property name="helloworld">
-            <ref bean="HelloworldBean"/>
-        </property>
-    </bean>
-    
-    <!-- 
-    <sca:reference name="dateService" type="sample.DateService"/>
-    -->
-
-</beans>
\ No newline at end of file
diff --git a/sandbox/samples/temp/helloworld-spring-contribution/src/main/resources/helloworld-context.xml b/sandbox/samples/temp/helloworld-spring-contribution/src/main/resources/helloworld-context.xml
deleted file mode 100644
index 9ecd09974e..0000000000
--- a/sandbox/samples/temp/helloworld-spring-contribution/src/main/resources/helloworld-context.xml
+++ /dev/null
@@ -1,30 +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.    
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-       http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-
-    <bean id="HelloworldBean" class="sample.HelloworldImpl">
-    </bean>
-
-</beans>
\ No newline at end of file
diff --git a/sandbox/samples/temp/helloworld-spring-contribution/src/main/resources/helloworld.composite b/sandbox/samples/temp/helloworld-spring-contribution/src/main/resources/helloworld.composite
deleted file mode 100644
index 6d356758ae..0000000000
--- a/sandbox/samples/temp/helloworld-spring-contribution/src/main/resources/helloworld.composite
+++ /dev/null
@@ -1,36 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
-      targetNamespace="http://sample"
-      xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-      name="helloworld">
-    
-    <component name="HelloworldClientComponent">
-        <implementation.spring location="helloworld-client-context.xml"/>
-        <service name="HelloworldClientBean">
-            <tuscany:binding.jsonrpc/>
-        </service>
-        <reference name="dateService" target="DateServiceComponent"/>
-    </component>
-    
-    <component name="DateServiceComponent">
-        <implementation.java class="sample.DateServiceImpl"/>
-    </component>
-</composite>
diff --git a/sandbox/samples/temp/helloworld-spring-contribution/src/test/java/sample/HelloworldTestCase.java b/sandbox/samples/temp/helloworld-spring-contribution/src/test/java/sample/HelloworldTestCase.java
deleted file mode 100644
index 7e679ec0e9..0000000000
--- a/sandbox/samples/temp/helloworld-spring-contribution/src/test/java/sample/HelloworldTestCase.java
+++ /dev/null
@@ -1,33 +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 sample;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-public class HelloworldTestCase {
-
-    @Test
-    public void testSayHello() {
-        HelloworldImpl helloworld = new HelloworldImpl();
-        assertEquals("Hello Petra", helloworld.sayHello("Petra"));
-    }
-
-}
diff --git a/sandbox/samples/temp/helloworld-spring-webapp/pom.xml b/sandbox/samples/temp/helloworld-spring-webapp/pom.xml
deleted file mode 100644
index 59f3a25696..0000000000
--- a/sandbox/samples/temp/helloworld-spring-webapp/pom.xml
+++ /dev/null
@@ -1,186 +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-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>sample-helloworld-spring-webapp</artifactId>
-    <name>Apache Tuscany SCA Sample Spring Helloworld</name>
-    <packaging>war</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-feature-web20</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <type>pom</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-spring-webapp</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-spring-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-webapp</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>sample-helloworld-spring</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.8.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>httpunit</groupId>
-            <artifactId>httpunit</artifactId>
-            <version>1.6.1</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <finalName>helloworld-spring</finalName>
-        <plugins>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <!-- Skip the normal tests, we'll run them in the integration-test phase -->
-                    <skip>true</skip>
-                </configuration>
-
-                <executions>
-                    <execution>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>test</goal>
-                        </goals>
-                        <configuration>
-                            <!-- Ingore the test failures so that the build will proceed to stop the tomcat server -->
-                            <testFailureIgnore>true</testFailureIgnore>
-                            <skip>false</skip>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                    <overlays>
-                        <overlay>
-                            <groupId>org.apache.tuscany.sca</groupId>
-                            <artifactId>sample-helloworld-spring</artifactId>
-                            <type>jar</type>
-                            <targetPath>WEB-INF/classes</targetPath>
-                            <excludes>
-                                <exclude>META-INF/**/*</exclude>
-                            </excludes>
-                        </overlay>
-                        
-                        <overlay>
-                            <groupId>org.apache.tuscany.sca</groupId>
-                            <artifactId>sample-helloworld-spring</artifactId>
-                            <type>jar</type>
-                            <includes>
-                                <include>META-INF/**/*</include>
-                            </includes>
-                        </overlay>
-
-                        <overlay>
-                            <groupId>org.apache.tuscany.sca</groupId>
-                            <artifactId>tuscany-implementation-spring-webapp</artifactId>
-                            <type>jar</type>
-                            <targetPath>WEB-INF/classes</targetPath>
-                            <includes>
-                                <include>org/apache/tuscany/sca/implementation/spring/webapp/spring-webapp-context.xml</include>
-                            </includes>
-                        </overlay>
-                    </overlays>                        
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>maven-jetty-plugin</artifactId>
-                <version>6.1.18</version>
-                <configuration>
-                    <contextPath>helloworld</contextPath>
-                    <stopKey>foo</stopKey>
-                    <stopPort>9999</stopPort>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>start-jetty</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <overrideWebXml>src/test/resources/test-web.xml</overrideWebXml>
-                            <webAppSourceDirectory>${project.build.directory}/${project.build.finalName}</webAppSourceDirectory>
-                            <webXml>${project.build.directory}/${project.build.finalName}/WEB-INF/web.xml</webXml>
-                            <classesDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</classesDirectory>                            
-                            <scanIntervalSeconds>0</scanIntervalSeconds>
-                            <daemon>true</daemon>
-                            <connectors>
-                                <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-                                    <port>8085</port>
-                                </connector>
-                            </connectors>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>stop-jetty</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>stop</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/sandbox/samples/temp/helloworld-spring-webapp/src/main/webapp/WEB-INF/web.xml b/sandbox/samples/temp/helloworld-spring-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 49590e00a2..0000000000
--- a/sandbox/samples/temp/helloworld-spring-webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,51 +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.
--->
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-
-    <display-name>Apache Tuscany Helloworld Spring Sample</display-name>
-
-    <context-param>
-        <param-name>contextConfigLocation</param-name>
-        <param-value>
-        /WEB-INF/classes/helloworld-context.xml
-        /WEB-INF/classes/org/apache/tuscany/sca/implementation/spring/webapp/spring-webapp-context.xml
-        </param-value>
-    </context-param>
-
-    <listener>
-        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-    </listener>
-    
-    <listener>
-        <listener-class>org.apache.tuscany.sca.host.webapp.TuscanyContextListener</listener-class>
-    </listener>
-
-    <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/sandbox/samples/temp/helloworld-spring-webapp/src/test/java/sample/HelloworldClientTestCase.java b/sandbox/samples/temp/helloworld-spring-webapp/src/test/java/sample/HelloworldClientTestCase.java
deleted file mode 100644
index fa77f08ee2..0000000000
--- a/sandbox/samples/temp/helloworld-spring-webapp/src/test/java/sample/HelloworldClientTestCase.java
+++ /dev/null
@@ -1,58 +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 sample;
-
-import java.io.ByteArrayInputStream;
-
-import junit.framework.Assert;
-
-import org.json.JSONObject;
-import org.junit.Test;
-
-import com.meterware.httpunit.PostMethodWebRequest;
-import com.meterware.httpunit.WebConversation;
-import com.meterware.httpunit.WebRequest;
-import com.meterware.httpunit.WebResponse;
-
-
-/**
- * 
- */
-public class HelloworldClientTestCase {
-    private static final String SERVICE_URL =
-        "http://localhost:8085/helloworld/HelloworldClientComponent/HelloworldClientBean";
-
-    @Test
-    public void testJSONRPCBinding() throws Exception {
-        JSONObject jsonRequest = new JSONObject("{ \"method\": \"sayHello\", \"params\": [\"Ray\"], \"id\": 1}");
-
-        WebConversation wc = new WebConversation();
-        WebRequest request =
-            new PostMethodWebRequest(SERVICE_URL, new ByteArrayInputStream(jsonRequest.toString().getBytes("UTF-8")),
-                                     "application/json");
-        WebResponse response = wc.getResource(request);
-
-        Assert.assertEquals(200, response.getResponseCode());
-
-        JSONObject jsonResp = new JSONObject(response.getText());
-        String text = jsonResp.getString("result");
-        Assert.assertTrue(text.endsWith("Hello Ray"));
-    }
-}
diff --git a/sandbox/samples/temp/helloworld-spring-webapp/src/test/resources/test-web.xml b/sandbox/samples/temp/helloworld-spring-webapp/src/test/resources/test-web.xml
deleted file mode 100644
index ac5c134454..0000000000
--- a/sandbox/samples/temp/helloworld-spring-webapp/src/test/resources/test-web.xml
+++ /dev/null
@@ -1,25 +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.
--->
-<web-app version="2.4"
-         xmlns="http://java.sun.com/xml/ns/j2ee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >
-
-</web-app>
-- 
cgit v1.2.3