Minor code cleanup in the ServletFilters.

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

2 files changed, 8 insertions, 6 deletions

diff --git a/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeServletFilter.java b/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeServletFilter.java
index 040085cdbd..08c7401fa3 100644
--- a/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeServletFilter.java
+++ b/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeServletFilter.java
@@ -36,10 +36,10 @@ import javax.servlet.ServletResponse;
  * @version $Rev$ $Date$
  */
 public class NodeServletFilter implements Filter {
-    private static final String NODE_WEB_APP_SERVLET_HOST = "org.apache.tuscany.sca.implementation.node.osgi.webapp.NodeWebAppServletHost";
-
     private static final long serialVersionUID = 1L;
 
+    private static final String NODE_WEB_APP_SERVLET_HOST = "org.apache.tuscany.sca.implementation.node.webapp.NodeWebAppServletHost";
+
     private static final Logger logger = Logger.getLogger(NodeServletFilter.class.getName());
 
     private ClassLoader runtimeClassLoader;
@@ -48,12 +48,12 @@ public class NodeServletFilter implements Filter {
     private Filter filter;
 
     public void init(FilterConfig filterConfig) throws ServletException {
-        logger.info("Apache Tuscany SCA WebApp Node starting...");
+        logger.info("Apache Tuscany SCA WebApp Node is starting...");
 
         try {
             // Get the Tuscany runtime ClassLoader
             ClassLoader tccl = Thread.currentThread().getContextClassLoader();
-            
+            //runtimeClassLoader = webAppRuntimeClassLoader(getClass().getClassLoader());            
             try {
                 if (runtimeClassLoader != null) {
                     Thread.currentThread().setContextClassLoader(runtimeClassLoader);
diff --git a/java/sca/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java b/java/sca/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java
index ad4009a1e1..5345363031 100644
--- a/java/sca/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java
+++ b/java/sca/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java
@@ -40,6 +40,8 @@ import javax.servlet.ServletResponse;
 public class NodeServletFilter implements Filter {
     private static final long serialVersionUID = 1L;
 
+    private static final String NODE_WEB_APP_SERVLET_HOST = "org.apache.tuscany.sca.implementation.node.webapp.NodeWebAppServletHost";
+
     private static final Logger logger = Logger.getLogger(NodeServletFilter.class.getName());
 
     private ClassLoader runtimeClassLoader;
@@ -48,7 +50,7 @@ public class NodeServletFilter implements Filter {
     private Filter filter;
 
     public void init(FilterConfig filterConfig) throws ServletException {
-        logger.info("Apache Tuscany SCA WebApp Node starting...");
+        logger.info("Apache Tuscany SCA WebApp Node is starting...");
 
         try {
             // Get the Tuscany runtime ClassLoader
@@ -62,7 +64,7 @@ public class NodeServletFilter implements Filter {
         
                 // Load the Tuscany WebApp Servlet host and get the host instance
                 // for the current webapp
-                String className = "org.apache.tuscany.sca.implementation.node.webapp.NodeWebAppServletHost"; 
+                String className = NODE_WEB_APP_SERVLET_HOST; 
                 if (runtimeClassLoader != null) {
                     servletHostClass = Class.forName(className, true, runtimeClassLoader);
                 } else {