svn commit: r393369 [4/4] - in /incubator/tuscany/java/sca: containers/container.java/src/main/java/org/apache/tuscany/container/java/context/ containers/container.java/src/test/java/org/apache/tuscany/container/java/builder/ containers/container.java/...

[jmarino]

Modified: 
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.java?rev=393369&r1=393368&r2=393369&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.java
 (original)
+++ 
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.java
 Tue Apr 11 19:36:42 2006
@@ -31,8 +31,8 @@
 import org.apache.tuscany.core.config.ConfigurationLoadException;
 import org.apache.tuscany.core.config.ModuleComponentConfigurationLoader;
 import org.apache.tuscany.core.context.CompositeContext;
-import org.apache.tuscany.core.context.EventContext;
 import org.apache.tuscany.core.context.SystemCompositeContext;
+import org.apache.tuscany.core.context.event.ModuleStartEvent;
 import org.apache.tuscany.core.runtime.RuntimeContext;
 import org.apache.tuscany.core.runtime.RuntimeContextImpl;
 import org.apache.tuscany.model.assembly.AssemblyFactory;
@@ -86,7 +86,7 @@
             ModuleComponentConfigurationLoader loader = 
BootstrapHelper.getConfigurationLoader(systemContext, modelContext);
             ModuleComponent systemModuleComponent = 
loader.loadSystemModuleComponent(SYSTEM_MODULE_COMPONENT, 
SYSTEM_MODULE_COMPONENT);
             CompositeContext context = 
BootstrapHelper.registerModule(systemContext, systemModuleComponent);
-            context.fireEvent(EventContext.MODULE_START, null);
+            context.publish(new ModuleStartEvent(this));
         } catch (ConfigurationLoadException e) {
             getLogger().warn(sm.getString("runtime.loadSystemFailed", 
e.getResourceURI()), e);
             return;

Modified: 
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyValve.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyValve.java?rev=393369&r1=393368&r2=393369&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyValve.java
 (original)
+++ 
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyValve.java
 Tue Apr 11 19:36:42 2006
@@ -28,7 +28,9 @@
 import org.osoa.sca.SCA;
 
 import org.apache.tuscany.core.context.CompositeContext;
-import org.apache.tuscany.core.context.EventContext;
+import org.apache.tuscany.core.context.event.HttpSessionBoundEvent;
+import org.apache.tuscany.core.context.event.RequestStartEvent;
+import org.apache.tuscany.core.context.event.RequestEndEvent;
 import org.apache.tuscany.core.webapp.LazyHTTPSessionId;
 
 /**
@@ -67,14 +69,14 @@
                 HttpSession session = request.getSession(false);
                 if (session != null) {
                     // A session is already active
-                    moduleComponentContext 
.fireEvent(EventContext.SESSION_NOTIFY, session);
+                    moduleComponentContext .publish(new 
HttpSessionBoundEvent(this,session));
                 } else {
                     // Create a lazy wrapper since a session is not yet active
-                    
moduleComponentContext.fireEvent(EventContext.SESSION_NOTIFY, new 
LazyHTTPSessionId(request));
+                    moduleComponentContext.publish(new 
HttpSessionBoundEvent(this, new LazyHTTPSessionId(request)));
                 }
 
                 try {
-                    
moduleComponentContext.fireEvent(EventContext.REQUEST_START, requestId);
+                    moduleComponentContext.publish(new RequestStartEvent(this, 
requestId));
                 } catch (Exception e) {
                     throw new ServletException(e.getMessage(), e);
                 }
@@ -87,7 +89,7 @@
                     // notify the runtime the request is ending
                     request.removeNote(REQUEST_ID);
                     try {
-                        
moduleComponentContext.fireEvent(EventContext.REQUEST_END, requestId);
+                        moduleComponentContext.publish(new 
RequestEndEvent(this, requestId));
                     } catch (Exception e) {
                         // the application already did its work, log and ignore
                         // todo log this exception