svn commit: r692320 - in /tuscany/java/sca/modules: node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeServletFilter.java node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java

[jsdelfino]

Author: jsdelfino
Date: Thu Sep  4 19:27:34 2008
New Revision: 692320

URL: http://svn.apache.org/viewvc?rev=692320&view=rev
Log:
Minor code cleanup in the ServletFilters.

Modified:
    
tuscany/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeServletFilter.java
    
tuscany/java/sca/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java

Modified: 
tuscany/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeServletFilter.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeServletFilter.java?rev=692320&r1=692319&r2=692320&view=diff
==============================================================================
--- 
tuscany/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeServletFilter.java
 (original)
+++ 
tuscany/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeServletFilter.java
 Thu Sep  4 19:27:34 2008
@@ -36,10 +36,10 @@
  * @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 @@
     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);

Modified: 
tuscany/java/sca/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java?rev=692320&r1=692319&r2=692320&view=diff
==============================================================================
--- 
tuscany/java/sca/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java
 (original)
+++ 
tuscany/java/sca/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java
 Thu Sep  4 19:27:34 2008
@@ -40,6 +40,8 @@
 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 @@
     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 @@
         
                 // 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 {