Just formating and comment updates, no code changes. Note the tuscanyClassLoader comment was incorrect before, there's a TuscanyStandardContext instance for each webapp so the tuscanyClassLoader is per webapp too

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

1 files changed, 5 insertions, 6 deletions

diff --git a/java/sca/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyStandardContext.java b/java/sca/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyStandardContext.java
index 14b9e65e2b..5757c13206 100644
--- a/java/sca/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyStandardContext.java
+++ b/java/sca/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyStandardContext.java
@@ -39,16 +39,16 @@ import org.apache.catalina.deploy.FilterDef;
  * the start and inserts any required Tuscany configuration.

  */

 public class TuscanyStandardContext extends StandardContext {

-    protected static final String TUSCANY_FILTER_NAME = "TuscanyFilter";

-    protected static final String TUSCANY_SERVLET_FILTER = "org.apache.tuscany.sca.host.webapp.TuscanyServletFilter";

-    protected static final String TUSCANY_CONTEXT_LISTENER =

-        "org.apache.tuscany.sca.host.webapp.TuscanyContextListener";

     private static final long serialVersionUID = 1L;

     private static final Logger log = Logger.getLogger(TuscanyStandardContext.class.getName());

 

+    protected static final String TUSCANY_FILTER_NAME = "TuscanyFilter";

+    protected static final String TUSCANY_SERVLET_FILTER = "org.apache.tuscany.sca.host.webapp.TuscanyServletFilter";

+    protected static final String TUSCANY_CONTEXT_LISTENER = "org.apache.tuscany.sca.host.webapp.TuscanyContextListener";

+

     private boolean isSCAApp;

 

-    // TODO: this gives an instance per connector, work out how to have only one per server

+    // TODO: this gives an instance per webapp, work out how to have only one per server

     private static URLClassLoader tuscanyClassLoader;

 

     /**

@@ -172,5 +172,4 @@ public class TuscanyStandardContext extends StandardContext {
         }

         return tuscanyClassLoader;

     }

-

 }