Delete test branch created by the release plugin

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@756421 13f79535-47bb-0310-9956-ffa450edef68
author: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> 2009-03-20 11:29:50 +0000
committer: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> 2009-03-20 11:29:50 +0000
commit: 174374d300ce6001996d70516a6b1f563f3c8985 (patch)
tree: 928e56bace1942f53c54d3e45749744434d5946a /branches/2.0-M2/samples/webapps/helloworld
parent: 048898980cb3ece6e4800de9579505d290d92c27 (diff)
45 files changed, 0 insertions, 1699 deletions
diff --git a/branches/2.0-M2/samples/webapps/helloworld-jsf/pom.xml b/branches/2.0-M2/samples/webapps/helloworld-jsf/pom.xml
deleted file mode 100644
index 09bb3ebd5b..0000000000
--- a/branches/2.0-M2/samples/webapps/helloworld-jsf/pom.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>helloworld-jsf</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.myfaces.core</groupId>
-            <artifactId>myfaces-impl</artifactId>
-            <version>1.2.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-
-</project>
diff --git a/branches/2.0-M2/samples/webapps/helloworld-jsf/src/main/java/sample/HelloWorldController.java b/branches/2.0-M2/samples/webapps/helloworld-jsf/src/main/java/sample/HelloWorldController.java
deleted file mode 100644
index 931c1ad820..0000000000
--- a/branches/2.0-M2/samples/webapps/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/branches/2.0-M2/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldService.java b/branches/2.0-M2/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldService.java
deleted file mode 100644
index 123774b936..0000000000
--- a/branches/2.0-M2/samples/webapps/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/branches/2.0-M2/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java b/branches/2.0-M2/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java
deleted file mode 100644
index 6db7e93188..0000000000
--- a/branches/2.0-M2/samples/webapps/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/branches/2.0-M2/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml b/branches/2.0-M2/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml
deleted file mode 100644
index 3a51ed2623..0000000000
--- a/branches/2.0-M2/samples/webapps/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/branches/2.0-M2/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite b/branches/2.0-M2/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
deleted file mode 100644
index 7e2ca0a158..0000000000
--- a/branches/2.0-M2/samples/webapps/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/200712"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-           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/branches/2.0-M2/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml b/branches/2.0-M2/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 7fd6bd6b6b..0000000000
--- a/branches/2.0-M2/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,181 +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>
-
-    <!--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/branches/2.0-M2/samples/webapps/helloworld-jsf/src/main/webapp/helloWorld.jsp b/branches/2.0-M2/samples/webapps/helloworld-jsf/src/main/webapp/helloWorld.jsp
deleted file mode 100644
index 189c142c99..0000000000
--- a/branches/2.0-M2/samples/webapps/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/branches/2.0-M2/samples/webapps/helloworld-jsf/src/main/webapp/index.jsp b/branches/2.0-M2/samples/webapps/helloworld-jsf/src/main/webapp/index.jsp
deleted file mode 100644
index 5ca296e115..0000000000
--- a/branches/2.0-M2/samples/webapps/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/branches/2.0-M2/samples/webapps/helloworld-jsf/src/main/webapp/page2.jsp b/branches/2.0-M2/samples/webapps/helloworld-jsf/src/main/webapp/page2.jsp
deleted file mode 100644
index 89259021c7..0000000000
--- a/branches/2.0-M2/samples/webapps/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/branches/2.0-M2/samples/webapps/helloworld-jsp/pom.xml b/branches/2.0-M2/samples/webapps/helloworld-jsp/pom.xml
deleted file mode 100644
index a1b2f7c635..0000000000
--- a/branches/2.0-M2/samples/webapps/helloworld-jsp/pom.xml
+++ /dev/null
@@ -1,55 +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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>helloworld-jsp</artifactId>
-    <packaging>war</packaging>
-    <name>Apache Tuscany SCA Sample Helloworld JSP</name>
-
-    <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>
-
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-
-</project>
diff --git a/branches/2.0-M2/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java b/branches/2.0-M2/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java
deleted file mode 100644
index 123774b936..0000000000
--- a/branches/2.0-M2/samples/webapps/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/branches/2.0-M2/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java b/branches/2.0-M2/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
deleted file mode 100644
index 66cef71a25..0000000000
--- a/branches/2.0-M2/samples/webapps/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/branches/2.0-M2/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite b/branches/2.0-M2/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite
deleted file mode 100644
index 56ed55b2d5..0000000000
--- a/branches/2.0-M2/samples/webapps/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/200903"
-           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/branches/2.0-M2/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml b/branches/2.0-M2/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index a5b03d4904..0000000000
--- a/branches/2.0-M2/samples/webapps/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/branches/2.0-M2/samples/webapps/helloworld-jsp/src/main/webapp/hello.jsp b/branches/2.0-M2/samples/webapps/helloworld-jsp/src/main/webapp/hello.jsp
deleted file mode 100644
index ffd01cca73..0000000000
--- a/branches/2.0-M2/samples/webapps/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/branches/2.0-M2/samples/webapps/helloworld-stripes/pom.xml b/branches/2.0-M2/samples/webapps/helloworld-stripes/pom.xml
deleted file mode 100644
index ea57f201b1..0000000000
--- a/branches/2.0-M2/samples/webapps/helloworld-stripes/pom.xml
+++ /dev/null
@@ -1,65 +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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>helloworld-stripes</artifactId>
-    <packaging>war</packaging>
-    <name>Apache Tuscany SCA Sample Helloworld using Stripes</name>
-
-    <dependencies>
-
-        <!--  Tuscany dependencies -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-stripes</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <!--  Stripes Framework dependencies -->
-        <dependency>
-            <groupId>net.sourceforge.stripes</groupId>
-            <artifactId>stripes</artifactId>
-            <version>1.5</version>
-        </dependency>
-        <dependency>
-            <groupId>taglibs</groupId>
-            <artifactId>standard</artifactId>
-            <version>1.1.2</version>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-
-</project>
diff --git a/branches/2.0-M2/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java b/branches/2.0-M2/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java
deleted file mode 100644
index 901e3ff1b8..0000000000
--- a/branches/2.0-M2/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package mystripes.action;
-
-import net.sourceforge.stripes.action.ActionBean;
-import net.sourceforge.stripes.action.ActionBeanContext;
-
-public class BaseActionBean implements ActionBean {
-    private ActionBeanContext context;
-
-    public ActionBeanContext getContext() {
-        return context;
-    }
-    public void setContext(ActionBeanContext context) {
-        this.context = context;
-    }
-}
diff --git a/branches/2.0-M2/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java b/branches/2.0-M2/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java
deleted file mode 100644
index acbe5456ea..0000000000
--- a/branches/2.0-M2/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package mystripes.action;
-
-import net.sourceforge.stripes.action.DefaultHandler;
-import net.sourceforge.stripes.action.ForwardResolution;
-import net.sourceforge.stripes.action.Resolution;
-import net.sourceforge.stripes.action.UrlBinding;
-
-import org.oasisopen.sca.annotation.Reference;
-
-import sample.HelloworldService;
-
-@UrlBinding("/Home.htm")
-public class HomeActionBean extends BaseActionBean {
-
-    @Reference
-    HelloworldService service;
-
-    @DefaultHandler
-    public Resolution view() {
-        return new ForwardResolution("/WEB-INF/jsp/home.jsp");
-    }
-
-    public String getHello() {
-        return service.sayHello("world");
-    }
-
-}
diff --git a/branches/2.0-M2/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldService.java b/branches/2.0-M2/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldService.java
deleted file mode 100644
index 123774b936..0000000000
--- a/branches/2.0-M2/samples/webapps/helloworld-stripes/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/branches/2.0-M2/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java b/branches/2.0-M2/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java
deleted file mode 100644
index 66cef71a25..0000000000
--- a/branches/2.0-M2/samples/webapps/helloworld-stripes/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/branches/2.0-M2/samples/webapps/helloworld-stripes/src/main/resources/StripesResources.properties b/branches/2.0-M2/samples/webapps/helloworld-stripes/src/main/resources/StripesResources.properties
deleted file mode 100644
index a23399569a..0000000000
--- a/branches/2.0-M2/samples/webapps/helloworld-stripes/src/main/resources/StripesResources.properties
+++ /dev/null
@@ -1,57 +0,0 @@
-
-# Resource strings used by the <stripes:errors> tag when there are no nested tags
-stripes.errors.header=<div style="color:#b72222; font-weight: bold">Please fix the following errors:</div><ol>
-stripes.errors.beforeError=<li style="color: #b72222;">
-stripes.errors.afterError=</li>
-stripes.errors.footer=</ol>
-
-# Resource strings used by the <stripes:errors> tag when displaying errors for a
-# specific field (e.g. <stripes:errors field="password"/>). If not supplied the
-# values above will be used instead.
-stripes.fieldErrors.header=
-stripes.fieldErrors.beforeError=<span style="color: #b72222;">
-stripes.fieldErrors.afterError=</span><br />
-stripes.fieldErrors.footer=
-
-# Resource strings used by the stripes:messages tag
-stripes.messages.header=<ul class="messages">
-stripes.messages.beforeMessage=<li>
-stripes.messages.afterMessage=</li>
-stripes.messages.footer=</ul>
-
-# Validation error messages produced by Stripes' built-in converter classes. These
-# are default error messages and can be overridden on per-field and per-form levels.
-# Using the 'invalidNumber' error for a field 'age' of a form posting to
-# '/user/Profile.action', the keys looked for (in order) would be:
-#      1: /user/Profile.action.age.invalidNumber
-#      2: /user/Profile.action.age.errorMessage
-#      3: age.errorMessage
-#      4: /user/Profile.action.invalidNumber
-#      5: converter.number.invalidNumber
-converter.number.invalidNumber=The value ({1}) entered in field {0} must be a valid number
-converter.byte.outOfRange=The value ({1}) entered in field {0} was out of the range {2} to {3}
-converter.short.outOfRange=The value ({1}) entered in field {0} was out of the range {2} to {3}
-converter.integer.outOfRange=The value ({1}) entered in field {0} was out of the range {2} to {3}
-converter.float.outOfRange=The value ({1}) entered in field {0} was out of the range {2} to {3}
-converter.enum.notAnEnumeratedValue=The value "{1}" is not a valid value for field {0}
-converter.date.invalidDate=The value ({1}) entered in field {0} must be a valid date
-converter.email.invalidEmail=The value ({1}) entered is not a valid email address
-converter.creditCard.invalidCreditCard=The value ({1}) entered is not a valid credit card number
-
-# Validation error messages produced by Stripes' annotation based validations. These
-# are default error messages and can be overridden on per-field and per-form levels.
-# Using the 'valueNotPresent' required field error for a field 'username' of a form
-# posting to '/user/Register.action', the keys looked for (in order) would be:
-#      1: /user/Register.action.username.valueNotPresent
-#      2: /user/Register.action.username.errorMessage
-#      3: username.errorMessage
-#      4: /user/Register.action.valueNotPresent
-#      5: validation.required.valueNotPresent
-validation.required.valueNotPresent={0} is a required field
-validation.minlength.valueTooShort={0} must be at least {2} characters long
-validation.maxlength.valueTooLong={0} must be no more than {2} characters long
-validation.minvalue.valueBelowMinimum=The minimum allowed value for {0} is {2}
-validation.maxvalue.valueAboveMaximum=The maximum allowed value for {0} is {2}
-validation.mask.valueDoesNotMatch=<em>{1}</em> is not a valid {0}
-validation.expression.valueFailedExpression=The value supplied ({1}) for field {0} is invalid
-validation.file.postBodyTooBig=Total upload size of {3} KB exceeds the maximum size of {2} KB
diff --git a/branches/2.0-M2/samples/webapps/helloworld-stripes/src/main/resources/log4j.properties b/branches/2.0-M2/samples/webapps/helloworld-stripes/src/main/resources/log4j.properties
deleted file mode 100644
index 77fa204a15..0000000000
--- a/branches/2.0-M2/samples/webapps/helloworld-stripes/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-# log4j.properties
-
-# Set up a logger to the console
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=[%d{HH:mm:ss}] %-5p %c %x - %m%n
-
-# Use this to only see log messages beyond a certain threshold in the console
-#log4j.appender.stdout.Threshold=WARN
-
-# Set up a logger to a log file
-log4j.appender.logfile=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.logfile.layout=org.apache.log4j.PatternLayout
-log4j.appender.logfile.layout.ConversionPattern=[%d{HH:mm:ss}] %-5p %c %x - %m%n
-log4j.appender.logfile.File=${user.home}/stripesquick.log
-log4j.appender.logfile.DatePattern='.'yyyy-MM-dd
-
-# Use this to only see log messages beyond a certain threshold in the log file
-#log4j.appender.logfile.Threshold=WARN
-
-# Logger settings
-log4j.rootLogger=INFO, stdout, logfile
-
-# Valid levels are TRACE, DEBUG, INFO, WARN, ERROR, FATAL
-# Change to TRACE or DEBUG to see more log messages
-log4j.logger.net.sourceforge.stripes=WARN
-log4j.logger.org.stripesbook.quickstart=INFO
-log4j.logger.org.mortbay.log=INFO
-log4j.logger.org=WARN
-log4j.logger.com=WARN
-log4j.logger.net=WARN
diff --git a/branches/2.0-M2/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp b/branches/2.0-M2/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp
deleted file mode 100644
index ea3fc55714..0000000000
--- a/branches/2.0-M2/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp
+++ /dev/null
@@ -1,8 +0,0 @@
-<%@ include file="/WEB-INF/jsp/taglibs.jsp" %>
-
-<s:layout-render name="/WEB-INF/jsp/layout.jsp" title="Welcome">
-  <s:layout-component name="body">
-    <p>sayHello returns: ${actionBean.hello}</p>
-    <p>Congratulations, you've set up a Stripes SCA project!</p>
-  </s:layout-component>
-</s:layout-render>
diff --git a/branches/2.0-M2/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp b/branches/2.0-M2/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp
deleted file mode 100644
index 72e696ecb8..0000000000
--- a/branches/2.0-M2/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp
+++ /dev/null
@@ -1,21 +0,0 @@
-<%@ include file="/WEB-INF/jsp/taglibs.jsp" %>
-
-<s:layout-definition>
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-  <head>
-    <title>${title}</title>
-    <link rel="stylesheet" type="text/css" href="${contextPath}/css/style.css">
-    <s:layout-component name="head">
-    </s:layout-component>
-  </head>
-  <body>
-    <div id="main">
-      <s:layout-component name="body">
-      </s:layout-component>
-    </div>
-  </body>
-</html>
-
-</s:layout-definition>
-\ No newline at end of file
diff --git a/branches/2.0-M2/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp b/branches/2.0-M2/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp
deleted file mode 100644
index 4e38b14e9f..0000000000
--- a/branches/2.0-M2/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp
+++ /dev/null
@@ -1,11 +0,0 @@
-<%-- Stripes TLD --%>
-<%@ taglib prefix="s" uri="http://stripes.sourceforge.net/stripes.tld" %>
-<%@ taglib prefix="sdyn" uri="http://stripes.sourceforge.net/stripes-dynattr.tld" %>
-
-<%-- JSTL TLDs --%>
-<%@ taglib prefix="c"   uri="http://java.sun.com/jsp/jstl/core"      %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"       %>
-<%@ taglib prefix="fn"  uri="http://java.sun.com/jsp/jstl/functions" %>
-
-<%-- This is so that you can conveniently refer to the context path with ${contextPath} --%>
-<c:set var="contextPath" value="${pageContext.request.contextPath}"/>
diff --git a/branches/2.0-M2/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.composite b/branches/2.0-M2/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.composite
deleted file mode 100644
index 56ed55b2d5..0000000000
--- a/branches/2.0-M2/samples/webapps/helloworld-stripes/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/200903"
-           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/branches/2.0-M2/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.xml b/branches/2.0-M2/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 0a16144519..0000000000
--- a/branches/2.0-M2/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,61 +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 Stripes Sample</display-name>
-
-	<listener>
-		<listener-class>org.apache.tuscany.sca.host.webapp.TuscanyContextListener</listener-class>
-	</listener>
-
-	<filter>
-		<filter-name>StripesFilter</filter-name>
-		<filter-class>net.sourceforge.stripes.controller.StripesFilter</filter-class>
-		<init-param>
-			<param-name>ActionResolver.Packages</param-name>
-			<param-value>mystripes.action</param-value>
-		</init-param>
-		<init-param>
-			<param-name>Extension.Packages</param-name>
-			<param-value>org.apache.tuscany.sca.stripes</param-value>
-		</init-param>
-	</filter>
-
-	<servlet>
-		<servlet-name>DispatcherServlet</servlet-name>
-		<servlet-class>net.sourceforge.stripes.controller.DispatcherServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-
-	<filter-mapping>
-		<filter-name>StripesFilter</filter-name>
-		<servlet-name>DispatcherServlet</servlet-name>
-		<dispatcher>REQUEST</dispatcher>
-		<dispatcher>FORWARD</dispatcher>
-	</filter-mapping>
-
-	<servlet-mapping>
-		<servlet-name>DispatcherServlet</servlet-name>
-		<url-pattern>*.htm</url-pattern>
-	</servlet-mapping>
-
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-	</welcome-file-list>
-
-</web-app>
diff --git a/branches/2.0-M2/samples/webapps/helloworld-stripes/src/main/webapp/index.html b/branches/2.0-M2/samples/webapps/helloworld-stripes/src/main/webapp/index.html
deleted file mode 100644
index 2b070f4ce0..0000000000
--- a/branches/2.0-M2/samples/webapps/helloworld-stripes/src/main/webapp/index.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-  <head>
-    <meta http-equiv="refresh" content="0;url=Home.htm">
-  </head>
-</html>
diff --git a/branches/2.0-M2/samples/webapps/helloworld-wicket/pom.xml b/branches/2.0-M2/samples/webapps/helloworld-wicket/pom.xml
deleted file mode 100644
index b2635f9b45..0000000000
--- a/branches/2.0-M2/samples/webapps/helloworld-wicket/pom.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>helloworld-wicket</artifactId>
-    <packaging>war</packaging>
-    <name>Apache Tuscany SCA Sample Helloworld using Wicket</name>
-
-    <dependencies>
-
-        <!--  Tuscany dependencies -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-wicket</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!--  Wicket dependencies -->
-        <dependency>
-            <groupId>org.apache.wicket</groupId>
-            <artifactId>wicket</artifactId>
-            <version>1.4-rc2</version>
-         </dependency>
-         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>1.4.2</version>
-         </dependency>
-         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.14</version>
-         </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-
-</project>
diff --git a/branches/2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/HelloworldService.java b/branches/2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/HelloworldService.java
deleted file mode 100644
index 123774b936..0000000000
--- a/branches/2.0-M2/samples/webapps/helloworld-wicket/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/branches/2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/HelloworldServiceImpl.java b/branches/2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/HelloworldServiceImpl.java
deleted file mode 100644
index 66cef71a25..0000000000
--- a/branches/2.0-M2/samples/webapps/helloworld-wicket/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/branches/2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/HomePage.html b/branches/2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/HomePage.html
deleted file mode 100644
index fd60771d20..0000000000
--- a/branches/2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/HomePage.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html xmlns="http://www.w3.org/1999/xhtml" >
-<head>
-    <title>Wicket Examples - guice</title>
-    <link rel="stylesheet" type="text/css" href="style.css"/>
-</head>
-<body>
-    <p>
-    This page uses <a href="http://code.google.com/p/google-guice/">Google Guice</a>.
-    There is a service interface called <code>IMyService</code>, with an implementation POJO called <code>MyService</code>.
-    Guice is used to wire the implementation into the <code>Page</code> using an <code>@Inject</code> annotation. You can use this
-    annotation on the fields of any <code>Component</code> subclass.    
-    </p>
-    <p>
-    The value of the <code>Label</code> component below will be updated with the return value from one of the service's methods when you click the link.
-    </p>
-    <hr />
-    <blockquote>
-    Value: <b wicket:id="message" id="message">Message goes here</b>
-    <br />
-    To update the label above, <a href="#" wicket:id="link">click here</a>.
-    </blockquote>
-    <hr />
-    <p>
-    The wicket-guice project will take care of proxying the injected beans so that your pages can be serialized safely.
-    To configure your application for Guice injection, see the javadoc for <code>GuiceComponentInjector</code>.
-    </p>
-    
-</body>
-</html>
-\ No newline at end of file
diff --git a/branches/2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/HomePage.java b/branches/2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/HomePage.java
deleted file mode 100644
index 644d6add49..0000000000
--- a/branches/2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/HomePage.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package sample.wicket;
-
-import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.oasisopen.sca.annotation.Reference;
-
-/**
- * Everybody's favorite example (Hello World), modified to use Guice.
- * 
- * @author Alastair Maw
- */
-public class HomePage extends WebPage
-{
-    @Reference
-    IMyService service;
-
-    private String labelValue = "<not yet initialized>";
-
-    /**
-     * Constructor
-     */
-    public HomePage()
-    {
-        add(new Link("link")
-        {
-            /**
-             * @see org.apache.wicket.markup.html.link.Link#onClick()
-             */
-            @Override
-            public void onClick()
-            {
-                labelValue = service.getHelloWorldText();
-            }
-        });
-        add(new Label("message", new AbstractReadOnlyModel<String>()
-        {
-
-            @Override
-            public String getObject()
-            {
-                return labelValue;
-            }
-
-        }));
-    }
-}
-\ No newline at end of file
diff --git a/branches/2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/IMyService.java b/branches/2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/IMyService.java
deleted file mode 100644
index 4b49225748..0000000000
--- a/branches/2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/IMyService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package sample.wicket;
-
-
-/**
- * Service interface for a simple "Hello World" app.
- * 
- * @author Alastair Maw
- */
-public interface IMyService
-{
-    /**
-     * Retrieves the text to say "Hello World".
-     * 
-     * @return "Hello World"
-     */
-    public String getHelloWorldText();
-}
-\ No newline at end of file
diff --git a/branches/2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/MyService.java b/branches/2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/MyService.java
deleted file mode 100644
index 05998ff74f..0000000000
--- a/branches/2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/MyService.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package sample.wicket;
-
-
-/**
- * Implementation of IService.
- * 
- * @author Alastair Maw
- */
-public class MyService implements IMyService
-{
-
-    /**
-     * @see org.apache.wicket.examples.guice.service.IMyService#getHelloWorldText()
-     */
-    public String getHelloWorldText()
-    {
-        return "Hello World";
-    }
-
-}
-\ No newline at end of file
diff --git a/branches/2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/WicketApplication.java b/branches/2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/WicketApplication.java
deleted file mode 100644
index 1d86f1ee39..0000000000
--- a/branches/2.0-M2/samples/webapps/helloworld-wicket/src/main/java/sample/wicket/WicketApplication.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package sample.wicket;
-
-import org.apache.wicket.Page;
-import org.apache.wicket.protocol.http.WebApplication;
-import org.apache.tuscany.sca.wicket.TuscanyComponentInjector;;
-
-/**
- * Application object for your web application. If you want to run this application without deploying, run the Start class.
- * 
- * @see com.mycompany.Start#main(String[])
- */
-public class WicketApplication extends WebApplication
-{    
-
-    @Override
-    protected void init()
-    {
-        addComponentInstantiationListener(new TuscanyComponentInjector(this));
-    }
-
-    /**
-     * @see org.apache.wicket.Application#getHomePage()
-     */
-    @Override
-    public Class< ? extends Page> getHomePage()
-    {
-        return HomePage.class;
-    }
-}
-\ No newline at end of file
diff --git a/branches/2.0-M2/samples/webapps/helloworld-wicket/src/main/resources/log4j.properties b/branches/2.0-M2/samples/webapps/helloworld-wicket/src/main/resources/log4j.properties
deleted file mode 100644
index 05cd58a3bb..0000000000
--- a/branches/2.0-M2/samples/webapps/helloworld-wicket/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-log4j.appender.Stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.Stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.Stdout.layout.conversionPattern=%-5p - %-26.26c{1} - %m\n
-
-log4j.rootLogger=INFO,Stdout
-
-log4j.logger.org.apache.wicket=INFO
-log4j.logger.org.apache.wicket.protocol.http.HttpSessionStore=INFO
-log4j.logger.org.apache.wicket.version=INFO
-log4j.logger.org.apache.wicket.RequestCycle=INFO
-
-
diff --git a/branches/2.0-M2/samples/webapps/helloworld-wicket/src/main/webapp/WEB-INF/web.composite b/branches/2.0-M2/samples/webapps/helloworld-wicket/src/main/webapp/WEB-INF/web.composite
deleted file mode 100644
index 7e2ca0a158..0000000000
--- a/branches/2.0-M2/samples/webapps/helloworld-wicket/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/200712"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-           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/branches/2.0-M2/samples/webapps/helloworld-wicket/src/main/webapp/WEB-INF/web.xml b/branches/2.0-M2/samples/webapps/helloworld-wicket/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 7b8490b2be..0000000000
--- a/branches/2.0-M2/samples/webapps/helloworld-wicket/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,50 +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 Wicket Sample</display-name>
-
-	<listener>
-		<listener-class>org.apache.tuscany.sca.host.webapp.TuscanyContextListener</listener-class>
-	</listener>
-
-	 <!--  
-	      There are three means to configure Wickets configuration mode and they are
-	      tested in the order given. 
-	      1) A system property: -Dwicket.configuration
-	      2) servlet specific <init-param>
-	      3) context specific <context-param>
-	      The value might be either "development" (reloading when templates change)
-	      or "deployment". If no configuration is found, "development" is the default.
-      -->
-
-	<filter>
-		<filter-name>wicket.tuscany</filter-name>
- 		<filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
-		<init-param>
-			<param-name>applicationClassName</param-name>
-			<param-value>sample.wicket.WicketApplication</param-value>
- 		</init-param>
- 	</filter>
-
-      <filter-mapping>
-         <filter-name>wicket.tuscany</filter-name>
-	   <url-pattern>/*</url-pattern>
-      </filter-mapping>
-
-</web-app>
diff --git a/branches/2.0-M2/samples/webapps/helloworld/pom.xml b/branches/2.0-M2/samples/webapps/helloworld/pom.xml
deleted file mode 100644
index 90fd6e892b..0000000000
--- a/branches/2.0-M2/samples/webapps/helloworld/pom.xml
+++ /dev/null
@@ -1,55 +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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>helloworld</artifactId>
-    <name>Apache Tuscany SCA Sample Helloworld</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-host-webapp</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-
-</project>
diff --git a/branches/2.0-M2/samples/webapps/helloworld/src/main/java/sample/HelloworldService.java b/branches/2.0-M2/samples/webapps/helloworld/src/main/java/sample/HelloworldService.java
deleted file mode 100644
index 123774b936..0000000000
--- a/branches/2.0-M2/samples/webapps/helloworld/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/branches/2.0-M2/samples/webapps/helloworld/src/main/java/sample/HelloworldServiceImpl.java b/branches/2.0-M2/samples/webapps/helloworld/src/main/java/sample/HelloworldServiceImpl.java
deleted file mode 100644
index 010ca34f00..0000000000
--- a/branches/2.0-M2/samples/webapps/helloworld/src/main/java/sample/HelloworldServiceImpl.java
+++ /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.    
- */
-package sample;
-
-import org.oasisopen.sca.annotation.EagerInit;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Scope;
-
-@EagerInit
-@Scope("COMPOSITE")
-public class HelloworldServiceImpl implements HelloworldService {
-
-    public String sayHello(String name) {
-        return "Hello " + name;
-    }
-
-    @Init
-    public void init() {
-        System.out.println(sayHello("world"));
-    }
-
-}
diff --git a/branches/2.0-M2/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.composite b/branches/2.0-M2/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.composite
deleted file mode 100644
index f0609d9eb9..0000000000
--- a/branches/2.0-M2/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.composite
+++ /dev/null
@@ -1,29 +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/200903"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-           targetNamespace="http://samples"
-           name="Helloworld">
-
-    <component name="HelloworldComponent">
-        <implementation.java class="sample.HelloworldServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/branches/2.0-M2/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.xml b/branches/2.0-M2/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index f13afbfb74..0000000000
--- a/branches/2.0-M2/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.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.
--->
-<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 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>
-
-</web-app>
author	antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>	2009-03-20 11:29:50 +0000
committer	antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>	2009-03-20 11:29:50 +0000
commit	174374d300ce6001996d70516a6b1f563f3c8985 (patch)
tree	928e56bace1942f53c54d3e45749744434d5946a /branches/2.0-M2/samples/webapps/helloworld
parent	048898980cb3ece6e4800de9579505d290d92c27 (diff)