From cdc5060abcdf963ad1e1de02e7275f41dbca9707 Mon Sep 17 00:00:00 2001 From: antelder Date: Mon, 23 Mar 2009 08:00:46 +0000 Subject: Delete old m2 branch in the sandbox git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@757344 13f79535-47bb-0310-9956-ffa450edef68 --- .../tuscany/sca/host/webapp/ServletHostHelper.java | 202 ---------------- .../sca/host/webapp/TuscanyContextListener.java | 40 ---- .../sca/host/webapp/TuscanyServletFilter.java | 85 ------- .../sca/host/webapp/WebAppModuleActivator.java | 51 ----- .../sca/host/webapp/WebAppRequestDispatcher.java | 114 --------- .../tuscany/sca/host/webapp/WebAppServletHost.java | 254 --------------------- .../org.apache.tuscany.sca.core.ModuleActivator | 18 -- 7 files changed, 764 deletions(-) delete mode 100644 sandbox/ant/sca/branches/2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/ServletHostHelper.java delete mode 100644 sandbox/ant/sca/branches/2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java delete mode 100644 sandbox/ant/sca/branches/2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java delete mode 100644 sandbox/ant/sca/branches/2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java delete mode 100644 sandbox/ant/sca/branches/2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java delete mode 100644 sandbox/ant/sca/branches/2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java delete mode 100644 sandbox/ant/sca/branches/2.0-M2/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator (limited to 'sandbox/ant/sca/branches/2.0-M2/modules/host-webapp/src/main') diff --git a/sandbox/ant/sca/branches/2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/ServletHostHelper.java b/sandbox/ant/sca/branches/2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/ServletHostHelper.java deleted file mode 100644 index fd6a3ed22b..0000000000 --- a/sandbox/ant/sca/branches/2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/ServletHostHelper.java +++ /dev/null @@ -1,202 +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.BufferedReader; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.lang.reflect.Method; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Collections; -import java.util.Enumeration; -import java.util.List; -import java.util.logging.Logger; - -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; - -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.host.http.ServletHost; -import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint; -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.apache.tuscany.sca.node.impl.NodeImpl; -import org.oasisopen.sca.ServiceRuntimeException; - -public class ServletHostHelper { - private static final Logger logger = Logger.getLogger(ServletHostHelper.class.getName()); - - public static final String SCA_NODE_ATTRIBUTE = Node.class.getName(); - - public static void init(ServletConfig servletConfig) { - init(servletConfig.getServletContext()); - } - - public static ServletHost init(final ServletContext servletContext) { - Node node = (Node)servletContext.getAttribute(SCA_NODE_ATTRIBUTE); - if (node == null) { - try { - node = createNode(servletContext); - servletContext.setAttribute(SCA_NODE_ATTRIBUTE, node); - getServletHost(node).init(new ServletConfig() { - public String getInitParameter(String name) { - return servletContext.getInitParameter(name); - } - public Enumeration getInitParameterNames() { - return servletContext.getInitParameterNames(); - } - public ServletContext getServletContext() { - return servletContext; - } - public String getServletName() { - return servletContext.getServletContextName(); - }}); - } catch (ServletException e) { - throw new RuntimeException(e); - } - } - return getServletHost(node); - } - - private static WebAppServletHost getServletHost(Node node) { - NodeImpl nodeImpl = (NodeImpl) node; - ExtensionPointRegistry eps = nodeImpl.getExtensionPoints(); - ServletHostExtensionPoint servletHosts = eps.getExtensionPoint(ServletHostExtensionPoint.class); - List hosts = servletHosts.getServletHosts(); - if (hosts == null || hosts.size() < 1) { - throw new IllegalStateException("No ServletHost found"); - } - ServletHost servletHost = hosts.get(0); - if (!(servletHost instanceof WebAppServletHost)) { - throw new IllegalStateException("unexpected ServletHost type: " + servletHost); - } - return (WebAppServletHost) servletHost; - } - - private static Node createNode(final ServletContext servletContext) throws ServletException { - String contextPath = initContextPath(servletContext); - String contributionRoot = getContributionRoot(servletContext); - NodeFactory factory = NodeFactory.newInstance(); - String webComposite = getWebComposite(servletContext); - Node node = factory.createNode(contextPath, webComposite, new Contribution(contributionRoot, contributionRoot)); - node.start(); - return node; - } - - private static String getWebComposite(ServletContext servletContext) { - InputStream stream = servletContext.getResourceAsStream("/WEB-INF/web.composite"); - BufferedReader reader = new BufferedReader(new InputStreamReader(stream)); - - StringBuilder sb = new StringBuilder(); - String s = null; - try { - while ((s = reader.readLine()) != null) { - sb.append(s + "\n"); - } - } catch (IOException e) { - throw new ServiceRuntimeException(e); - } finally { - try { - stream.close(); - } catch (IOException e) { - throw new ServiceRuntimeException(e); - } - } - - return sb.toString(); - } - - private static String getContributionRoot(ServletContext servletContext) { - String contributionRoot = null; - try { - - InitialContext ic = new InitialContext(); - URL repoURL = (URL)ic.lookup("java:comp/env/url/contributions"); - - contributionRoot = repoURL.toString(); - - } catch (NamingException e) { - - // ignore exception and use default location - - try { - - String root = servletContext.getInitParameter("contributionRoot"); - if (root == null || root.length() < 1) { - root = "/"; - } - URL rootURL = servletContext.getResource(root); - if (rootURL.getProtocol().equals("jndi")) { - //this is Tomcat case, we should use getRealPath - File warRootFile = new File(servletContext.getRealPath(root)); - contributionRoot = warRootFile.toURI().toString(); - } else { - //this is Jetty case - contributionRoot = rootURL.toString(); - } - - } catch (MalformedURLException mf) { - //ignore, pass null - } - } - - logger.info("contributionRoot: " + contributionRoot); - return contributionRoot; - } - - /** - * 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") - private static String initContextPath(ServletContext context) { - String contextPath; - if (Collections.list(context.getInitParameterNames()).contains("contextPath")) { - contextPath = context.getInitParameter("contextPath"); - } else { - try { - // Try to get the method anyway since some ServletContext impl has this method even before 2.5 - Method m = context.getClass().getMethod("getContextPath", new Class[] {}); - contextPath = (String)m.invoke(context, new Object[] {}); - } catch (Exception e) { - logger.warning("Servlet level is: " + context.getMajorVersion() + "." + context.getMinorVersion()); - throw new IllegalStateException("'contextPath' init parameter must be set for pre-2.5 servlet container"); - } - } - logger.info("ContextPath: " + contextPath); - return contextPath; - } - - public static void stop(ServletContext servletContext) { - Node node = (Node) servletContext.getAttribute(ServletHostHelper.SCA_NODE_ATTRIBUTE); - if (node != null) { - node.stop(); - servletContext.setAttribute(ServletHostHelper.SCA_NODE_ATTRIBUTE, null); - } - } -} diff --git a/sandbox/ant/sca/branches/2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java b/sandbox/ant/sca/branches/2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java deleted file mode 100644 index 0f36094311..0000000000 --- a/sandbox/ant/sca/branches/2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java +++ /dev/null @@ -1,40 +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 javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; - - -/** - * A ServletContextListener to create and close the SCADomain - * when the webapp is initialized or destroyed. - */ -public class TuscanyContextListener implements ServletContextListener { - - public void contextInitialized(ServletContextEvent event) { - ServletHostHelper.init(event.getServletContext()); - } - - public void contextDestroyed(ServletContextEvent event) { - ServletHostHelper.stop(event.getServletContext()); - } - -} diff --git a/sandbox/ant/sca/branches/2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java b/sandbox/ant/sca/branches/2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java deleted file mode 100644 index 359817e024..0000000000 --- a/sandbox/ant/sca/branches/2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java +++ /dev/null @@ -1,85 +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.IOException; - -import javax.servlet.Filter; -import javax.servlet.FilterConfig; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; - -import org.apache.tuscany.sca.host.http.ServletHost; - - -/** - * A Servlet filter that forwards service requests to the Servlets registered with - * the Tuscany ServletHost. - * - * @version $Rev$ $Date$ - */ -public class TuscanyServletFilter implements Filter { - private static final long serialVersionUID = 1L; - - private transient ServletContext context; - private transient ServletHost servletHost; - - public void init(final FilterConfig config) throws ServletException { - context = config.getServletContext(); - servletHost = ServletHostHelper.init(context); - } - - public void destroy() { - ServletHostHelper.stop(context); - } - - public void doFilter(ServletRequest request, ServletResponse response, javax.servlet.FilterChain chain) - throws IOException, ServletException { - - // Get the Servlet path - HttpServletRequest httpRequest = (HttpServletRequest)request; - String path = httpRequest.getPathInfo(); - if (path == null) { - path = httpRequest.getServletPath(); - } - if (path == null) { - path = "/"; - } - - // Get a request dispatcher for the Servlet mapped to that path - RequestDispatcher dispatcher = servletHost.getRequestDispatcher(path); - if (dispatcher != null) { - - // Let the dispatcher forward the request to the Servlet - dispatcher.forward(request, response); - - } else { - - // Proceed down the filter chain - chain.doFilter(request, response); - - } - } - -} diff --git a/sandbox/ant/sca/branches/2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java b/sandbox/ant/sca/branches/2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java deleted file mode 100644 index d07b19bca9..0000000000 --- a/sandbox/ant/sca/branches/2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java +++ /dev/null @@ -1,51 +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.util.List; - -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.ModuleActivator; -import org.apache.tuscany.sca.host.http.ServletHost; -import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint; - -/** - * Activates the webapp host by registering the webapp ServletHost impl - * - * @version $Rev$ $Date$ - */ -public class WebAppModuleActivator implements ModuleActivator { - - public void start(ExtensionPointRegistry extensionPointRegistry) { - - ServletHostExtensionPoint servletHosts = - extensionPointRegistry.getExtensionPoint(ServletHostExtensionPoint.class); - - List hosts = servletHosts.getServletHosts(); - // Only add webapp host if no other host already registered (eg jetty in standalone) - if (hosts != null && hosts.size() < 1) { - hosts.add(new WebAppServletHost()); - } - } - - public void stop(ExtensionPointRegistry registry) { - } - -} diff --git a/sandbox/ant/sca/branches/2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java b/sandbox/ant/sca/branches/2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java deleted file mode 100644 index f14dfac58b..0000000000 --- a/sandbox/ant/sca/branches/2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java +++ /dev/null @@ -1,114 +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.IOException; -import java.util.StringTokenizer; - -import javax.servlet.RequestDispatcher; -import javax.servlet.Servlet; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; - -/** - * A Servlet request dispatcher that can be used to delegate requests to a - * Servlet registered with the Webapp Servlet host. - * - * @version $Rev$ $Date$ - */ -class WebAppRequestDispatcher implements RequestDispatcher { - private String servletPath; - private Servlet servlet; - - public WebAppRequestDispatcher(String mapping, Servlet servlet) { - if (mapping.endsWith("*")) { - mapping = mapping.substring(0, mapping.length()-1); - } - if (mapping.endsWith("/")) { - mapping = mapping.substring(0, mapping.length()-1); - } - this.servletPath = mapping; - this.servlet = servlet; - } - - /** - * Returns a request wrapper which will return the correct Servlet path - * and path info. - * - * @param request - * @return - */ - private HttpServletRequest createRequestWrapper(ServletRequest request) { - HttpServletRequest requestWrapper = new HttpServletRequestWrapper((HttpServletRequest)request) { - - @Override - public String getServletPath() { - return servletPath; - } - - @Override - public String getPathInfo() { - String path = super.getServletPath(); - if (path.length() == 0) { - path = super.getPathInfo(); - } - - // TODO: another context path hack, revisit when context path is sorted out - path = fiddlePath(path, servletPath); - - return path; - } - }; - return requestWrapper; - } - - /** - * Remove any path suffix thats part of the Servlet context path - */ - protected String fiddlePath(String path, String servletPath) { - StringTokenizer st = new StringTokenizer(path, "/"); - if (st.countTokens() == 1) { - return path; - } - String root = ""; - while (st.hasMoreTokens()){ - String s = st.nextToken(); - if (servletPath.endsWith((root + "/" + s))) { - root += "/" + s; - } else { - break; - } - } - String fiddlePath = path.substring(root.length()); - return fiddlePath; - } - - public void forward(ServletRequest request, ServletResponse response) throws ServletException, IOException { - servlet.service(createRequestWrapper(request), response); - } - - public void include(ServletRequest request, ServletResponse response) throws ServletException, IOException { - servlet.service(createRequestWrapper(request), response); - } -} - diff --git a/sandbox/ant/sca/branches/2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java b/sandbox/ant/sca/branches/2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java deleted file mode 100644 index c572d9f1d3..0000000000 --- a/sandbox/ant/sca/branches/2.0-M2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java +++ /dev/null @@ -1,254 +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.net.InetAddress; -import java.net.MalformedURLException; -import java.net.URI; -import java.net.URL; -import java.net.UnknownHostException; -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.http.ServletHost; -import org.apache.tuscany.sca.host.http.ServletMappingException; -import org.apache.tuscany.sca.node.Node; - -/** - * ServletHost implementation for use in a webapp environment. - * - * @version $Rev$ $Date$ - */ -public class WebAppServletHost implements ServletHost { - private static final Logger logger = Logger.getLogger(WebAppServletHost.class.getName()); - - public static final String SCA_NODE_ATTRIBUTE = Node.class.getName(); - - private Map servlets; - private String contextPath = "/"; - private int defaultPortNumber = 8080; - private String contributionRoot; - - private ServletContext servletContext; - private Map tempAttributes = new HashMap(); - - public WebAppServletHost() { - servlets = new HashMap(); - } - - public void setDefaultPort(int port) { - defaultPortNumber = port; - } - - public int getDefaultPort() { - return defaultPortNumber; - } - - 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; - } - - if (!suri.startsWith(contextPath)) { - suri = contextPath + 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("Added Servlet mapping: " + 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; - } - - if (!suri.startsWith(contextPath)) { - suri = contextPath + 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; - } - - if (!suri.startsWith(contextPath)) { - suri = contextPath + suri; - } - - // Get the Servlet mapped to the given path - Servlet servlet = servlets.get(suri); - return servlet; - } - - public URL getURLMapping(String suri) throws ServletMappingException { - URI uri = URI.create(suri); - - // Get the URI scheme and port - String scheme = uri.getScheme(); - if (scheme == null) { - scheme = "http"; - } - int portNumber = uri.getPort(); - if (portNumber == -1) { - portNumber = defaultPortNumber; - } - - // Get the host - String host; - try { - host = InetAddress.getLocalHost().getHostName(); - } catch (UnknownHostException e) { - host = "localhost"; - } - - // Construct the URL - String path = uri.getPath(); - if (!path.startsWith("/")) { - path = '/' + path; - } - - if (contextPath != null && !path.startsWith(contextPath)) { - path = contextPath + path; - } - - URL url; - try { - url = new URL(scheme, host, portNumber, path); - } catch (MalformedURLException e) { - throw new ServletMappingException(e); - } - return url; - } - - public RequestDispatcher getRequestDispatcher(String suri) throws ServletMappingException { - - // Make sure that the path starts with a / - if (!suri.startsWith("/")) { - suri = '/' + suri; - } - - suri = contextPath + 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 entry : servlets.entrySet()) { - String servletPath = entry.getKey(); - if (servletPath.endsWith("*")) { - servletPath = servletPath.substring(0, servletPath.length() - 1); - if (suri.startsWith(servletPath)) { - // entry key is contextPath/servletPath, WebAppRequestDispatcher only wants servletPath - return new WebAppRequestDispatcher(entry.getKey().substring(contextPath.length()), entry.getValue()); - } else { - if ((suri + "/").startsWith(servletPath)) { - return new WebAppRequestDispatcher(entry.getKey().substring(contextPath.length()), entry.getValue()); - } - } - } - } - - // No Servlet found - return null; - } - - public void init(ServletConfig config) throws ServletException { - - servletContext = config.getServletContext(); - - for (String name : tempAttributes.keySet()) { - servletContext.setAttribute(name, tempAttributes.get(name)); - } - - ServletHostHelper.init(servletContext); - - // Initialize the registered Servlets - for (Servlet servlet : servlets.values()) { - servlet.init(config); - } - - } - - void destroy() { - - // Destroy the registered Servlets - for (Servlet servlet : servlets.values()) { - servlet.destroy(); - } - - // Close the SCA domain - ServletHostHelper.stop(servletContext); - } - - public String getContextPath() { - return contextPath; - } - - public void setContextPath(String path) { - } - - /** - * TODO: How context paths work is still up in the air so for now - * this hacks in a path that gets some samples working - * can't use setContextPath as NodeImpl calls that later - */ - public void setContextPath2(String path) { - if (path != null && path.length() > 0) { - this.contextPath = path; - } - } - - public String getContributionRoot() { - return contributionRoot; - } - - public void setAttribute(String name, Object value) { - if (servletContext != null) { - servletContext.setAttribute(name, value); - } else { - tempAttributes.put(name, value); - } - } -} diff --git a/sandbox/ant/sca/branches/2.0-M2/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sandbox/ant/sca/branches/2.0-M2/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator deleted file mode 100644 index d99fdf257e..0000000000 --- a/sandbox/ant/sca/branches/2.0-M2/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# Implementation class for the ModuleActivator -org.apache.tuscany.sca.host.webapp.WebAppModuleActivator -- cgit v1.2.3