Author: antelder
Date: Thu Feb 26 17:53:33 2009
New Revision: 748233
URL: http://svn.apache.org/viewvc?rev=748233&view=rev
Log:
Remove commented out code
Modified:
tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/ServletHostHelper.java
tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
Modified:
tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/ServletHostHelper.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/ServletHostHelper.java?rev=748233&r1=748232&r2=748233&view=diff
==============================================================================
---
tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/ServletHostHelper.java
(original)
+++
tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/ServletHostHelper.java
Thu Feb 26 17:53:33 2009
@@ -52,10 +52,6 @@
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());
}
Modified:
tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java?rev=748233&r1=748232&r2=748233&view=diff
==============================================================================
---
tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
(original)
+++
tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
Thu Feb 26 17:53:33 2009
@@ -41,9 +41,6 @@
/**
* 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 static final String SCA_NODE_ATTRIBUTE = Node.class.getName();
-// private static final WebAppServletHost instance = new
WebAppServletHost();
-
private Map<String, Servlet> servlets;
private String contextPath = "/";
private int defaultPortNumber = 8080;
@@ -199,10 +194,6 @@
return null;
}
-// public static WebAppServletHost getInstance() {
-// return instance;
-// }
-
public void init(ServletConfig config) throws ServletException {
servletContext = config.getServletContext();
@@ -236,9 +227,6 @@
}
public void setContextPath(String path) {
- // if (!contextPath.equals(path)) {
- // throw new IllegalArgumentException("invalid context path
for webapp, existing context path: " + contextPath + " new contextPath: " +
path);
- // }
}
/**
