Move Tuscany from Incubator to top level.

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

16 files changed, 1271 insertions, 0 deletions

diff --git a/tags/java-M1-20060518/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/AbstractTomcatTest.java b/tags/java-M1-20060518/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/AbstractTomcatTest.java
new file mode 100644
index 0000000000..babe25adc7
--- /dev/null
+++ b/tags/java-M1-20060518/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/AbstractTomcatTest.java
@@ -0,0 +1,298 @@
+/**
+ *
+ * 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 java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Vector;
+
+import javax.servlet.ServletInputStream;
+import javax.servlet.ServletOutputStream;
+
+import junit.framework.TestCase;
+
+import org.apache.catalina.Globals;
+import org.apache.catalina.Host;
+import org.apache.catalina.connector.Connector;
+import org.apache.catalina.connector.Request;
+import org.apache.catalina.connector.Response;
+import org.apache.catalina.core.ApplicationFilterFactory;
+import org.apache.catalina.core.StandardEngine;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class AbstractTomcatTest extends TestCase {
+    protected Map<String, Class<?>> classes;
+    protected Host host;
+    protected MockRequest request;
+    protected MockResponse response;
+    protected StandardEngine engine;
+
+    protected void setUp() throws Exception {
+        super.setUp();
+        classes = new HashMap<String, Class<?>>();
+        classes.put(TestServlet.class.getName(), TestServlet.class);
+        classes.put(HelloWorldService.class.getName(), HelloWorldService.class);
+        classes.put(HelloWorldImpl.class.getName(), HelloWorldImpl.class);
+    }
+
+    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);
+
+        // buildSource 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<String,String>();
+        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;
+        }
+
+        @Override
+        public String getRemoteHost() {
+
+            return "locahost";
+        }
+
+        @Override
+        public int getRemotePort() {
+
+            return 1080;
+        }
+
+        @Override
+        public String getRemoteAddr() {
+
+            return "127.0.0.1";
+        }
+
+        @Override
+        public Enumeration getParameterNames() {
+            return new Vector().elements();
+        }
+
+        @Override
+        public String getParameter(String param) {
+            if ("wsdl".equals(param)) {
+                return "";
+            } else {
+                return null;
+            }
+        }
+    }
+
+    public static class MockResponse extends Response {
+        private boolean suspended;
+        private String contentType;
+        private int status = 200;
+        private Map<String, String> headers = new HashMap<String, String>();
+        private MockOutputStream 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);
+        }
+
+        public String toString() {
+            return os.toString();
+        }
+    }
+}
diff --git a/tags/java-M1-20060518/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/HelloWorldImpl.java b/tags/java-M1-20060518/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/HelloWorldImpl.java
new file mode 100644
index 0000000000..4db61fa58c
--- /dev/null
+++ b/tags/java-M1-20060518/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/HelloWorldImpl.java
@@ -0,0 +1,29 @@
+/**
+ *
+ * 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 org.osoa.sca.annotations.Service;
+
+/**
+ * @version $Rev$ $Date$
+ */
+@Service(HelloWorldService.class)
+public class HelloWorldImpl implements HelloWorldService {
+    public String getGreetings(String name) {
+        return "Hello " + name;
+    }
+}
diff --git a/tags/java-M1-20060518/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/HelloWorldService.java b/tags/java-M1-20060518/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/HelloWorldService.java
new file mode 100644
index 0000000000..a9b78cadf4
--- /dev/null
+++ b/tags/java-M1-20060518/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/HelloWorldService.java
@@ -0,0 +1,24 @@
+/**
+ *
+ * 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;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public interface HelloWorldService {
+    public String getGreetings(String name);
+}
diff --git a/tags/java-M1-20060518/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TestClassLoader.java b/tags/java-M1-20060518/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TestClassLoader.java
new file mode 100644
index 0000000000..486fec5bd4
--- /dev/null
+++ b/tags/java-M1-20060518/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TestClassLoader.java
@@ -0,0 +1,51 @@
+/**
+ *
+ * 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 java.util.Map;
+import java.net.URL;
+
+import org.apache.catalina.loader.WebappClassLoader;
+
+/**
+ * A version of Tomcat's application classloader that only allows certain classes to be loaded.
+ * This is used in the integration tests to make sure that no Tuscany classes are exposed to the
+ * application except the ones needed to run the tests.
+ *
+ * @version $Rev$ $Date$
+ */
+@SuppressWarnings({"CustomClassloader"})
+public class TestClassLoader extends WebappClassLoader {
+    private final Map<String, Class<?>> classes;
+
+    public TestClassLoader(Map<String, Class<?>> classes, URL url, ClassLoader parent) {
+        super(parent);
+        this.classes = classes;
+        addURL(url);
+    }
+
+    public Class<?> findClass(String name) throws ClassNotFoundException {
+        Class<?> clazz = classes.get(name);
+        if (clazz != null) {
+            return clazz;
+        }
+        if (name.startsWith("java.") || name.startsWith("javax.") || name.startsWith("org.osoa.")) {
+            return super.findClass(name);
+        }
+        throw new ClassNotFoundException(name);
+    }
+}
diff --git a/tags/java-M1-20060518/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TestServlet.java b/tags/java-M1-20060518/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TestServlet.java
new file mode 100644
index 0000000000..2cd8ce06a2
--- /dev/null
+++ b/tags/java-M1-20060518/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TestServlet.java
@@ -0,0 +1,60 @@
+/**
+ *
+ * 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.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
+import org.osoa.sca.CurrentModuleContext;
+import org.osoa.sca.ModuleContext;
+
+/**
+ * @version $Rev$ $Date$
+ */
+@SuppressWarnings({"serial"})
+public class TestServlet extends GenericServlet {
+
+    public void service(ServletRequest servletRequest, ServletResponse servletResponse) throws ServletException, IOException {
+        Object runtime = getServletContext().getAttribute("org.apache.tuscany.core.runtime.RuntimeContext");
+        if (runtime == null || "org.apache.tuscany.core.runtime.RuntimeContext".equals(runtime.getClass().getName())) {
+            throw new ServletException("Runtime not bound to org.apache.tuscany.core.runtime.RuntimeContext");
+        }
+
+        Object module = getServletContext().getAttribute("org.apache.tuscany.core.webapp.ModuleComponentContext");
+        if (module == null || "org.apache.tuscany.core.context.CompositeContext".equals(module.getClass().getName())) {
+            throw new ServletException("Module composite not bound to org.apache.tuscany.core.webapp.ModuleComponentContext");
+        }
+
+        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);
+        }
+
+        HelloWorldService helloService = (HelloWorldService) moduleContext.locateService("HelloWorld");
+        String greetings = helloService.getGreetings("World");
+        if (!"Hello World".equals(greetings)) {
+            throw new ServletException("Serivce returned " + greetings);
+        }
+    }
+}
diff --git a/tags/java-M1-20060518/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TomcatIntegrationTestCase.java b/tags/java-M1-20060518/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TomcatIntegrationTestCase.java
new file mode 100644
index 0000000000..75bd85cf65
--- /dev/null
+++ b/tags/java-M1-20060518/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TomcatIntegrationTestCase.java
@@ -0,0 +1,200 @@
+/**
+ *
+ * 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.tomcat.util.buf.MessageBytes;
+import org.apache.tomcat.util.http.mapper.MappingData;
+
+import org.apache.tuscany.tomcat.TuscanyHost;
+import org.apache.tuscany.tomcat.TuscanyValve;
+import org.apache.tuscany.tomcat.ContainerLoader;
+
+import java.io.File;
+import java.io.IOException;
+import javax.servlet.Servlet;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class TomcatIntegrationTestCase extends AbstractTomcatTest {
+    protected File app1;
+    private Loader loader;
+    private StandardContext ctx;
+
+    public void testComponentIntegration() throws Exception {
+        // define our test servlet
+        StandardWrapper wrapper = new StandardWrapper();
+        wrapper.setServletClass(TestServlet.class.getName());
+        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 {
+        host.addChild(ctx);
+
+        Wrapper wrapper = (Wrapper) ctx.findChild("/services");
+        assertNotNull("No webservice wrapper present", wrapper);
+        request.setContext(ctx);
+        request.setRequestURI("/services/HelloWorldService");
+        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>World</q0:in0>\n" +
+                "</q0:getGreetings>\n" +
+                "</soapenv:Body>\n" +
+                "</soapenv:Envelope>\n";
+        request.setStream(new MockInputStream(xml.getBytes("UTF-8")));
+        host.invoke(request, response);
+        xml = "<?xml version='1.0' encoding='UTF-8'?><soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\"><soapenv:Header /><soapenv:Body><helloworldaxis:getGreetingsResponse xmlns:helloworldaxis=\"http://helloworldaxis.samples.tuscany.apache.org\">\n" +
+                "  <helloworldaxis:getGreetingsReturn>Hello World</helloworldaxis:getGreetingsReturn>\n" +
+                "</helloworldaxis:getGreetingsResponse></soapenv:Body></soapenv:Envelope>";
+        assertEquals(xml, response.getOutputStream().toString());
+
+        assertEquals(200, response.getStatus());
+        host.removeChild(ctx);
+    }
+
+    /**
+     * Test ?WSDL works
+     */
+    public void testWebServiceIntegrationWSDL() throws Exception {
+// ?WSDL doesn't work right now: TUSCANY-61
+//        Wrapper wrapper = (Wrapper) ctx.findChild("/services");
+//        assertNotNull("No webservice wrapper present", wrapper);
+//        request.setContext(ctx);
+//        request.setRequestURI("/services/HelloWorldService");
+//        request.setMethod("GET");
+//
+//        request.setWrapper(wrapper);
+//
+//        host.invoke(request, response);
+//
+//        assertEquals(200, response.getStatus());
+//
+//        String s = response.getOutputStream().toString(); // would be better to validate with WSDl4J
+//        assertTrue(s.contains("<wsdl:service name=\"HelloWorldServiceImplService\">"));
+//
+//        host.removeChild(ctx);
+    }
+
+    public void testServletMapping() throws Exception {
+        TuscanyHost tuscanyHost = (TuscanyHost) host;
+        host.addChild(ctx);
+
+        MockServlet servlet = new MockServlet();
+        tuscanyHost.registerMapping("/testContext/magicServlet", servlet);
+        assertSame(ctx, host.map("/testContext/magicServlet"));
+        MessageBytes uri = MessageBytes.newInstance();
+        uri.setString("/testContext/magicServlet");
+        MappingData mappingData = new MappingData();
+        ctx.getMapper().map(uri, mappingData);
+        assertTrue(mappingData.requestPath.equals("/magicServlet"));
+
+        assertSame(servlet, tuscanyHost.getMapping("/testContext/magicServlet"));
+        host.removeChild(ctx);
+    }
+
+    public void testServletMappingWithWildard() throws Exception {
+        TuscanyHost tuscanyHost = (TuscanyHost) host;
+        host.addChild(ctx);
+
+        MockServlet servlet = new MockServlet();
+        tuscanyHost.registerMapping("/testContext/magicServlet/*", servlet);
+        assertSame(ctx, host.map("/testContext/magicServlet/foo"));
+        MessageBytes uri = MessageBytes.newInstance();
+        uri.setString("/testContext/magicServlet/foo");
+        MappingData mappingData = new MappingData();
+        mappingData.recycle();
+        ctx.getMapper().map(uri, mappingData);
+        assertTrue(mappingData.requestPath.equals("/magicServlet/foo"));
+
+        assertSame(servlet, tuscanyHost.getMapping("/testContext/magicServlet/bar"));
+        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();
+
+        TestClassLoader cl = new TestClassLoader(classes, new File(app1, "WEB-INF/classes").toURL(), getClass().getClassLoader());
+        cl.start();
+        loader = new ContainerLoader(cl);
+
+        // create the webapp Context
+        ctx = new StandardContext();
+        ctx.addLifecycleListener(new ContextConfig());
+        ctx.setName("/testContext");
+        ctx.setDocBase(app1.getAbsolutePath());
+        ctx.setLoader(loader);
+    }
+
+    protected void tearDown() throws Exception {
+        engine.stop();
+        super.tearDown();
+    }
+
+    public static class MockServlet implements Servlet {
+        public void init(ServletConfig servletConfig) throws ServletException {
+            throw new UnsupportedOperationException();
+        }
+
+        public ServletConfig getServletConfig() {
+            throw new UnsupportedOperationException();
+        }
+
+        public void service(ServletRequest servletRequest, ServletResponse servletResponse) throws ServletException, IOException {
+        }
+
+        public String getServletInfo() {
+            throw new UnsupportedOperationException();
+        }
+
+        public void destroy() {
+            throw new UnsupportedOperationException();
+        }
+    }
+}
diff --git a/tags/java-M1-20060518/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TomcatStandaloneTestCase.java b/tags/java-M1-20060518/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TomcatStandaloneTestCase.java
new file mode 100644
index 0000000000..1aeb966625
--- /dev/null
+++ b/tags/java-M1-20060518/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TomcatStandaloneTestCase.java
@@ -0,0 +1,79 @@
+/**
+ *
+ * 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.File;
+
+import org.apache.catalina.Valve;
+import org.apache.catalina.Wrapper;
+import org.apache.catalina.core.StandardContext;
+import org.apache.catalina.core.StandardHost;
+import org.apache.catalina.startup.ContextConfig;
+
+import org.apache.tuscany.tomcat.TuscanyValve;
+
+/**
+ * @version $Rev$ $Date$
+ */
+@SuppressWarnings({"ClassLoader2Instantiation"})
+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());
+
+// Doesn't work, see TUSCANY-328        
+//        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-M1-20060518/java/sca/tomcat/src/test/resources/app1/WEB-INF/axis2.xml b/tags/java-M1-20060518/java/sca/tomcat/src/test/resources/app1/WEB-INF/axis2.xml
new file mode 100644
index 0000000000..07566475de
--- /dev/null
+++ b/tags/java-M1-20060518/java/sca/tomcat/src/test/resources/app1/WEB-INF/axis2.xml
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ *  Copyright (c) 2005-2006 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  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.
+ -->
+<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-M1-20060518/java/sca/tomcat/src/test/resources/app1/WEB-INF/classes/sca.module b/tags/java-M1-20060518/java/sca/tomcat/src/test/resources/app1/WEB-INF/classes/sca.module
new file mode 100644
index 0000000000..4d19c4d192
--- /dev/null
+++ b/tags/java-M1-20060518/java/sca/tomcat/src/test/resources/app1/WEB-INF/classes/sca.module
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
+
+  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">
+
+    <import.sdo wsdlLocation="wsdl/helloworld.wsdl"/>
+    <import.wsdl wsdlLocation="wsdl/helloworld.wsdl"/>
+
+    <entryPoint name="HelloWorldService">
+        <interface.wsdl interface="http://helloworldaxis.samples.tuscany.apache.org#wsdl.interface(HelloWorldServiceImpl)"/>
+        <binding.ws port="http://helloworldaxis.samples.tuscany.apache.org#wsdl.endpoint(HelloWorldServiceImplService/helloworld)"/>
+        <reference>HelloWorld/HelloWorldService</reference>
+    </entryPoint>
+
+    <component name="HelloWorld">
+        <implementation.java class="org.apache.tuscany.tomcat.integration.HelloWorldImpl"/>
+    </component>
+
+</module>
diff --git a/tags/java-M1-20060518/java/sca/tomcat/src/test/resources/app1/WEB-INF/classes/wsdl/helloworld.wsdl b/tags/java-M1-20060518/java/sca/tomcat/src/test/resources/app1/WEB-INF/classes/wsdl/helloworld.wsdl
new file mode 100644
index 0000000000..3d299481e5
--- /dev/null
+++ b/tags/java-M1-20060518/java/sca/tomcat/src/test/resources/app1/WEB-INF/classes/wsdl/helloworld.wsdl
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
+
+  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.
+ -->
+<wsdl:definitions targetNamespace="http://helloworldaxis.samples.tuscany.apache.org" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://helloworldaxis.samples.tuscany.apache.org" xmlns:intf="http://helloworldaxis.samples.tuscany.apache.org" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="helloworld">
+    <!--WSDL created by Apache Axis version: 1.2.1
+Built on Jun 14, 2005 (09:15:57 EDT)-->
+    <wsdl:types>
+        <schema elementFormDefault="qualified" targetNamespace="http://helloworldaxis.samples.tuscany.apache.org" xmlns="http://www.w3.org/2001/XMLSchema">
+            <element name="getGreetings">
+                <complexType>
+                    <sequence>
+                        <element name="in0" type="xsd:string"/>
+                    </sequence>
+                </complexType>
+            </element>
+            <element name="getGreetingsResponse">
+                <complexType>
+                    <sequence>
+                        <element name="getGreetingsReturn" type="xsd:string"/>
+                    </sequence>
+                </complexType>
+            </element>
+        </schema>
+    </wsdl:types>
+
+    <wsdl:message name="getGreetingsRequest">
+
+        <wsdl:part element="impl:getGreetings" name="parameters"/>
+
+    </wsdl:message>
+
+    <wsdl:message name="getGreetingsResponse">
+
+        <wsdl:part element="impl:getGreetingsResponse" name="parameters"/>
+
+    </wsdl:message>
+
+    <wsdl:portType name="HelloWorldServiceImpl">
+
+        <wsdl:operation name="getGreetings">
+
+            <wsdl:input message="impl:getGreetingsRequest" name="getGreetingsRequest"/>
+
+            <wsdl:output message="impl:getGreetingsResponse" name="getGreetingsResponse"/>
+
+        </wsdl:operation>
+
+    </wsdl:portType>
+
+    <wsdl:binding name="helloworldSoapBinding" type="impl:HelloWorldServiceImpl">
+
+        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+
+        <wsdl:operation name="getGreetings">
+
+            <wsdlsoap:operation soapAction=""/>
+
+            <wsdl:input name="getGreetingsRequest">
+
+                <wsdlsoap:body use="literal"/>
+
+            </wsdl:input>
+
+            <wsdl:output name="getGreetingsResponse">
+
+                <wsdlsoap:body use="literal"/>
+
+            </wsdl:output>
+
+        </wsdl:operation>
+
+    </wsdl:binding>
+
+    <wsdl:service name="HelloWorldServiceImplService">
+
+        <wsdl:port binding="impl:helloworldSoapBinding" name="helloworld">
+
+            <wsdlsoap:address location="http://localhost:8080/sample-helloworldws/services/HelloWorldService"/>
+
+        </wsdl:port>
+
+    </wsdl:service>
+
+</wsdl:definitions>
diff --git a/tags/java-M1-20060518/java/sca/tomcat/src/test/resources/app1/WEB-INF/web.xml b/tags/java-M1-20060518/java/sca/tomcat/src/test/resources/app1/WEB-INF/web.xml
new file mode 100644
index 0000000000..f109ddf404
--- /dev/null
+++ b/tags/java-M1-20060518/java/sca/tomcat/src/test/resources/app1/WEB-INF/web.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE web-app
+    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+    "http://java.sun.com/dtd/web-app_2_3.dtd">
+<!--
+ *  Copyright (c) 2005-2006 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  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.
+ -->
+<web-app>
+</web-app>
diff --git a/tags/java-M1-20060518/java/sca/tomcat/src/test/resources/app1/index.html b/tags/java-M1-20060518/java/sca/tomcat/src/test/resources/app1/index.html
new file mode 100644
index 0000000000..71653b974f
--- /dev/null
+++ b/tags/java-M1-20060518/java/sca/tomcat/src/test/resources/app1/index.html
@@ -0,0 +1,18 @@
+<html>
+<!--
+  Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
+
+  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.
+ -->
+<body>Hello World</body>
+</html>
diff --git a/tags/java-M1-20060518/java/sca/tomcat/src/test/resources/app2/WEB-INF/classes/sca.module b/tags/java-M1-20060518/java/sca/tomcat/src/test/resources/app2/WEB-INF/classes/sca.module
new file mode 100644
index 0000000000..90ad0d44e0
--- /dev/null
+++ b/tags/java-M1-20060518/java/sca/tomcat/src/test/resources/app2/WEB-INF/classes/sca.module
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+  Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.

+

+  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">

+

+    <import.sdo wsdlLocation="wsdl/helloworld.wsdl"/>

+    <import.wsdl wsdlLocation="wsdl/helloworld.wsdl"/>

+

+    <entryPoint name="HelloWorldService">

+        <interface.wsdl interface="http://helloworldaxis.samples.tuscany.apache.org#wsdl.interface(HelloWorldServiceImpl)"/>

+        <binding.ws port="http://helloworldaxis.samples.tuscany.apache.org#wsdl.endpoint(HelloWorldServiceImplService/helloworld)"/>

+        <reference>HelloWorld/HelloWorldService</reference>

+    </entryPoint>

+

+    <component name="HelloWorld">

+        <implementation.java class="org.apache.tuscany.tomcat.integration.HelloWorldImpl"/>

+    </component>

+

+</module>

diff --git a/tags/java-M1-20060518/java/sca/tomcat/src/test/resources/app2/WEB-INF/classes/wsdl/helloworld.wsdl b/tags/java-M1-20060518/java/sca/tomcat/src/test/resources/app2/WEB-INF/classes/wsdl/helloworld.wsdl
new file mode 100644
index 0000000000..3d299481e5
--- /dev/null
+++ b/tags/java-M1-20060518/java/sca/tomcat/src/test/resources/app2/WEB-INF/classes/wsdl/helloworld.wsdl
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
+
+  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.
+ -->
+<wsdl:definitions targetNamespace="http://helloworldaxis.samples.tuscany.apache.org" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://helloworldaxis.samples.tuscany.apache.org" xmlns:intf="http://helloworldaxis.samples.tuscany.apache.org" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="helloworld">
+    <!--WSDL created by Apache Axis version: 1.2.1
+Built on Jun 14, 2005 (09:15:57 EDT)-->
+    <wsdl:types>
+        <schema elementFormDefault="qualified" targetNamespace="http://helloworldaxis.samples.tuscany.apache.org" xmlns="http://www.w3.org/2001/XMLSchema">
+            <element name="getGreetings">
+                <complexType>
+                    <sequence>
+                        <element name="in0" type="xsd:string"/>
+                    </sequence>
+                </complexType>
+            </element>
+            <element name="getGreetingsResponse">
+                <complexType>
+                    <sequence>
+                        <element name="getGreetingsReturn" type="xsd:string"/>
+                    </sequence>
+                </complexType>
+            </element>
+        </schema>
+    </wsdl:types>
+
+    <wsdl:message name="getGreetingsRequest">
+
+        <wsdl:part element="impl:getGreetings" name="parameters"/>
+
+    </wsdl:message>
+
+    <wsdl:message name="getGreetingsResponse">
+
+        <wsdl:part element="impl:getGreetingsResponse" name="parameters"/>
+
+    </wsdl:message>
+
+    <wsdl:portType name="HelloWorldServiceImpl">
+
+        <wsdl:operation name="getGreetings">
+
+            <wsdl:input message="impl:getGreetingsRequest" name="getGreetingsRequest"/>
+
+            <wsdl:output message="impl:getGreetingsResponse" name="getGreetingsResponse"/>
+
+        </wsdl:operation>
+
+    </wsdl:portType>
+
+    <wsdl:binding name="helloworldSoapBinding" type="impl:HelloWorldServiceImpl">
+
+        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+
+        <wsdl:operation name="getGreetings">
+
+            <wsdlsoap:operation soapAction=""/>
+
+            <wsdl:input name="getGreetingsRequest">
+
+                <wsdlsoap:body use="literal"/>
+
+            </wsdl:input>
+
+            <wsdl:output name="getGreetingsResponse">
+
+                <wsdlsoap:body use="literal"/>
+
+            </wsdl:output>
+
+        </wsdl:operation>
+
+    </wsdl:binding>
+
+    <wsdl:service name="HelloWorldServiceImplService">
+
+        <wsdl:port binding="impl:helloworldSoapBinding" name="helloworld">
+
+            <wsdlsoap:address location="http://localhost:8080/sample-helloworldws/services/HelloWorldService"/>
+
+        </wsdl:port>
+
+    </wsdl:service>
+
+</wsdl:definitions>
diff --git a/tags/java-M1-20060518/java/sca/tomcat/src/test/resources/app2/WEB-INF/web.xml b/tags/java-M1-20060518/java/sca/tomcat/src/test/resources/app2/WEB-INF/web.xml
new file mode 100644
index 0000000000..9bd3882e81
--- /dev/null
+++ b/tags/java-M1-20060518/java/sca/tomcat/src/test/resources/app2/WEB-INF/web.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE web-app
+    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+    "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<!--
+ *  Copyright (c) 2005-2006 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  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.
+ -->
+<web-app>
+    <context-param>
+        <param-name>org.apache.tuscany.core.webapp.ModuleComponentName</param-name>
+        <param-value>/testContext</param-value>
+    </context-param>
+    <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>
+    <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>
+</web-app>
diff --git a/tags/java-M1-20060518/java/sca/tomcat/src/test/resources/app2/index.html b/tags/java-M1-20060518/java/sca/tomcat/src/test/resources/app2/index.html
new file mode 100644
index 0000000000..55ecbd81ba
--- /dev/null
+++ b/tags/java-M1-20060518/java/sca/tomcat/src/test/resources/app2/index.html
@@ -0,0 +1,3 @@
+<html>
+<body>Hello World</body>
+</html>
\ No newline at end of file