1 files changed, 0 insertions, 213 deletions
diff --git a/branches/sca-java-1.0/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java b/branches/sca-java-1.0/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
deleted file mode 100644
index 48000519fb..0000000000
--- a/branches/sca-java-1.0/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.host.webapp;
-
-import java.io.File;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.logging.Logger;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.host.http.ServletHost;
-import org.apache.tuscany.sca.host.http.ServletMappingException;
-
-/**
- * ServletHost implementation for use in a webapp environment.
- * 
- * FIXME: using a static singleton seems a big hack but how should it be shared?
- * Need some way for TuscanyServlet to pull it out.
- */
-public class WebAppServletHost implements ServletHost {
-    private static final Logger logger = Logger.getLogger(WebAppServletHost.class.getName());
-    
-    private static final String SCA_DOMAIN_ATTRIBUTE = "org.apache.tuscany.sca.SCADomain";
-
-    private static final WebAppServletHost instance = new WebAppServletHost();
-
-    private Map<String, Servlet> servlets;
-    private SCADomain scaDomain;
-
-    private String contextPath;
-
-    private WebAppServletHost() {
-        servlets = new HashMap<String, Servlet>();
-    }
-
-    public void addServletMapping(String suri, Servlet servlet) throws ServletMappingException {
-        URI pathURI = URI.create(suri);
-
-        // Make sure that the path starts with a /
-        suri = pathURI.getPath();
-        if (!suri.startsWith("/")) {
-            suri = '/' + suri;
-        }
-        
-        // In a webapp just use the given path and ignore the host and port
-        // as they are fixed by the Web container
-        servlets.put(suri, servlet);
-        
-        logger.info("addServletMapping: " + suri);
-    }
-
-    public Servlet removeServletMapping(String suri) throws ServletMappingException {
-        URI pathURI = URI.create(suri);
-
-        // Make sure that the path starts with a /
-        suri = pathURI.getPath();
-        if (!suri.startsWith("/")) {
-            suri = '/' + suri;
-        }
-
-        // In a webapp just use the given path and ignore the host and port
-        // as they are fixed by the Web container
-        return servlets.remove(suri);
-    }
-
-    public Servlet getServletMapping(String suri) throws ServletMappingException {
-        if (!suri.startsWith("/")) {
-            suri = '/' + suri;
-        }
-        
-        // Get the servlet mapped to the given path
-        Servlet servlet = servlets.get(suri);
-        return servlet;
-    }
-
-    public RequestDispatcher getRequestDispatcher(String suri) throws ServletMappingException {
-
-        // Make sure that the path starts with a /
-        if (!suri.startsWith("/")) {
-            suri = '/' + suri;
-        }
-        
-        // Get the servlet mapped to the given path
-        Servlet servlet = servlets.get(suri);
-        if (servlet != null) {
-            return new WebAppRequestDispatcher(suri, servlet);
-        }
-        for (Map.Entry<String, Servlet> entry : servlets.entrySet()) {
-            String servletPath = entry.getKey();
-            if (servletPath.endsWith("*")) {
-                servletPath = servletPath.substring(0, servletPath.length() -1);
-                if (suri.startsWith(servletPath)) {
-                    return new WebAppRequestDispatcher(entry.getKey(), entry.getValue());
-                } else {
-                    if ((suri + "/").startsWith(servletPath)) {
-                        return new WebAppRequestDispatcher(entry.getKey(), entry.getValue());
-                    }
-                }
-            }
-        }
-        
-        // No servlet found
-        return null;
-    }
-    
-    static WebAppServletHost getInstance() {
-        return instance;
-    }
-
-    void init(ServletConfig config) throws ServletException {
-
-        initContextPath(config);
-
-        // Create an SCA domain object
-        ServletContext servletContext = config.getServletContext();
-        String domainURI = "http://localhost/" + servletContext.getServletContextName().replace(' ', '.');
-        String contributionRoot = null;
-        try {
-            URL rootURL = servletContext.getResource("/");
-            if (rootURL.getProtocol().equals("jndi")) {
-                //this is tomcat case, we should use getRealPath
-                File warRootFile = new File(servletContext.getRealPath("/"));
-                contributionRoot = warRootFile.toURL().toString();
-            } else {
-                //this is jetty case
-                contributionRoot  = rootURL.toString();
-            }
-        } catch(MalformedURLException mf) {
-            //ignore, pass null
-        }
-        scaDomain = SCADomain.newInstance(domainURI, contributionRoot);
-        
-        // Store the SCA domain in the servlet context
-        servletContext.setAttribute(SCA_DOMAIN_ATTRIBUTE, scaDomain);
-        
-        // Initialize the registered servlets
-        for (Servlet servlet : servlets.values()) {
-            servlet.init(config);
-        }
-    }
-
-    /**
-     * Initializes the contextPath
-     * The 2.5 Servlet API has a getter for this, for pre 2.5 servlet
-     * containers use an init parameter.
-     */
-    @SuppressWarnings("unchecked")
-    protected void initContextPath(ServletConfig config) {
-        if (Collections.list(config.getInitParameterNames()).contains("contextPath")) {
-            contextPath = config.getInitParameter("contextPath");
-        } else {
-            ServletContext context = config.getServletContext();
-            Method m;
-            try {
-                m = context.getClass().getMethod("getContextPath", new Class[]{});
-                try {
-                    contextPath = (String)m.invoke(context, new Object[]{});
-                } catch (Exception e) {
-                    throw new RuntimeException(e);
-                }
-            } catch (NoSuchMethodException e) {
-                throw new IllegalStateException("'contextPath' init parameter must be set for pre-2.5 servlet container");
-            }
-        }
-        logger.info("initContextPath: " + contextPath);
-    }
-
-    void destroy() {
-        
-        // Destroy the registered servlets
-        for (Servlet servlet : servlets.values()) {
-            servlet.destroy();
-        }
-
-        // Close the SCA domain
-        if (scaDomain != null) {
-            scaDomain.close();
-        }
-    }
-
-    public String getContextPath() {
-        return contextPath;
-    }
-
-}