svn commit: r685204 - in /tuscany/java/sca/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web: ComponentContextServlet.java WebSingleton.java runtime/WebImplementationProviderFactory.java

[an...@apache.org]

Author: antelder
Date: Tue Aug 12 08:48:49 2008
New Revision: 685204

URL: http://svn.apache.org/viewvc?rev=685204&view=rev
Log:
Remove the need for the WebSingleton

Removed:
    tuscany/java/sca/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/WebSingleton.java
Modified:
    tuscany/java/sca/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/ComponentContextServlet.java
    tuscany/java/sca/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.java

Modified: tuscany/java/sca/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/ComponentContextServlet.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/ComponentContextServlet.java?rev=685204&r1=685203&r2=685204&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/ComponentContextServlet.java (original)
+++ tuscany/java/sca/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/ComponentContextServlet.java Tue Aug 12 08:48:49 2008
@@ -23,7 +23,9 @@
 import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import javax.servlet.ServletConfig;
@@ -52,6 +54,7 @@
     
     protected transient Map<String, Object> attributes = new HashMap<String, Object>();
     protected transient ServletContext servletContext;
+    private transient List<ContextScriptProcessor> contextScriptProcessors = new ArrayList<ContextScriptProcessor>();
 
     @Override
     public void init(ServletConfig servletConfig) throws ServletException {
@@ -106,7 +109,7 @@
 
         out.println("}");
 
-        for (ContextScriptProcessor csp : WebSingleton.INSTANCE.getContextScriptProcessors()) {
+        for (ContextScriptProcessor csp : contextScriptProcessors) {
             csp.scriptInit(req, response);
         }
     }
@@ -123,7 +126,7 @@
         for (ComponentReference cr : component.getReferences()) {
             String ref = "// SCA Reference " + cr.getName() + "\n";
             out.write(ref);
-            for (ContextScriptProcessor csp : WebSingleton.INSTANCE.getContextScriptProcessors()) {
+            for (ContextScriptProcessor csp : contextScriptProcessors) {
                 csp.scriptReference(cr, out);
             }
         }
@@ -150,7 +153,6 @@
     }
 
     public void addContextScriptProcessor(ContextScriptProcessor csp) {
-        // TODO Auto-generated method stub
-        
+        contextScriptProcessors.add(csp);
     }
 }

Modified: tuscany/java/sca/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.java?rev=685204&r1=685203&r2=685204&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.java (original)
+++ tuscany/java/sca/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.java Tue Aug 12 08:48:49 2008
@@ -23,7 +23,6 @@
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.host.http.ServletHost;
 import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint;
-import org.apache.tuscany.sca.host.webapp.WebAppServletHost;
 import org.apache.tuscany.sca.implementation.web.ComponentContextServlet;
 import org.apache.tuscany.sca.implementation.web.ContextScriptProcessorExtensionPoint;
 import org.apache.tuscany.sca.implementation.web.DefaultContextScriptProcessorExtensionPoint;
@@ -57,7 +56,7 @@
         servletHost.addServletMapping("org.osoa.sca.componentContext.js", contextServlet);
         contextServlet.setAttribute("org.osoa.sca.ComponentContext", new ComponentContextProxy(component));
         contextServlet.setAttribute("org.apache.tuscany.sca.implementation.web.RuntimeComponent", component);
-        WebAppServletHost.getInstance().setAttribute("org.osoa.sca.ComponentContext", new ComponentContextProxy(component));
+//        WebAppServletHost.getInstance().setAttribute("org.osoa.sca.ComponentContext", new ComponentContextProxy(component));
 
         return new ImplementationProvider() {
             public Invoker createInvoker(RuntimeComponentService arg0, Operation arg1) {