Remove samples subfolder as its now in contrib and unreleased

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

13 files changed, 0 insertions, 643 deletions

diff --git a/sca-java-2.x/trunk/samples/running-tuscany/shell/README b/sca-java-2.x/trunk/samples/running-tuscany/shell/README
deleted file mode 100644
index 5c6b14cd87..0000000000
--- a/sca-java-2.x/trunk/samples/running-tuscany/shell/README
+++ /dev/null
@@ -1,37 +0,0 @@
-Sample Tuscany Shell
-====================
-
-This directory contains a sample shell program supporting simple commands to
-start and stop SCA composites.
-
-See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html
-for more information
-
-To build the sample shell do this:
-mvn install
-
-To run it:
-./sca
-
-at the prompt:
-start myNode ../../applications/store/target/sample-store.jar
-
-or:
-start myNode http://people.apache.org/~jsdelfino/tuscany/java/test/sample-store.jar
-
-also try:
-status
-stop myNode
-bye
-
-Starting and stopping composites is pretty fast. To see that, try the following
-two scripts, which start/stop the sample store composite 10 times.
-
-./sca <scripts/test.txt
-or
-./sca <scripts/test-remote.txt
-
-The shell can also run as a Webapp. To try it install target/scashell.war in
-a Web container, point your Web browser to http://localhost:8080/scashell
-and try the links on that page.
-
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/shell/pom.xml b/sca-java-2.x/trunk/samples/running-tuscany/shell/pom.xml
deleted file mode 100644
index bfaabcd774..0000000000
--- a/sca-java-2.x/trunk/samples/running-tuscany/shell/pom.xml
+++ /dev/null
@@ -1,92 +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-running-tuscany</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>sample-launcher-shell</artifactId>

-    <name>Apache Tuscany SCA Sample Launcher Shell</name>

-    <packaging>war</packaging>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-feature-api</artifactId>

-            <type>pom</type>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>  

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-feature-core</artifactId>

-            <type>pom</type>

-            <version>2.0-SNAPSHOT</version>

-        </dependency> 

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-feature-webservice</artifactId>

-            <type>pom</type>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-feature-web20</artifactId>

-            <type>pom</type>

-            <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>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.8.1</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-

-    <build>

-       <finalName>scashell</finalName>
-       <plugins>
-           <plugin>
-               <groupId>org.codehaus.mojo</groupId>
-               <artifactId>tomcat-maven-plugin</artifactId>
-               <version>1.0</version>
-               <configuration>
-                   <!-- Key used for configuring access to server in settings.xml-->
-                   <server>tomcat</server>
-                   <!-- context for the webapp, as finalName is not being honored -->
-                   <path>/scashell</path>
-                </configuration>
-           </plugin>
-       </plugins>

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/samples/running-tuscany/shell/sca b/sca-java-2.x/trunk/samples/running-tuscany/shell/sca
deleted file mode 100755
index 8f6cf268b3..0000000000
--- a/sca-java-2.x/trunk/samples/running-tuscany/shell/sca
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-# 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
-
-java -classpath target/classes:`ls target/scashell/WEB-INF/lib/*.jar | awk '{ printf "%s:", $1}'` sample.Shell
-
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/shell/sca.bat b/sca-java-2.x/trunk/samples/running-tuscany/shell/sca.bat
deleted file mode 100644
index 5110effc25..0000000000
--- a/sca-java-2.x/trunk/samples/running-tuscany/shell/sca.bat
+++ /dev/null
@@ -1,30 +0,0 @@
-@echo off
-rem Licensed to the Apache Software Foundation (ASF) under one
-rem or more contributor license agreements.  See the NOTICE file
-rem distributed with this work for additional information
-rem regarding copyright ownership.  The ASF licenses this file
-rem to you under the Apache License, Version 2.0 (the
-rem "License"); you may not use this file except in compliance
-rem with the License.  You may obtain a copy of the License at
-rem 
-rem   http://www.apache.org/licenses/LICENSE-2.0
-rem 
-rem Unless required by applicable law or agreed to in writing,
-rem software distributed under the License is distributed on an
-rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-rem KIND, either express or implied.  See the License for the
-rem specific language governing permissions and limitations
-
-rem cd to target to reduce the length of the classpath. It blows up cmd.exe without this
-cd target
-set _CLASSPATH=.\classes
-for %%i in (.\scashell\WEB-INF\lib\*.jar) do call:setClasspath %%i
-set CLASSPATH=%_CLASSPATH%
-@echo on
-java sample.Shell
-cd ..
-goto:eof
-
-:setClasspath
-set _CLASSPATH=%_CLASSPATH%;%1
-goto:eof
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/shell/scripts/test-remote.txt b/sca-java-2.x/trunk/samples/running-tuscany/shell/scripts/test-remote.txt
deleted file mode 100644
index dc13e5c401..0000000000
--- a/sca-java-2.x/trunk/samples/running-tuscany/shell/scripts/test-remote.txt
+++ /dev/null
@@ -1,36 +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
-
-start testNode http://people.apache.org/~jsdelfino/tuscany/java/test/sample-store.jar
-stop testNode
-start testNode http://people.apache.org/~jsdelfino/tuscany/java/test/sample-store.jar
-stop testNode
-start testNode http://people.apache.org/~jsdelfino/tuscany/java/test/sample-store.jar
-stop testNode
-start testNode http://people.apache.org/~jsdelfino/tuscany/java/test/sample-store.jar
-stop testNode
-start testNode http://people.apache.org/~jsdelfino/tuscany/java/test/sample-store.jar
-stop testNode
-start testNode http://people.apache.org/~jsdelfino/tuscany/java/test/sample-store.jar
-stop testNode
-start testNode http://people.apache.org/~jsdelfino/tuscany/java/test/sample-store.jar
-stop testNode
-start testNode http://people.apache.org/~jsdelfino/tuscany/java/test/sample-store.jar
-stop testNode
-start testNode http://people.apache.org/~jsdelfino/tuscany/java/test/sample-store.jar
-stop testNode
-start testNode http://people.apache.org/~jsdelfino/tuscany/java/test/sample-store.jar
-stop testNode
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/shell/scripts/test-start.txt b/sca-java-2.x/trunk/samples/running-tuscany/shell/scripts/test-start.txt
deleted file mode 100644
index 2514a9058d..0000000000
--- a/sca-java-2.x/trunk/samples/running-tuscany/shell/scripts/test-start.txt
+++ /dev/null
@@ -1,18 +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
-
-restart testNode http://people.apache.org/~jsdelfino/tuscany/java/test/sample-store.jar
-status
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/shell/scripts/test-status.txt b/sca-java-2.x/trunk/samples/running-tuscany/shell/scripts/test-status.txt
deleted file mode 100644
index 4df56e85e8..0000000000
--- a/sca-java-2.x/trunk/samples/running-tuscany/shell/scripts/test-status.txt
+++ /dev/null
@@ -1,17 +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
-
-status
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/shell/scripts/test-stop.txt b/sca-java-2.x/trunk/samples/running-tuscany/shell/scripts/test-stop.txt
deleted file mode 100644
index 39eb36aa77..0000000000
--- a/sca-java-2.x/trunk/samples/running-tuscany/shell/scripts/test-stop.txt
+++ /dev/null
@@ -1,17 +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
-
-stop testNode
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/shell/scripts/test.txt b/sca-java-2.x/trunk/samples/running-tuscany/shell/scripts/test.txt
deleted file mode 100644
index bf489a46a5..0000000000
--- a/sca-java-2.x/trunk/samples/running-tuscany/shell/scripts/test.txt
+++ /dev/null
@@ -1,36 +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
-
-start testNode ../../applications/store/target/sample-store.jar
-stop testNode
-start testNode ../../applications/store/target/sample-store.jar
-stop testNode
-start testNode ../../applications/store/target/sample-store.jar
-stop testNode
-start testNode ../../applications/store/target/sample-store.jar
-stop testNode
-start testNode ../../applications/store/target/sample-store.jar
-stop testNode
-start testNode ../../applications/store/target/sample-store.jar
-stop testNode
-start testNode ../../applications/store/target/sample-store.jar
-stop testNode
-start testNode ../../applications/store/target/sample-store.jar
-stop testNode
-start testNode ../../applications/store/target/sample-store.jar
-stop testNode
-start testNode ../../applications/store/target/sample-store.jar
-stop testNode
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/shell/src/main/java/sample/Shell.java b/sca-java-2.x/trunk/samples/running-tuscany/shell/src/main/java/sample/Shell.java
deleted file mode 100644
index d0d8fb5dfe..0000000000
--- a/sca-java-2.x/trunk/samples/running-tuscany/shell/src/main/java/sample/Shell.java
+++ /dev/null
@@ -1,203 +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 java.lang.System.in;

-import static java.lang.System.out;

-import static java.util.Collections.emptyList;

-import static java.util.Collections.singletonList;

-

-import java.io.BufferedReader;

-import java.io.IOException;

-import java.io.InputStreamReader;

-import java.io.PrintWriter;

-import java.io.StringWriter;

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-import java.util.concurrent.Callable;

-

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-

-/**

- * A little SCA command shell.

- */

-public class Shell {

-    final NodeFactory nf;

-

-    public static class Nodeconf {

-        final String name;

-        final String cloc;

-        final String dcuri;

-        final Node node;

-

-        Nodeconf(final String name, final String cloc, final String dcuri, final Node node) {

-            this.name = name;

-            this.cloc = cloc;

-            this.dcuri = dcuri;

-            this.node = node;

-        }

-

-        public String toString() {

-            return name + " " + cloc + (dcuri != null? " " + dcuri : "");

-        }

-    }

-

-    final Map<String, Nodeconf> nodes = new HashMap<String, Nodeconf>();

-    final List<String> history = new ArrayList<String>();

-

-    public Shell(NodeFactory nf) {

-        this.nf = nf;

-    }

-

-    List<?> start(final String name, final String cloc, final String dcuri) {

-        if(nodes.containsKey(name))

-            return emptyList();

-        final Node node = dcuri != null? nf.createNode(dcuri, new Contribution(cloc, cloc)) : nf.createNode(new Contribution(cloc, cloc));

-        nodes.put(name, new Nodeconf(name, cloc, dcuri, node));

-        node.start();

-        return emptyList();

-    }

-

-    List<?> stop(final String name) {

-        final Nodeconf ninfo = nodes.get(name);

-        if(ninfo == null)

-            return emptyList();

-        ninfo.node.stop();

-        nodes.remove(name);

-        return emptyList();

-    }

-

-    List<?> stop() {

-        for(Nodeconf ninfo: nodes.values())

-            ninfo.node.stop();

-        nodes.clear();

-        return emptyList();

-    }

-

-    List<?> restart(final String name, final String cloc, final String dcuri) {

-        final Nodeconf ninfo = nodes.get(name);

-        if(ninfo == null)

-            return start(name, cloc, dcuri);

-        ninfo.node.stop();

-        nodes.remove(name);

-        if (cloc == null)

-            return start(ninfo.name, ninfo.cloc, ninfo.dcuri);

-        return start(name, cloc, dcuri);

-    }

-

-    List<?> status() {

-        return new ArrayList<Object>(nodes.values());

-    }

-

-    List<?> history() {

-        return history;

-    }

-

-    List<?> bye() {

-        return null;

-    }

-

-    List<String> read(final BufferedReader r) throws IOException {

-        final String l = r.readLine();

-        history.add(l);

-        return l != null ? Arrays.asList(l.split(" ")) : singletonList("bye");

-    }

-

-    Callable<List<?>> eval(final List<String> toks) {

-        final String op = toks.get(0);

-        if(op.equals("start"))

-            return new Callable<List<?>>() {

-                public List<?> call() {

-                    return start(toks.get(1), toks.get(2), toks.size() >= 4? toks.get(3) : null);

-                }

-            };

-        if(op.equals("stop"))

-            return new Callable<List<?>>() {

-                public List<?> call() {

-                    if(toks.size() == 1)

-                        return stop();

-                    return stop(toks.get(1));

-                }

-            };

-        if(op.equals("restart"))

-            return new Callable<List<?>>() {

-                public List<?> call() {

-                    return restart(toks.get(1), toks.size() >= 3? toks.get(2) : null, toks.size() >= 4? toks.get(3) : null);

-                }

-            };

-        if(op.equals("status"))

-            return new Callable<List<?>>() {

-                public List<?> call() {

-                    return status();

-                }

-            };

-        if(op.equals("history"))

-            return new Callable<List<?>>() {

-                public List<?> call() {

-                    return history();

-                }

-            };

-        if(op.equals("bye"))

-            return new Callable<List<?>>() {

-                public List<?> call() {

-                    return bye();

-                }

-            };

-        return new Callable<List<?>>() {

-            public List<?> call() {

-                return emptyList();

-            }

-        };

-    }

-

-    List<?> apply(final Callable<List<?>> func) {

-        try {

-            return func.call();

-        } catch(Exception e) {

-            StringWriter sw = new StringWriter();

-            e.printStackTrace(new PrintWriter(sw));

-            return singletonList(sw);

-        }

-    }

-

-    boolean print(final List<?> l, PrintWriter w) {

-        if(l == null)

-            return false;

-        for(Object o: l)

-            w.println(o);

-        return true;

-    }

-

-    public Map<String, Nodeconf> run(final BufferedReader r, final PrintWriter w) throws IOException {

-        while(print(apply(eval(read(r))), w))

-            ;

-        r.close();

-        return nodes;

-    }

-

-    public static void main(final String[] args) throws Exception {

-        new Shell(NodeFactory.newInstance()).run(new BufferedReader(new InputStreamReader(in)), new PrintWriter(out, true));

-    }

-}

diff --git a/sca-java-2.x/trunk/samples/running-tuscany/shell/src/main/java/sample/ShellServlet.java b/sca-java-2.x/trunk/samples/running-tuscany/shell/src/main/java/sample/ShellServlet.java
deleted file mode 100644
index 55aadbd09b..0000000000
--- a/sca-java-2.x/trunk/samples/running-tuscany/shell/src/main/java/sample/ShellServlet.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 java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URL;
-
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.tuscany.sca.host.webapp.WebAppHelper;
-
-public class ShellServlet extends HttpServlet {
-    static final long serialVersionUID = 1L;
-
-    Shell shell;
-
-    public void init() {
-        shell = new Shell(WebAppHelper.getNodeFactory());
-    }
-
-    public void destroy() {
-        shell.stop();
-    }
-
-    protected void doGet(final HttpServletRequest req, final HttpServletResponse resp) throws IOException {
-        shell.run(new BufferedReader(new InputStreamReader(new URL(req.getParameter("conf")).openStream())), resp.getWriter());
-    }
-}
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/shell/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/running-tuscany/shell/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index ac1ad1cc8e..0000000000
--- a/sca-java-2.x/trunk/samples/running-tuscany/shell/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,48 +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 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5">
-  <display-name>scashell</display-name>
-
-	<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>
-
-  <servlet>
-    <servlet-name>ShellServlet</servlet-name>
-    <servlet-class>sample.ShellServlet</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>ShellServlet</servlet-name>
-    <url-pattern>/run</url-pattern>
-  </servlet-mapping>
-
-  <welcome-file-list id="WelcomeFileList">
-    <welcome-file>index.html</welcome-file>
-  </welcome-file-list>
-</web-app>
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/shell/src/main/webapp/index.html b/sca-java-2.x/trunk/samples/running-tuscany/shell/src/main/webapp/index.html
deleted file mode 100644
index 7d8a8568e8..0000000000
--- a/sca-java-2.x/trunk/samples/running-tuscany/shell/src/main/webapp/index.html
+++ /dev/null
@@ -1,42 +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>Sample Runtime Shell</title>
-</head>
-<body>
-<h1>It works</h1>
-
-<p>This Web app runs a sample Tuscany runtime shell similar to samples/launcher-shell.<br/>
-To see how it works and what configuration commands are supported, just read the Shell program's <a href="http://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/samples/running-tuscany/launcher-shell/src/main/java/sample/Shell.java">source code</a>.</p>
-
-<p>Configuration commands can be provided through a text document served from a Web location, for example:<br/>
-<a href="http://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/samples/running-tuscany/launcher-shell/scripts/test-start.txt">http://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/samples/running-tuscany/launcher-shell/scripts/test-start.txt</a></p>
-
-<p>To run that particular configuration script just point your Web browser to:<br/>
-<a href="/scashell/run?conf=http://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/samples/running-tuscany/launcher-shell/scripts/test-start.txt">http://localhost:8080/scashell/run?conf=http://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/samples/running-tuscany/launcher-shell/scripts/test-start.txt</a><br/>
-To run the script again and refresh the runtime shell, just refresh that page in your Web browser.
-</p>
-
-<p>This script starts the Tuscany sample store application. Click <a href="/scashell/store/">here</a> to use that application after you've started it.</p>
-
-<p>Sample configuration script samples are available in the Tuscany Subversion repository <a href="http://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk/samples/running-tuscany/launcher-shell/scripts/">there</a>.
-
-</body>
-</html>