11 files changed, 0 insertions, 722 deletions
diff --git a/tags/java-stable-20060304/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/AbstractTomcatTest.java b/tags/java-stable-20060304/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/AbstractTomcatTest.java
deleted file mode 100644
index 1e9529b965..0000000000
--- a/tags/java-stable-20060304/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/AbstractTomcatTest.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/**
- *
- * Copyright 2006 The Apache Software Foundation
- *
- *  Licensed 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 org.apache.tuscany.tomcat.integration;
-
-import junit.framework.TestCase;
-import org.apache.catalina.Host;
-import org.apache.catalina.Globals;
-import org.apache.catalina.connector.Connector;
-import org.apache.catalina.connector.Request;
-import org.apache.catalina.connector.Response;
-import org.apache.catalina.core.StandardEngine;
-import org.apache.catalina.core.ApplicationFilterFactory;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.OutputStream;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Enumeration;
-import java.util.Collections;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletOutputStream;
-
-/**
- * @version $Rev$ $Date$
- */
-public class AbstractTomcatTest extends TestCase {
-    protected Host host;
-    protected MockRequest request;
-    protected MockResponse response;
-    protected StandardEngine engine;
-
-    protected void setupTomcat(File baseDir, Host host) throws Exception {
-        File appBase = new File(baseDir, "webapps").getCanonicalFile();
-
-        // Configure a Tomcat Engine
-        engine = new StandardEngine();
-        engine.setName("Catalina");
-        engine.setDefaultHost("localhost");
-        engine.setBaseDir(baseDir.getAbsolutePath());
-
-        this.host = host;
-        host.setName("localhost");
-        host.setAppBase(appBase.getAbsolutePath());
-        engine.addChild(host);
-
-        // build a empty request/response
-        Connector connector = new Connector("HTTP/1.1");
-        request = new MockRequest();
-        request.setConnector(connector);
-        response = new MockResponse();
-        request.setResponse(response);
-        request.setMethod("POST");
-        request.setScheme("http");
-    }
-
-    public static class MockRequest extends Request {
-        private String method;
-        private String scheme;
-        private String requestURI;
-        private String contentType;
-        private Map<String,String> headers = new HashMap();
-        private ServletInputStream inputStream;
-
-        public void setScheme(String scheme) {
-            this.scheme = scheme;
-        }
-
-        public void setMethod(String method) {
-            this.method = method;
-        }
-
-        public void setRequestURI(String requestURI) {
-            this.requestURI = requestURI;
-        }
-
-        public String getScheme() {
-            return scheme;
-        }
-
-        public String getMethod() {
-            return method;
-        }
-
-        public int getServerPort() {
-            return 80;
-        }
-
-        public String getServerName() {
-            return "localhost";
-        }
-
-        public String getRequestURI() {
-            return requestURI;
-        }
-
-        public void setAttribute(String name, Object value) {
-            if (name.startsWith("org.apache.tomcat.")) {
-                return;
-            }
-            super.setAttribute(name, value);
-        }
-
-        public Object getAttribute(String name) {
-            if (name.equals(Globals.DISPATCHER_TYPE_ATTR)) {
-                return (dispatcherType == null)
-                    ? ApplicationFilterFactory.REQUEST_INTEGER
-                    : dispatcherType;
-            } else if (name.equals(Globals.DISPATCHER_REQUEST_PATH_ATTR)) {
-                return (requestDispatcherPath == null)
-                    ? getRequestPathMB().toString()
-                    : requestDispatcherPath.toString();
-            }
-
-            return attributes.get(name);
-        }
-
-        public String getHeader(String name) {
-            return headers.get(name);
-        }
-
-        public Enumeration getHeaderNames() {
-            return Collections.enumeration(headers.keySet());
-        }
-
-        public void setContentType(String contentType) {
-            this.contentType = contentType;
-        }
-
-        public String getContentType() {
-            return contentType;
-        }
-
-        public ServletInputStream getInputStream() throws IOException {
-            return inputStream;
-        }
-
-        public InputStream getStream() {
-            return inputStream;
-        }
-
-        public void setStream(ServletInputStream stream) {
-            inputStream = stream;
-        }
-    }
-
-    public static class MockResponse extends Response {
-        private boolean suspended;
-        private String contentType;
-        private int status;
-        private Map headers = new HashMap();
-        private ServletOutputStream outputStream = new MockOutputStream();
-
-        public boolean isCommitted() {
-            return false;
-        }
-
-        public boolean isAppCommitted() {
-            return false;
-        }
-
-        public void sendAcknowledgement() {
-        }
-
-        public void setSuspended(boolean suspended) {
-            this.suspended = suspended;
-        }
-
-        public boolean isSuspended() {
-            return suspended;
-        }
-
-        public void setStatus(int status, String message) {
-            this.status = status;
-        }
-
-        public int getStatus() {
-            return status;
-        }
-
-        public void reset() {
-        }
-
-        public void addHeader(String name, String value) {
-            headers.put(name, value);
-        }
-
-        public String[] getHeaderNames() {
-            return (String[]) headers.keySet().toArray(new String[headers.size()]);
-        }
-
-        public String getContentType() {
-            return contentType;
-        }
-
-        public void setContentType(String contentType) {
-            this.contentType = contentType;
-        }
-
-        public OutputStream getStream() {
-            return outputStream;
-        }
-
-        public ServletOutputStream getOutputStream() throws IOException {
-            return outputStream;
-        }
-    }
-
-    public static class MockInputStream extends ServletInputStream {
-        private final byte[] bytes;
-        private int index;
-
-        public MockInputStream(byte[] bytes) {
-            this.bytes = bytes;
-        }
-
-        public int read() throws IOException {
-            if (index == bytes.length) {
-                return -1;
-            }
-            else {
-                return bytes[index++];
-            }
-        }
-    }
-
-    public static class MockOutputStream extends ServletOutputStream {
-        private ByteArrayOutputStream os = new ByteArrayOutputStream();
-
-        public void write(int b) throws IOException {
-            os.write(b);
-        }
-    }
-}
diff --git a/tags/java-stable-20060304/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TestServlet.java b/tags/java-stable-20060304/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TestServlet.java
deleted file mode 100644
index d81e6cc081..0000000000
--- a/tags/java-stable-20060304/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TestServlet.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation
- *
- *  Licensed 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 org.apache.tuscany.tomcat.integration;
-
-import java.io.IOException;
-import javax.servlet.GenericServlet;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.ServletException;
-
-import org.osoa.sca.ModuleContext;
-import org.osoa.sca.CurrentModuleContext;
-
-import org.apache.tuscany.core.runtime.RuntimeContext;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TestServlet extends GenericServlet {
-
-    public void service(ServletRequest servletRequest, ServletResponse servletResponse) throws ServletException, IOException {
-        ModuleContext moduleContext = CurrentModuleContext.getContext();
-        if (moduleContext == null) {
-            throw new ServletException("No module context returned");
-        }
-        String name = moduleContext.getName();
-        if (!"testContext".equals(name)) {
-            throw new ServletException("Invalid module context name: " + name);
-        }
-
-        Object runtime = getServletContext().getAttribute("org.apache.tuscany.core.runtime.RuntimeContext");
-        if (!(runtime instanceof RuntimeContext)) {
-            throw new ServletException("Runtime not bound to org.apache.tuscany.core.runtime.RuntimeContext");
-        }
-    }
-}
diff --git a/tags/java-stable-20060304/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TomcatIntegrationTestCase.java b/tags/java-stable-20060304/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TomcatIntegrationTestCase.java
deleted file mode 100644
index 4c3b1516aa..0000000000
--- a/tags/java-stable-20060304/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TomcatIntegrationTestCase.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation
- *
- *  Licensed 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 org.apache.tuscany.tomcat.integration;
-
-import org.apache.catalina.Valve;
-import org.apache.catalina.Loader;
-import org.apache.catalina.Wrapper;
-import org.apache.catalina.core.StandardContext;
-import org.apache.catalina.core.StandardWrapper;
-import org.apache.catalina.startup.ContextConfig;
-import org.apache.tuscany.tomcat.TuscanyHost;
-import org.apache.tuscany.tomcat.TuscanyValve;
-import org.apache.tuscany.tomcat.ContainerLoader;
-
-import java.io.File;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TomcatIntegrationTestCase extends AbstractTomcatTest {
-    protected File app1;
-
-    public void testComponentIntegration() throws Exception {
-        // create the webapp Context
-        StandardContext ctx = new StandardContext();
-        ctx.addLifecycleListener(new ContextConfig());
-        ctx.setName("testContext");
-        ctx.setDocBase(app1.getAbsolutePath());
-
-        // define our test servlet
-        Loader loader = new ContainerLoader(TestServlet.class.getClassLoader());
-        StandardWrapper wrapper = new StandardWrapper();
-        wrapper.setServletClass(TestServlet.class.getName());
-        wrapper.setLoader(loader);
-        ctx.addChild(wrapper);
-
-        host.addChild(ctx);
-        boolean found = false;
-        for (Valve valve: ctx.getPipeline().getValves()) {
-            if (valve instanceof TuscanyValve) {
-                found = true;
-                break;
-            }
-        }
-        assertTrue("TuscanyValve not in pipeline", found);
-
-        request.setContext(ctx);
-        request.setWrapper(wrapper);
-        host.invoke(request, response);
-
-        host.removeChild(ctx);
-    }
-
-    public void testWebServiceIntegration() throws Exception {
-        // create the webapp Context
-        StandardContext ctx = new StandardContext();
-        ctx.addLifecycleListener(new ContextConfig());
-        ctx.setName("testContext");
-        ctx.setDocBase(app1.getAbsolutePath());
-
-        host.addChild(ctx);
-
-        Wrapper wrapper = (Wrapper) ctx.findChild("TuscanyAxis2EntryPointServlet");
-        assertNotNull("No webservice wrapper present", wrapper);
-        request.setContext(ctx);
-        request.setRequestURI("/services/epName");
-        request.setWrapper(wrapper);
-        request.setContentType("text/xml");
-        String xml = "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:q0=\"http://helloworldaxis.samples.tuscany.apache.org\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">\n" +
-                "<soapenv:Body>\n" +
-                "<q0:getGreetings>\n" +
-                "<q0:in0>hello</q0:in0>\n" +
-                "</q0:getGreetings>\n" +
-                "</soapenv:Body>\n" +
-                "</soapenv:Envelope>\n";
-        request.setStream(new MockInputStream(xml.getBytes("UTF-8")));
-        host.invoke(request, response);
-
-        host.removeChild(ctx);
-    }
-
-    protected void setUp() throws Exception {
-        super.setUp();
-        app1 = new File(getClass().getResource("/app1").toURI());
-        File baseDir = new File(app1, "../../tomcat").getCanonicalFile();
-        setupTomcat(baseDir, new TuscanyHost());
-        engine.start();
-    }
-
-    protected void tearDown() throws Exception {
-        engine.stop();
-        super.tearDown();
-    }
-
-}
diff --git a/tags/java-stable-20060304/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TomcatStandaloneTestCase.java b/tags/java-stable-20060304/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TomcatStandaloneTestCase.java
deleted file mode 100644
index b623b2e7b5..0000000000
--- a/tags/java-stable-20060304/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TomcatStandaloneTestCase.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.apache.tuscany.tomcat.integration;
-
-import org.apache.catalina.core.StandardContext;
-import org.apache.catalina.core.StandardWrapper;
-import org.apache.catalina.core.StandardHost;
-import org.apache.catalina.startup.ContextConfig;
-import org.apache.catalina.Valve;
-import org.apache.catalina.Wrapper;
-
-import org.apache.tuscany.tomcat.TuscanyValve;
-import org.apache.tuscany.tomcat.TuscanyHost;
-
-import java.io.File;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TomcatStandaloneTestCase extends AbstractTomcatTest {
-    protected File app2;
-
-    public void testRuntimeIntegration() throws Exception {
-        StandardContext ctx = new StandardContext();
-
-        // caution: this sets the parent of the webapp loader to the test classloader so it can find TestServlet
-        // anything that relies on the TCCL may not work correctly
-        ClassLoader cl = TestServlet.class.getClassLoader();
-        ctx.setParentClassLoader(cl);
-
-        ctx.addLifecycleListener(new ContextConfig());
-        ctx.setName("testContext");
-        ctx.setDocBase(app2.getAbsolutePath());
-
-        host.addChild(ctx);
-        boolean found = false;
-        for (Valve valve: ctx.getPipeline().getValves()) {
-            if (valve instanceof TuscanyValve) {
-                found = true;
-                break;
-            }
-        }
-        assertFalse("TuscanyValve in pipeline", found);
-
-        request.setContext(ctx);
-        request.setWrapper((Wrapper) ctx.findChild("TestServlet"));
-        host.invoke(request, response);
-
-        host.removeChild(ctx);
-    }
-
-    protected void setUp() throws Exception {
-        super.setUp();
-        app2 = new File(getClass().getResource("/app2").toURI());
-        File baseDir = new File(app2, "../../tomcat").getCanonicalFile();
-        setupTomcat(baseDir, new StandardHost());
-        engine.start();
-    }
-
-    protected void tearDown() throws Exception {
-        engine.stop();
-        super.tearDown();
-    }
-
-}
diff --git a/tags/java-stable-20060304/sca/tomcat/src/test/resources/app1/WEB-INF/axis2.xml b/tags/java-stable-20060304/sca/tomcat/src/test/resources/app1/WEB-INF/axis2.xml
deleted file mode 100644
index a38cf9864a..0000000000
--- a/tags/java-stable-20060304/sca/tomcat/src/test/resources/app1/WEB-INF/axis2.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<axisconfig name="AxisJava2.0">
-    <!-- ================================================= -->
-    <!-- Parameters -->
-    <!-- ================================================= -->
-    <parameter name="hotdeployment" locked="false">false</parameter>
-    <parameter name="hotupdate" locked="false">false</parameter>
-    <parameter name="enableMTOM" locked="false">false</parameter>
-    <!-- Uncomment this to enable REST support -->
-    <!--    <parameter name="enableREST" locked="false">true</parameter>-->
-
-
-    <parameter name="userName" locked="false">admin</parameter>
-    <parameter name="password" locked="false">axis2</parameter>
-
-    <parameter name="seralizeLocation" locked="false">.</parameter>
-    <hostConfiguration>
-        <ip>127.0.0.1</ip>
-        <port>5555</port>
-    </hostConfiguration>
-
-
-    <!--if you want to extract the service archive file and work with that please uncomment this-->
-    <!--else , it wont extract archive file or does not take into consideration if someone drop-->
-    <!--exploded directory into /service directory-->
-    <!--<parameter name="extractServiceArchive" locked="false">true</parameter>-->
-
-
-    <!--    The way of adding listener to the system-->
-    <!--    <listener class="org.apache.axis2.ObserverIMPL">-->
-    <!--        <parameter name="RSS_URL" locked="false">http://127.0.0.1/rss</parameter>-->
-    <!--    </listener>-->
-
-    <!-- ================================================= -->
-    <!-- Message Receivers -->
-    <!-- ================================================= -->
-    <!--This is the Deafult Message Receiver for the system , if you want to have MessageReceivers for -->
-    <!--all the other MEP implement it and add the correct entry to here , so that you can refer from-->
-    <!--any operation -->
-    <!--Note : You can ovride this for particular service by adding the same element with your requirement-->
-    <messageReceivers>
-        <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-only"
-                         class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
-        <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
-                         class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
-    </messageReceivers>
-    <!-- ================================================= -->
-    <!-- Transport Ins -->
-    <!-- ================================================= -->
-    <transportReceiver name="http" class="org.apache.axis2.transport.http.SimpleHTTPServer">
-        <parameter name="port" locked="false">6060</parameter>
-    </transportReceiver>
-
-    <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
-    <transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">
-          <parameter name="transport.mail.pop3.host" locked="false">127.0.0.1</parameter>
-          <parameter name="transport.mail.pop3.user" locked="false">axis2</parameter>
-          <parameter name="transport.mail.pop3.password" locked="false">axis2</parameter>
-          <parameter name="transport.mail.pop3.port" locked="false">110</parameter>
-          <parameter name="transport.mail.replyToAddress" locked="false">axis2@127.0.0.1</parameter>
-      </transportReceiver> -->
-
-    <!--REMOVED FOR TUSCANY  transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
-        <parameter name="port" locked="false">6060</parameter>
-    </transportReceiver -->
-
-    <!--REMOVED FOR TUSCANY transportReceiver name="jms" class="org.apache.axis2.transport.jms.SimpleJMSListener">
-        <parameter name="transport.jms.Destination" locked="false">dynamicQueues/FOO</parameter>
-        <parameter name="java.naming.factory.initial" locked="false">
-            org.activemq.jndi.ActiveMQInitialContextFactory</parameter>
-        <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter>
-    </transportReceiver>
-    -->
-
-    <!-- ================================================= -->
-    <!-- Transport Outs -->
-    <!-- ================================================= -->
-
-    <!--REMOVED FOR TUSCANY transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/> -->
-    <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
-    <!--REMOVED FOR TUSCANY transportSender name="jms" class="org.apache.axis2.transport.jms.JMSSender"/> -->
-    <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
-        <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
-        <parameter name="Transfer-Encoding" locked="false">chunked</parameter>
-    </transportSender>
-    <transportSender name="https"
-                     class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
-        <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
-        <parameter name="Transfer-Encoding" locked="false">chunked</parameter>
-    </transportSender>
-
-    <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
-   <transportSender name="mailto" class="org.apache.axis2.transport.mail.MailTransportSender">
-       <parameter name="transport.mail.smtp.host" locked="false">127.0.0.1</parameter>
-       <parameter name="transport.mail.smtp.user" locked="false">axis2</parameter>
-       <parameter name="transport.mail.smtp.password" locked="false">axis2</parameter>
-       <parameter name="transport.mail.smtp.port" locked="false">25</parameter>
-   </transportSender>
-   -->
-
-    <!-- ================================================= -->
-    <!-- Global Modules  -->
-    <!-- ================================================= -->
-    <!-- Comment this to disable Addressing -->
-    <!--REMOVED FOR TUSCANY  module ref="addressing"/> -->
-
-
-    <!--Configuring module , providing parameters for modules whether they refer or not-->
-    <!--<moduleConfig name="addressing">-->
-    <!--<parameter name="addressingPara" locked="false">N/A</parameter>-->
-    <!--</moduleConfig>-->
-
-    <!-- ================================================= -->
-    <!-- Phases  -->
-    <!-- ================================================= -->
-    <phaseOrder type="inflow">
-        <!--  System pre defined phases       -->
-        <phase name="TransportIn"/>
-        <phase name="PreDispatch"/>
-        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
-            <handler name="AddressingBasedDispatcher"
-                     class="org.apache.axis2.engine.AddressingBasedDispatcher">
-                <order phase="Dispatch"/>
-            </handler>
-
-            <handler name="RequestURIBasedDispatcher"
-                     class="org.apache.axis2.engine.RequestURIBasedDispatcher">
-                <order phase="Dispatch"/>
-            </handler>
-
-            <handler name="SOAPActionBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
-                <order phase="Dispatch"/>
-            </handler>
-
-            <handler name="SOAPMessageBodyBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
-                <order phase="Dispatch"/>
-            </handler>
-            <handler name="InstanceDispatcher"
-                     class="org.apache.axis2.engine.InstanceDispatcher">
-                <order phase="PostDispatch"/>
-            </handler>
-        </phase>
-        <!--  System pre defined phases       -->
-        <!--   After Postdispatch phase module author or or service author can add any phase he want      -->
-        <phase name="userphase1"/>
-    </phaseOrder>
-    <phaseOrder type="outflow">
-        <!--      user can add his own phases to this area  -->
-        <phase name="userphase1"/>
-        <!--system predefined phase-->
-        <!--these phase will run irrespective of the service-->
-        <phase name="PolicyDetermination"/>
-        <phase name="MessageOut"/>
-    </phaseOrder>
-    <phaseOrder type="INfaultflow">
-        <!--      user can add his own phases to this area  -->
-        <phase name="userphase1"/>
-    </phaseOrder>
-    <phaseOrder type="Outfaultflow">
-        <!--      user can add his own phases to this area  -->
-        <phase name="userphase1"/>
-        <phase name="PolicyDetermination"/>
-        <phase name="MessageOut"/>
-    </phaseOrder>
-</axisconfig>
-
diff --git a/tags/java-stable-20060304/sca/tomcat/src/test/resources/app1/WEB-INF/classes/sca.module b/tags/java-stable-20060304/sca/tomcat/src/test/resources/app1/WEB-INF/classes/sca.module
deleted file mode 100644
index 4273a8171c..0000000000
--- a/tags/java-stable-20060304/sca/tomcat/src/test/resources/app1/WEB-INF/classes/sca.module
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2005 BEA Sytems Inc.
-  Copyright (c) 2005 International Business Machines
-
-  Licensed 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.
- -->
-<module xmlns="http://www.osoa.org/xmlns/sca/0.9" xmlns:v="http://www.osoa.org/xmlns/sca/values/0.9"
-        name="testModule">
-
-</module>
diff --git a/tags/java-stable-20060304/sca/tomcat/src/test/resources/app1/WEB-INF/web.xml b/tags/java-stable-20060304/sca/tomcat/src/test/resources/app1/WEB-INF/web.xml
deleted file mode 100644
index a363db8e12..0000000000
--- a/tags/java-stable-20060304/sca/tomcat/src/test/resources/app1/WEB-INF/web.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-    "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
-</web-app>
-\ No newline at end of file
diff --git a/tags/java-stable-20060304/sca/tomcat/src/test/resources/app1/index.html b/tags/java-stable-20060304/sca/tomcat/src/test/resources/app1/index.html
deleted file mode 100644
index 55ecbd81ba..0000000000
--- a/tags/java-stable-20060304/sca/tomcat/src/test/resources/app1/index.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<html>
-<body>Hello World</body>
-</html>
-\ No newline at end of file
diff --git a/tags/java-stable-20060304/sca/tomcat/src/test/resources/app2/WEB-INF/classes/sca.module b/tags/java-stable-20060304/sca/tomcat/src/test/resources/app2/WEB-INF/classes/sca.module
deleted file mode 100644
index fd1d63a7a6..0000000000
--- a/tags/java-stable-20060304/sca/tomcat/src/test/resources/app2/WEB-INF/classes/sca.module
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2005 BEA Sytems Inc.
-  Copyright (c) 2005 International Business Machines
-
-  Licensed 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.
- -->
-<module xmlns="http://www.osoa.org/xmlns/sca/0.9" xmlns:v="http://www.osoa.org/xmlns/sca/values/0.9"
-        name="testModule">
-
-</module>
diff --git a/tags/java-stable-20060304/sca/tomcat/src/test/resources/app2/WEB-INF/web.xml b/tags/java-stable-20060304/sca/tomcat/src/test/resources/app2/WEB-INF/web.xml
deleted file mode 100644
index abf92d4ca7..0000000000
--- a/tags/java-stable-20060304/sca/tomcat/src/test/resources/app2/WEB-INF/web.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-    "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
-    <context-param>
-        <param-name>org.apache.tuscany.core.webapp.ModuleComponentName</param-name>
-        <param-value>testContext</param-value>
-    </context-param>
-    <listener>
-        <listener-class>org.apache.tuscany.core.webapp.TuscanyServletListener</listener-class>
-    </listener>
-    <servlet>
-        <servlet-name>TestServlet</servlet-name>
-        <servlet-class>org.apache.tuscany.tomcat.integration.TestServlet</servlet-class>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>TestServlet</servlet-name>
-        <url-pattern>/servlet</url-pattern>
-    </servlet-mapping>
-    <filter>
-        <filter-name>TuscanyFilter</filter-name>
-        <filter-class>org.apache.tuscany.core.webapp.TuscanyRequestFilter</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>TuscanyFilter</filter-name>
-        <servlet-name>TestServlet</servlet-name>
-    </filter-mapping>
-</web-app>
-\ No newline at end of file
diff --git a/tags/java-stable-20060304/sca/tomcat/src/test/resources/app2/index.html b/tags/java-stable-20060304/sca/tomcat/src/test/resources/app2/index.html
deleted file mode 100644
index 55ecbd81ba..0000000000
--- a/tags/java-stable-20060304/sca/tomcat/src/test/resources/app2/index.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<html>
-<body>Hello World</body>
-</html>
-\ No newline at end of file