From 12c7bef1b8470a0db3421705ee3ed7731ca4a3fa Mon Sep 17 00:00:00 2001 From: antelder Date: Thu, 26 Feb 2009 17:53:33 +0000 Subject: Remove commented out code git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@748233 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/tuscany/sca/host/webapp/ServletHostHelper.java | 4 ---- .../apache/tuscany/sca/host/webapp/WebAppServletHost.java | 12 ------------ 2 files changed, 16 deletions(-) (limited to 'java/sca/modules/host-webapp/src/main') diff --git a/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/ServletHostHelper.java b/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/ServletHostHelper.java index 470428bb05..fd6a3ed22b 100644 --- a/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/ServletHostHelper.java +++ b/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/ServletHostHelper.java @@ -52,10 +52,6 @@ public class ServletHostHelper { public static final String SCA_NODE_ATTRIBUTE = Node.class.getName(); -// public static ServletHost getServletHost() { -// return WebAppServletHost.getInstance(); -// } - public static void init(ServletConfig servletConfig) { init(servletConfig.getServletContext()); } diff --git a/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java b/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java index f05203f5e8..c572d9f1d3 100644 --- a/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java +++ b/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java @@ -41,9 +41,6 @@ import org.apache.tuscany.sca.node.Node; /** * ServletHost implementation for use in a webapp environment. * - * FIXME: TUSCANY-2881: using a static singleton seems a big hack but how should it be shared? - * Need some way for TuscanyServlet to pull it out. - * * @version $Rev$ $Date$ */ public class WebAppServletHost implements ServletHost { @@ -51,8 +48,6 @@ public class WebAppServletHost implements ServletHost { public static final String SCA_NODE_ATTRIBUTE = Node.class.getName(); -// private static final WebAppServletHost instance = new WebAppServletHost(); - private Map servlets; private String contextPath = "/"; private int defaultPortNumber = 8080; @@ -199,10 +194,6 @@ public class WebAppServletHost implements ServletHost { return null; } -// public static WebAppServletHost getInstance() { -// return instance; -// } - public void init(ServletConfig config) throws ServletException { servletContext = config.getServletContext(); @@ -236,9 +227,6 @@ public class WebAppServletHost implements ServletHost { } public void setContextPath(String path) { - // if (!contextPath.equals(path)) { - // throw new IllegalArgumentException("invalid context path for webapp, existing context path: " + contextPath + " new contextPath: " + path); - // } } /** -- cgit v1.2.3