Move Tuscany from Incubator to top level.

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

28 files changed, 2371 insertions, 0 deletions

diff --git a/tags/java-M1-20060518/java/sca/tomcat/LICENSE.txt b/tags/java-M1-20060518/java/sca/tomcat/LICENSE.txt
new file mode 100644
index 0000000000..d645695673
--- /dev/null
+++ b/tags/java-M1-20060518/java/sca/tomcat/LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
diff --git a/tags/java-M1-20060518/java/sca/tomcat/README.txt b/tags/java-M1-20060518/java/sca/tomcat/README.txt
new file mode 100644
index 0000000000..9b26d1690a
--- /dev/null
+++ b/tags/java-M1-20060518/java/sca/tomcat/README.txt
@@ -0,0 +1,35 @@
+Apache Tuscany M1 build (May, 2006)
+===================================
+
+http://incubator.apache.org/tuscany/
+
+Tuscany is an effort undergoing incubation at the Apache Software Foundation
+(ASF), sponsored by the Web Services PMC.
+
+Incubation is required of all newly accepted projects until a further review
+indicates that the infrastructure, communications, and decision making process
+have stabilized in a manner consistent with other successful ASF projects. 
+
+While incubation status is not necessarily a reflection of the completeness or 
+stability of the code, it does indicate that the project has yet to be fully
+endorsed by the ASF.
+
+
+Support
+-------
+
+Any problem with this release can be reported to the Tuscany mailing list 
+or in the JIRA issue tracker.
+
+Mailing list subscription:
+    tuscany-dev-subscribe@ws.apache.org
+
+Jira:
+    http://issues.apache.org/jira/browse/Tuscany
+
+
+Thank you for using Tuscany!
+
+
+The Tuscany Team. 
+
diff --git a/tags/java-M1-20060518/java/sca/tomcat/pom.xml b/tags/java-M1-20060518/java/sca/tomcat/pom.xml
new file mode 100644
index 0000000000..ff16f54136
--- /dev/null
+++ b/tags/java-M1-20060518/java/sca/tomcat/pom.xml
@@ -0,0 +1,105 @@
+<?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.
+ -->
+<project>
+    <parent>
+        <groupId>org.apache.tuscany</groupId>
+        <artifactId>tuscany-sca</artifactId>
+        <version>incubating-M1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>tuscany-tomcat</artifactId>
+    <name>Tuscany Apache Tomcat Integration</name>
+    <description>Integration of the Tuscany runtime with Apache Tomcat.</description>
+    <version>incubating-M1</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca.containers</groupId>
+            <artifactId>tuscany-container-java</artifactId>
+            <version>${pom.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca.bindings</groupId>
+            <artifactId>tuscany-binding-axis2</artifactId>
+            <version>${pom.version}</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>tomcat</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>5.0.18</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>tomcat</groupId>
+            <artifactId>catalina</artifactId>
+            <version>5.5.15</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>tomcat</groupId>
+            <artifactId>tomcat-util</artifactId>
+            <version>5.5.15</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>tomcat</groupId>
+            <artifactId>tomcat-coyote</artifactId>
+            <version>5.5.15</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>tomcat</groupId>
+            <artifactId>tomcat-http</artifactId>
+            <version>5.5.15</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>tomcat</groupId>
+            <artifactId>naming-factory</artifactId>
+            <version>5.5.15</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>tomcat</groupId>
+            <artifactId>naming-resources</artifactId>
+            <version>5.5.15</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.0.4</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-modeler</groupId>
+            <artifactId>commons-modeler</artifactId>
+            <version>1.1M1</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/tags/java-M1-20060518/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/ContainerLoader.java b/tags/java-M1-20060518/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/ContainerLoader.java
new file mode 100644
index 0000000000..60c9a7961f
--- /dev/null
+++ b/tags/java-M1-20060518/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/ContainerLoader.java
@@ -0,0 +1,100 @@
+/**
+ *
+ * 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;
+
+import java.beans.PropertyChangeListener;
+
+import org.apache.catalina.Container;
+import org.apache.catalina.Loader;
+
+/**
+ * Implementation of a TomcatLoader that allows privileged servlets from the container
+ * classloader to be loaded into an unprivileged application. This allows the Tuscany
+ * integration code to add servlets to the application, for example, to handle web
+ * services requests.
+ *
+ * @version $Rev$ $Date$
+ */
+public class ContainerLoader implements Loader {
+    private static final String INFO = ContainerLoader.class.getName() + "/SNAPSHOT";
+    private final ClassLoader cl;
+    private Container container;
+
+    /**
+     * Constructor specifying the classloader to be used.
+     *
+     * @param cl the classloader this Loader wraps, typically the container classloader
+     */
+    public ContainerLoader(ClassLoader cl) {
+        this.cl = cl;
+    }
+
+    public void backgroundProcess() {
+    }
+
+    public ClassLoader getClassLoader() {
+        return cl;
+    }
+
+    public Container getContainer() {
+        return container;
+    }
+
+    public void setContainer(Container container) {
+        this.container = container;
+    }
+
+    public boolean getDelegate() {
+        return false;
+    }
+
+    public void setDelegate(boolean delegate) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String getInfo() {
+        return INFO;
+    }
+
+    public boolean getReloadable() {
+        return false;
+    }
+
+    public void setReloadable(boolean reloadable) {
+        throw new UnsupportedOperationException();
+    }
+
+    public void addPropertyChangeListener(PropertyChangeListener listener) {
+        throw new UnsupportedOperationException();
+    }
+
+    public void addRepository(String repository) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String[] findRepositories() {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean modified() {
+        throw new UnsupportedOperationException();
+    }
+
+    public void removePropertyChangeListener(PropertyChangeListener listener) {
+        throw new UnsupportedOperationException();
+    }
+}
diff --git a/tags/java-M1-20060518/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TomcatHost.java b/tags/java-M1-20060518/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TomcatHost.java
new file mode 100644
index 0000000000..8351da8edd
--- /dev/null
+++ b/tags/java-M1-20060518/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TomcatHost.java
@@ -0,0 +1,53 @@
+/**
+ *
+ * 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;
+
+import javax.servlet.Servlet;
+
+import org.osoa.sca.annotations.Scope;
+
+import org.apache.tuscany.core.webapp.ServletHost;
+
+/**
+ * SCA Component that acts as a proxy for the Tomcat Host container that created the runtime.
+ *
+ * @version $Rev$ $Date$
+ */
+@Scope("MODULE")
+public class TomcatHost implements ServletHost {
+    private TuscanyHost host;
+
+    public void setHost(TuscanyHost host) {
+        this.host = host;
+    }
+
+    public TuscanyHost getHost() {
+        return host;
+    }
+
+    public void registerMapping(String mapping, Servlet servlet) {
+        host.registerMapping(mapping, servlet);
+    }
+
+    public void unregisterMapping(String mapping) {
+        host.unregisterMapping(mapping);
+    }
+
+    public Servlet getMapping(String mapping) {
+        return host.getMapping(mapping);
+    }
+}
diff --git a/tags/java-M1-20060518/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyContextListener.java b/tags/java-M1-20060518/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyContextListener.java
new file mode 100644
index 0000000000..7e3edf67f9
--- /dev/null
+++ b/tags/java-M1-20060518/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyContextListener.java
@@ -0,0 +1,152 @@
+/**
+ *
+ * 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;
+
+import javax.servlet.ServletContext;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.Lifecycle;
+import org.apache.catalina.LifecycleEvent;
+import org.apache.catalina.LifecycleListener;
+import org.apache.catalina.util.StringManager;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.tuscany.common.resource.ResourceLoader;
+import org.apache.tuscany.common.resource.impl.ResourceLoaderImpl;
+import org.apache.tuscany.core.client.BootstrapHelper;
+import org.apache.tuscany.core.config.ConfigurationException;
+import org.apache.tuscany.core.config.ModuleComponentConfigurationLoader;
+import org.apache.tuscany.core.context.CompositeContext;
+import org.apache.tuscany.core.context.EventException;
+import org.apache.tuscany.core.context.event.ModuleStart;
+import org.apache.tuscany.core.context.event.ModuleStop;
+import org.apache.tuscany.core.runtime.RuntimeContext;
+import org.apache.tuscany.model.assembly.AssemblyFactory;
+import org.apache.tuscany.model.assembly.ModuleComponent;
+import org.apache.tuscany.model.assembly.impl.AssemblyContextImpl;
+import org.apache.tuscany.model.assembly.loader.AssemblyModelLoader;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class TuscanyContextListener implements LifecycleListener {
+    private static final Log log = LogFactory.getLog(TuscanyContextListener.class);
+    private static final StringManager sm = StringManager.getManager("org.apache.tuscany.tomcat");
+    private static final String TUSCANY_RUNTIME_NAME = RuntimeContext.class.getName();
+    public static final String MODULE_COMPONENT_NAME = "org.apache.tuscany.core.webapp.ModuleComponentContext";
+
+    private final AssemblyFactory modelFactory;
+    private final AssemblyModelLoader modelLoader;
+    private final RuntimeContext runtime;
+    private CompositeContext moduleContext;
+    private TuscanyValve valve;
+
+    public TuscanyContextListener(RuntimeContext runtimeContext, AssemblyFactory modelFactory, AssemblyModelLoader modelLoader) {
+        this.runtime = runtimeContext;
+        this.modelFactory = modelFactory;
+        this.modelLoader = modelLoader;
+    }
+
+    public void lifecycleEvent(LifecycleEvent event) {
+        String type = event.getType();
+        if (Lifecycle.AFTER_START_EVENT.equals(type)) {
+            startContext((Context) event.getLifecycle());
+        } else if (Lifecycle.STOP_EVENT.equals(type)) {
+            stopContext((Context) event.getLifecycle());
+        }
+    }
+
+    private void startContext(Context ctx) {
+        ClassLoader appLoader = ctx.getLoader().getClassLoader();
+        if (appLoader.getResource("sca.module") == null) {
+            return;
+        }
+
+        log.info(sm.getString("context.configLoad", ctx.getName()));
+        try {
+            loadContext(ctx);
+        } catch (ConfigurationException e) {
+            log.error(sm.getString("context.configError"), e);
+            // todo mark application as unavailable
+            return;
+        }
+
+        try {
+            moduleContext.publish(new ModuleStart(this));
+        } catch (EventException e) {
+            log.error(sm.getString("context.moduleStartError"), e);
+            // todo unload module component from runtime
+            // todo mark application as unavailable
+            return;
+        } catch (RuntimeException e) {
+            log.error(sm.getString("context.unknownRuntimeException"), e);
+            // todo unload module component from runtime
+            throw e;
+        }
+
+        // add a valve to this context's pipeline that will associate the request with the runtime
+        if (valve == null) {
+            valve = new TuscanyValve(moduleContext);
+        } else {
+            valve.setContext(moduleContext);
+            valve.setEnabled(true);
+        }
+        ctx.getPipeline().addValve(valve);
+        // add the RuntimeContext in as a servlet context parameter
+        ServletContext servletContext = ctx.getServletContext();
+        servletContext.setAttribute(TUSCANY_RUNTIME_NAME, runtime);
+        servletContext.setAttribute(MODULE_COMPONENT_NAME, moduleContext);
+    }
+
+    private void loadContext(Context ctx) throws ConfigurationException {
+        ResourceLoader resourceLoader = new ResourceLoaderImpl(ctx.getLoader().getClassLoader());
+        ClassLoader oldCl = Thread.currentThread().getContextClassLoader();
+        Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
+        try {
+            AssemblyContextImpl modelContext = new AssemblyContextImpl(modelFactory, modelLoader, resourceLoader, ctx.getName());
+
+            ModuleComponentConfigurationLoader loader = BootstrapHelper.getConfigurationLoader(runtime.getSystemContext(), modelContext);
+
+            // Load the SCDL configuration of the application module
+            ModuleComponent moduleComponent = loader.loadModuleComponent(ctx.getName(), ctx.getPath());
+
+            // Register it under the root application context
+            CompositeContext rootContext = runtime.getRootContext();
+            rootContext.registerModelObject(moduleComponent);
+            moduleContext = (CompositeContext) rootContext.getContext(moduleComponent.getName());
+            //TODO remove the hack below
+            moduleContext.setAssemblyContext(modelContext);
+        } finally {
+            Thread.currentThread().setContextClassLoader(oldCl);
+        }
+    }
+
+    private void stopContext(Context ctx) {
+        if (moduleContext != null) {
+            moduleContext.publish(new ModuleStop(this));
+        }
+        CompositeContext rootContext = runtime.getRootContext();
+        rootContext.removeContext(moduleContext.getName());
+        valve.setEnabled(false);
+        //ctx.getPipeline().removeValve(valve);
+        //valve = null;
+        moduleContext.stop();
+        moduleContext = null;
+        // todo unload module component from runtime
+    }
+
+}
diff --git a/tags/java-M1-20060518/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.java b/tags/java-M1-20060518/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.java
new file mode 100644
index 0000000000..37984ef40d
--- /dev/null
+++ b/tags/java-M1-20060518/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.java
@@ -0,0 +1,185 @@
+/**
+ *
+ * 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;
+
+import javax.servlet.Servlet;
+
+import org.apache.catalina.Container;
+import org.apache.catalina.Context;
+import org.apache.catalina.LifecycleException;
+import org.apache.catalina.Wrapper;
+import org.apache.catalina.core.StandardContext;
+import org.apache.catalina.core.StandardHost;
+import org.apache.catalina.util.StringManager;
+import org.apache.tomcat.util.buf.MessageBytes;
+import org.apache.tomcat.util.http.mapper.MappingData;
+
+import org.apache.tuscany.common.monitor.impl.NullMonitorFactory;
+import org.apache.tuscany.core.builder.ContextFactoryBuilderRegistry;
+import org.apache.tuscany.core.builder.impl.DefaultWireBuilder;
+import org.apache.tuscany.core.client.BootstrapHelper;
+import org.apache.tuscany.core.config.ConfigurationLoadException;
+import org.apache.tuscany.core.config.ModuleComponentConfigurationLoader;
+import org.apache.tuscany.core.context.CompositeContext;
+import org.apache.tuscany.core.context.SystemCompositeContext;
+import org.apache.tuscany.core.context.event.ModuleStart;
+import org.apache.tuscany.core.context.event.ModuleStop;
+import org.apache.tuscany.core.runtime.RuntimeContext;
+import org.apache.tuscany.core.runtime.RuntimeContextImpl;
+import org.apache.tuscany.core.webapp.ServletHost;
+import org.apache.tuscany.model.assembly.AssemblyContext;
+import org.apache.tuscany.model.assembly.AssemblyFactory;
+import org.apache.tuscany.model.assembly.ModuleComponent;
+import org.apache.tuscany.model.assembly.loader.AssemblyModelLoader;
+
+/**
+ * A specialied Tomcat Host that extends the Standardhost implementation and adds SCA capabilities.
+ * <p/>
+ * As children are added, they are examined for the presence of SCA configuration
+ * information and if any is found then the web application is treated as an
+ * SCA Module defintion which is used to create a ModuleComponent. The name of the
+ * context is used as the name of the ModuleComponent and its context path is used
+ * as the URI.
+ *
+ * @version $Rev$ $Date$
+ */
+@SuppressWarnings({"serial"})
+public class TuscanyHost extends StandardHost implements ServletHost {
+    private static final String SYSTEM_MODULE_COMPONENT = "org.apache.tuscany.core.system";
+
+    private static final StringManager sm = StringManager.getManager("org.apache.tuscany.tomcat");
+
+    private RuntimeContext runtime;
+    private AssemblyModelLoader modelLoader;
+    private AssemblyFactory modelFactory;
+
+    public synchronized void start() throws LifecycleException {
+        startRuntime();
+        super.start();
+    }
+
+    public synchronized void stop() throws LifecycleException {
+        super.stop();
+        stopRuntime();
+    }
+
+    private void startRuntime() {
+        // Create an assembly model context
+        AssemblyContext modelContext = BootstrapHelper.getModelContext(getClass().getClassLoader());
+        modelFactory = modelContext.getAssemblyFactory();
+        modelLoader = modelContext.getAssemblyLoader();
+
+        // Create and start the runtime
+        NullMonitorFactory monitorFactory = new NullMonitorFactory();
+        ContextFactoryBuilderRegistry builderRegistry = BootstrapHelper.bootstrapContextFactoryBuilders(monitorFactory);
+        runtime = new RuntimeContextImpl(monitorFactory, builderRegistry, new DefaultWireBuilder());
+        runtime.start();
+
+        // Load and start the system configuration
+        try {
+            SystemCompositeContext systemContext = runtime.getSystemContext();
+            BootstrapHelper.bootstrapStaxLoader(systemContext, modelContext);
+            ModuleComponentConfigurationLoader loader = BootstrapHelper.getConfigurationLoader(systemContext, modelContext);
+            ModuleComponent systemModuleComponent = loader.loadSystemModuleComponent(SYSTEM_MODULE_COMPONENT, SYSTEM_MODULE_COMPONENT);
+            CompositeContext context = BootstrapHelper.registerModule(systemContext, systemModuleComponent);
+            context.publish(new ModuleStart(this));
+
+            TomcatHost host = systemContext.resolveInstance(TomcatHost.class);
+            host.setHost(this);
+        } catch (ConfigurationLoadException e) {
+            getLogger().warn(sm.getString("runtime.loadSystemFailed", e.getResourceURI()), e);
+            return;
+        } catch (Exception e) {
+            getLogger().warn(sm.getString("runtime.registerSystemFailed"), e);
+            runtime.stop();
+            runtime = null;
+            return;
+        }
+
+        getLogger().info(sm.getString("runtime.started"));
+    }
+
+    private void stopRuntime() {
+        if (runtime == null) {
+            return;
+        }
+        runtime.getSystemContext().publish(new ModuleStop(this));
+        
+        runtime.stop();
+        runtime = null;
+        getLogger().info(sm.getString("runtime.stopped"));
+    }
+
+    public synchronized void addChild(Container child) {
+        if (!(child instanceof StandardContext)) {
+            throw new IllegalArgumentException(sm.getString("tuscanyHost.notContext"));
+        }
+        StandardContext ctx = (StandardContext) child;
+        ctx.addLifecycleListener(new TuscanyContextListener(runtime, modelFactory, modelLoader));
+        super.addChild(child);
+    }
+
+    public String toString() {
+        StringBuilder sb = new StringBuilder(132);
+        if (getParent() != null) {
+            sb.append(getParent().toString()).append('.');
+        }
+        sb.append("TuscanyHost[").append(getName()).append(']');
+        return (sb.toString());
+    }
+
+    public void registerMapping(String mapping, Servlet servlet) {
+        Context ctx = map(mapping);
+        if (ctx == null) {
+            throw new UnsupportedOperationException("Cannot find context for mapping " + mapping);
+        }
+        String contextPath = ctx.getPath();
+        assert mapping.startsWith(contextPath);
+        mapping = mapping.substring(contextPath.length());
+        Wrapper wrapper = new TuscanyWrapper(servlet);
+        wrapper.setName(mapping.substring(0,mapping.lastIndexOf('/')));
+        ctx.addChild(wrapper);
+        wrapper.addMapping(mapping);
+        ctx.getMapper().addWrapper(mapping, wrapper, false);
+    }
+
+    public void unregisterMapping(String mapping) {
+    }
+
+    public Servlet getMapping(String mapping) {
+        Context ctx = map(mapping);
+        if (ctx == null) {
+            return null;
+        }
+        String contextPath = ctx.getPath();
+        assert mapping.startsWith(contextPath);
+
+        MappingData mappingData = new MappingData();
+        MessageBytes mb = MessageBytes.newInstance();
+        mb.setString(mapping);
+        try {
+            ctx.getMapper().map(mb, mappingData);
+        } catch (Exception e) {
+            return null;
+        }
+        if (!(mappingData.wrapper instanceof TuscanyWrapper)) {
+            return null;
+        }
+        TuscanyWrapper wrapper = (TuscanyWrapper) mappingData.wrapper;
+        return wrapper.getServlet();
+    }
+}
diff --git a/tags/java-M1-20060518/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyValve.java b/tags/java-M1-20060518/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyValve.java
new file mode 100644
index 0000000000..352a04bde0
--- /dev/null
+++ b/tags/java-M1-20060518/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyValve.java
@@ -0,0 +1,130 @@
+/**
+ *
+ * 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;
+
+import java.io.IOException;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpSession;
+
+import org.apache.catalina.connector.Request;
+import org.apache.catalina.connector.Response;
+import org.apache.catalina.valves.ValveBase;
+import org.osoa.sca.CurrentModuleContext;
+import org.osoa.sca.ModuleContext;
+import org.osoa.sca.SCA;
+
+import org.apache.tuscany.core.context.CompositeContext;
+import org.apache.tuscany.core.context.event.HttpSessionBound;
+import org.apache.tuscany.core.context.event.RequestStart;
+import org.apache.tuscany.core.context.event.RequestEnd;
+import org.apache.tuscany.core.webapp.LazyHTTPSessionId;
+
+/**
+ * Valve that can be added to a pipeline to automatically set the SCA environment as each request is processed.
+ *
+ * @version $Rev$ $Date$
+ */
+public class TuscanyValve extends ValveBase {
+    /**
+     * Name of the note that contains the request id
+     */
+    private static final String REQUEST_ID = "org.apache.tuscany.tomcat.REQUEST_ID";
+
+    private static final ContextBinder BINDER = new ContextBinder();
+
+    private CompositeContext moduleComponentContext;
+
+    private boolean enabled = true;
+
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    public void setContext(CompositeContext moduleComponentContext) {
+        this.moduleComponentContext = moduleComponentContext;
+    }
+
+    public TuscanyValve(CompositeContext moduleComponentContext) {
+        this.moduleComponentContext = moduleComponentContext;
+    }
+
+    public void invoke(Request request, Response response) throws IOException, ServletException {
+        if (!enabled){
+            return;
+        }
+        Object oldRequestId = request.getNote(REQUEST_ID);
+        ModuleContext oldContext = CurrentModuleContext.getContext();
+        // bind the current module context to the thread for use by CurrentModuleContext
+        BINDER.setContext((ModuleContext) moduleComponentContext);
+        try {
+            if (oldRequestId != null) {
+                // the request has already been started, just invoke the next valve
+                next.invoke(request, response);
+            } else {
+                // tell the runtime a new request is starting
+                Object requestId = new Object();
+
+                HttpSession session = request.getSession(false);
+                if (session != null) {
+                    // A session is already active
+                    moduleComponentContext .publish(new HttpSessionBound(this,session));
+                } else {
+                    // Create a lazy wrapper since a session is not yet active
+                    moduleComponentContext.publish(new HttpSessionBound(this, new LazyHTTPSessionId(request)));
+                }
+
+                try {
+                    moduleComponentContext.publish(new RequestStart(this, requestId));
+                } catch (Exception e) {
+                    throw new ServletException(e.getMessage(), e);
+                }
+                request.setNote(REQUEST_ID, requestId);
+
+                try {
+                    // invoke the next valve in the pipeline
+                    next.invoke(request, response);
+                } finally {
+                    // notify the runtime the request is ending
+                    request.removeNote(REQUEST_ID);
+                    try {
+                        moduleComponentContext.publish(new RequestEnd(this, requestId));
+                    } catch (Exception e) {
+                        // the application already did its work, log and ignore
+                        // todo log this exception
+                    }
+                }
+            }
+        } finally {
+            // restore the previous module context onto the thread
+            BINDER.setContext(oldContext);
+        }
+    }
+
+    private static class ContextBinder extends SCA {
+        public void setContext(ModuleContext context) {
+            setModuleContext(context);
+        }
+
+        public void start() {
+            throw new AssertionError();
+        }
+
+        public void stop() {
+            throw new AssertionError();
+        }
+    }
+}
diff --git a/tags/java-M1-20060518/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyWrapper.java b/tags/java-M1-20060518/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyWrapper.java
new file mode 100644
index 0000000000..de53ad4d45
--- /dev/null
+++ b/tags/java-M1-20060518/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyWrapper.java
@@ -0,0 +1,43 @@
+/**
+ *
+ * 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;
+
+import javax.servlet.Servlet;
+
+import org.apache.catalina.core.StandardWrapper;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class TuscanyWrapper extends StandardWrapper {
+    private static final long serialVersionUID = 1L;
+
+    private final Servlet servlet;
+
+    public TuscanyWrapper(Servlet servlet) {
+        super();
+        this.servlet = servlet;
+    }
+
+    public synchronized Servlet loadServlet() {
+        return servlet;
+    }
+
+    public Servlet getServlet() {
+        return servlet;
+    }
+}
diff --git a/tags/java-M1-20060518/java/sca/tomcat/src/main/resources/org/apache/tuscany/tomcat/LocalStrings.properties b/tags/java-M1-20060518/java/sca/tomcat/src/main/resources/org/apache/tuscany/tomcat/LocalStrings.properties
new file mode 100644
index 0000000000..43fc99958e
--- /dev/null
+++ b/tags/java-M1-20060518/java/sca/tomcat/src/main/resources/org/apache/tuscany/tomcat/LocalStrings.properties
@@ -0,0 +1,25 @@
+#  Copyright (c) 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.
+
+runtime.loadSystemFailed = Error loading system configuration from: {0}
+runtime.registerSystemFailed = Error registering system configuration:
+runtime.started = Started Tuscany runtime
+runtime.stopped = Stopped Tuscany runtime
+
+tuscanyHost.notContext = Child of a TuscanyHost must be a StandardContext
+context.configLoad = Loading SCA configuration for application {0}
+
+context.configError = Error loading the SCA configuration
+context.moduleStartError = Error starting SCA module
+context.unknownRuntimeException = Unexpected RuntimeException
diff --git a/tags/java-M1-20060518/java/sca/tomcat/src/main/resources/org/apache/tuscany/tomcat/Messages.properties b/tags/java-M1-20060518/java/sca/tomcat/src/main/resources/org/apache/tuscany/tomcat/Messages.properties
new file mode 100644
index 0000000000..f926ca6488
--- /dev/null
+++ b/tags/java-M1-20060518/java/sca/tomcat/src/main/resources/org/apache/tuscany/tomcat/Messages.properties
@@ -0,0 +1,39 @@
+#  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.
+# ====================================================================
+# To code developer:
+#   Do NOT change the properties between this line and the
+#   "%%% END OF TRANSLATED PROPERTIES %%%" line.
+#   Make a new property name, append to the end of the file and change
+#   the code to use the new property.
+# ====================================================================
+
+# =====================================================================
+# %%% END OF TRANSLATED PROPERTIES %%%
+# =====================================================================
+# NLS_MESSAGEFORMAT_ALL
+
+SCA_STARTING							=Tuscany: Starting SCA runtime.
+SCA_STARTED								=Tuscany: Started SCA runtime.
+SCA_STOPPING							=Tuscany: Stopping SCA runtime.
+SCA_STOPPED								=Tuscany: Stopped SCA runtime.
+SCA_STARTING_MODULE			=Tuscany: Starting SCA module component {0}.
+SCA_LOADED_MODULE				=Tuscany: Loaded SCA module {0}.
+SCA_STARTED_MODULE				=Tuscany: Started SCA module component {0}.
+SCA_STOPPING_MODULE			=Tuscany: Stopping SCA module component {0}.
+SCA_STOPPED_MODULE				=Tuscany: Stopped SCA module component {0}.
+SCA_START_MODULE_FAILED	=Tuscany: Error starting SCA module component {0}: {1}.
+SCA_STOP_MODULE_FAILED		=Tuscany: Error stopping SCA module component {0}: {1}.
+SCA_START_WEBAPP_FAILED	=Tuscany: Error starting Web application {0}: {1}.
+SCA_STOP_WEBAPP_FAILED		=Tuscany: Error stopping Web application {0}: {1}.
\ No newline at end of file
diff --git a/tags/java-M1-20060518/java/sca/tomcat/src/main/resources/system.fragment b/tags/java-M1-20060518/java/sca/tomcat/src/main/resources/system.fragment
new file mode 100644
index 0000000000..e379e1d90b
--- /dev/null
+++ b/tags/java-M1-20060518/java/sca/tomcat/src/main/resources/system.fragment
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="ASCII"?>
+<!--
+  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.
+ -->
+<moduleFragment xmlns="http://www.osoa.org/xmlns/sca/0.9"
+        xmlns:tuscany="http://org.apache.tuscany/xmlns/system/0.9"
+		name="org.apache.tuscany.tomcat">
+
+    <entryPoint name="org.apache.tuscany.tomcat.TomcatHost">
+        <interface.java interface="org.apache.tuscany.tomcat.TomcatHost"/>
+        <tuscany:binding.system/>
+        <reference>TomcatHost</reference>
+    </entryPoint>
+
+    <component name="TomcatHost">
+        <tuscany:implementation.system class="org.apache.tuscany.tomcat.TomcatHost"/>
+    </component>
+
+</moduleFragment>
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