Modified: 
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/AutowireTestCase.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/AutowireTestCase.java?rev=393992&r1=393991&r2=393992&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/AutowireTestCase.java
 (original)
+++ 
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/AutowireTestCase.java
 Thu Apr 13 18:01:05 2006
@@ -17,8 +17,8 @@
 import junit.framework.TestCase;
 import org.apache.tuscany.core.context.CompositeContext;
 import org.apache.tuscany.core.context.SystemCompositeContext;
-import org.apache.tuscany.core.context.event.ModuleStopEvent;
-import org.apache.tuscany.core.context.event.ModuleStartEvent;
+import org.apache.tuscany.core.context.event.ModuleStop;
+import org.apache.tuscany.core.context.event.ModuleStart;
 import org.apache.tuscany.core.mock.MockFactory;
 import org.apache.tuscany.core.mock.component.AutowireSourceImpl;
 import org.apache.tuscany.core.mock.component.Source;
@@ -75,15 +75,15 @@
         CompositeContext root = runtime.getRootContext();
         SystemCompositeContext system = runtime.getSystemContext();
         CompositeContext system1 = (CompositeContext) 
system.getContext("system1");
-        system1.publish(new ModuleStartEvent(this));
+        system1.publish(new ModuleStart(this));
         Target target = (Target) 
system.getContext("target.system.ep").getInstance(null);
         assertNotNull(target);
         CompositeContext app1 = (CompositeContext) root.getContext("app1");
-        app1.publish(new ModuleStartEvent(this));
+        app1.publish(new ModuleStart(this));
         CompositeContext app1a = (CompositeContext) app1.getContext("app1a");
-        app1a.publish(new ModuleStartEvent(this));
-        app1a.publish(new ModuleStopEvent(this));
-        app1.publish(new ModuleStopEvent(this));
+        app1a.publish(new ModuleStart(this));
+        app1a.publish(new ModuleStop(this));
+        app1.publish(new ModuleStop(this));
         Source source = (Source) app1a.getContext("source").getInstance(null);
         assertEquals(target, source.getTarget());
         source.getTarget().getString();
@@ -98,11 +98,11 @@
         RuntimeContext runtime = createScenario2Runtime();
         CompositeContext root = runtime.getRootContext();
         CompositeContext app1 = (CompositeContext) root.getContext("app1");
-        app1.publish(new ModuleStartEvent(this));
+        app1.publish(new ModuleStart(this));
         CompositeContext app1b = (CompositeContext) app1.getContext("app1b");
-        app1b.publish(new ModuleStartEvent(this));
+        app1b.publish(new ModuleStart(this));
         CompositeContext app1a = (CompositeContext) app1.getContext("app1a");
-        app1a.publish(new ModuleStartEvent(this));
+        app1a.publish(new ModuleStart(this));
         Target target = (Target) 
app1b.getContext("target.ep").getInstance(null);
         assertNotNull(target);
         Source source = (Source) app1a.getContext("source").getInstance(null);
@@ -120,14 +120,14 @@
         SystemCompositeContext system = runtime.getSystemContext();
 
         CompositeContext system2 = (CompositeContext) 
system.getContext("system2");
-        system2.publish(new ModuleStartEvent(this));
+        system2.publish(new ModuleStart(this));
         Target target = (Target) 
system2.getContext("target.ep").getInstance(null);
         assertNotNull(target);
 
         CompositeContext system1 = (CompositeContext) 
system.getContext("system1");
-        system1.publish(new ModuleStartEvent(this));
+        system1.publish(new ModuleStart(this));
         CompositeContext system1a = (CompositeContext) 
system1.getContext("system1a");
-        system1a.publish(new ModuleStartEvent(this));
+        system1a.publish(new ModuleStart(this));
 
         Source source = (Source) 
system1a.getContext("source").getInstance(null);
         assertEquals(target, source.getTarget());
@@ -143,11 +143,11 @@
         RuntimeContext runtime = createScenario4Runtime();
         SystemCompositeContext system = runtime.getSystemContext();
         CompositeContext system1 = (CompositeContext) 
system.getContext("system1");
-        system1.publish(new ModuleStartEvent(this));
+        system1.publish(new ModuleStart(this));
         Target target = (Target) 
system1.getContext("target").getInstance(null);
         assertNotNull(target);
         CompositeContext system1a = (CompositeContext) 
system1.getContext("system1a");
-        system1a.publish(new ModuleStartEvent(this));
+        system1a.publish(new ModuleStart(this));
 
         Source source = (Source) 
system1a.getContext("source").getInstance(null);
         assertEquals(target, source.getTarget());
@@ -163,11 +163,11 @@
         RuntimeContext runtime = createScenario5Runtime();
         SystemCompositeContext system = runtime.getSystemContext();
         CompositeContext system1 = (CompositeContext) 
system.getContext("system1");
-        system1.publish(new ModuleStartEvent(this));
+        system1.publish(new ModuleStart(this));
         Target target = (Target) system.getContext("target").getInstance(null);
         assertNotNull(target);
         CompositeContext system1a = (CompositeContext) 
system1.getContext("system1a");
-        system1a.publish(new ModuleStartEvent(this));
+        system1a.publish(new ModuleStart(this));
 
         Source source = (Source) 
system1a.getContext("source").getInstance(null);
         assertEquals(target, source.getTarget());
@@ -203,7 +203,7 @@
         app1Component.getImplementation().getComponents().add(app1aComponent);
         CompositeContext root = runtime.getRootContext();
         root.registerModelObject(app1Component);
-        system.publish(new ModuleStartEvent(this));
+        system.publish(new ModuleStart(this));
         return runtime;
     }
 
@@ -252,7 +252,7 @@
         Component source = MockFactory.createSystemComponent("source", 
Source.class, AutowireSourceImpl.class, Scope.MODULE);
         system1aComponent.getImplementation().getComponents().add(source);
         system.registerModelObject(system1Component);
-        system.publish(new ModuleStartEvent(this));
+        system.publish(new ModuleStart(this));
         return runtime;
     }
 
@@ -270,7 +270,7 @@
         Component source = MockFactory.createSystemComponent("source", 
Source.class, AutowireSourceImpl.class, Scope.MODULE);
         system1aComponent.getImplementation().getComponents().add(source);
         system.registerModelObject(system1Component);
-        system.publish(new ModuleStartEvent(this));
+        system.publish(new ModuleStart(this));
         return runtime;
     }
 
@@ -288,7 +288,7 @@
         Component source = MockFactory.createSystemComponent("source", 
Source.class, AutowireSourceImpl.class, Scope.MODULE);
         system1aComponent.getImplementation().getComponents().add(source);
         system.registerModelObject(system1Component);
-        system.publish(new ModuleStartEvent(this));
+        system.publish(new ModuleStart(this));
         return runtime;
     }
 

Modified: 
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/CompositeNestingTestCase.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/CompositeNestingTestCase.java?rev=393992&r1=393991&r2=393992&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/CompositeNestingTestCase.java
 (original)
+++ 
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/CompositeNestingTestCase.java
 Thu Apr 13 18:01:05 2006
@@ -16,7 +16,7 @@
 import junit.framework.Assert;
 import junit.framework.TestCase;
 import org.apache.tuscany.core.context.CompositeContext;
-import org.apache.tuscany.core.context.event.ModuleStartEvent;
+import org.apache.tuscany.core.context.event.ModuleStart;
 import org.apache.tuscany.core.mock.MockFactory;
 import org.apache.tuscany.core.mock.component.Source;
 import org.apache.tuscany.core.mock.component.Target;
@@ -40,15 +40,15 @@
         runtime.getSystemContext().registerModelObject(child1);
         CompositeContext child1Ctx = (CompositeContext) 
runtime.getSystemContext().getContext("child1");
         Assert.assertNotNull(child1Ctx);
-        child1Ctx.publish(new ModuleStartEvent(this));
+        child1Ctx.publish(new ModuleStart(this));
         analyzeLeafComponents(child1Ctx);
         CompositeContext child2Ctx = (CompositeContext) 
child1Ctx.getContext("child2");
         Assert.assertNotNull(child2Ctx);
-        child2Ctx.publish(new ModuleStartEvent(this));
+        child2Ctx.publish(new ModuleStart(this));
         analyzeLeafComponents(child2Ctx);
         CompositeContext child3Ctx = (CompositeContext) 
child2Ctx.getContext("child3");
         Assert.assertNotNull(child3Ctx);
-        child3Ctx.publish(new ModuleStartEvent(this));
+        child3Ctx.publish(new ModuleStart(this));
         analyzeLeafComponents(child3Ctx);
         
         Assert.assertNull(child1Ctx.getContext("child3")); // sanity check
@@ -63,15 +63,15 @@
         runtime.getRootContext().registerModelObject(child1);
         CompositeContext child1Ctx = (CompositeContext) 
runtime.getRootContext().getContext("child1");
         Assert.assertNotNull(child1Ctx);
-        child1Ctx.publish(new ModuleStartEvent(this));
+        child1Ctx.publish(new ModuleStart(this));
         analyzeLeafComponents(child1Ctx);
         CompositeContext child2Ctx = (CompositeContext) 
child1Ctx.getContext("child2");
         Assert.assertNotNull(child2Ctx);
-        child2Ctx.publish(new ModuleStartEvent(this));
+        child2Ctx.publish(new ModuleStart(this));
         analyzeLeafComponents(child2Ctx);
         CompositeContext child3Ctx = (CompositeContext) 
child2Ctx.getContext("child3");
         Assert.assertNotNull(child3Ctx);
-        child3Ctx.publish(new ModuleStartEvent(this));
+        child3Ctx.publish(new ModuleStart(this));
         analyzeLeafComponents(child3Ctx);
         
         Assert.assertNull(child1Ctx.getContext("child3")); // sanity check

Modified: 
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/IntraCompositeWireTestCase.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/IntraCompositeWireTestCase.java?rev=393992&r1=393991&r2=393992&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/IntraCompositeWireTestCase.java
 (original)
+++ 
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/IntraCompositeWireTestCase.java
 Thu Apr 13 18:01:05 2006
@@ -17,8 +17,8 @@
 import junit.framework.TestCase;
 import org.apache.tuscany.core.context.AtomicContext;
 import org.apache.tuscany.core.context.SystemCompositeContext;
-import org.apache.tuscany.core.context.event.ModuleStartEvent;
-import org.apache.tuscany.core.context.event.ModuleStopEvent;
+import org.apache.tuscany.core.context.event.ModuleStart;
+import org.apache.tuscany.core.context.event.ModuleStop;
 import org.apache.tuscany.core.mock.MockConfigContext;
 import org.apache.tuscany.core.mock.MockFactory;
 import org.apache.tuscany.core.mock.component.Source;
@@ -38,7 +38,7 @@
         SystemCompositeContext context = createContext();
         context.start();
         
context.registerModelObject(MockFactory.createSystemModuleWithWiredComponents("system.module",Scope.MODULE,
 Scope.MODULE));
-        context.publish(new ModuleStartEvent(this));
+        context.publish(new ModuleStart(this));
         Source source = (Source) ((AtomicContext) 
context.getContext("source")).getTargetInstance();
         Assert.assertNotNull(source);
         Target targetRef = source.getTarget();
@@ -46,7 +46,7 @@
         Target target = (Target) ((AtomicContext) 
context.getContext("target")).getTargetInstance();
         Assert.assertSame(target, targetRef);
         Assert.assertSame(target, source.getTarget());
-        context.publish(new ModuleStopEvent(this));
+        context.publish(new ModuleStop(this));
         context.stop();
     }
 
@@ -54,7 +54,7 @@
         SystemCompositeContext context = createContext();
         context.start();
         
context.registerModelObject(MockFactory.createSystemModuleWithWiredComponents("system.module",Scope.INSTANCE,
 Scope.MODULE));
-        context.publish(new ModuleStartEvent(this));
+        context.publish(new ModuleStart(this));
         Source source = (Source) ((AtomicContext) 
context.getContext("source")).getTargetInstance();
         Assert.assertNotNull(source);
         Target targetRef = source.getTarget();
@@ -63,7 +63,7 @@
         Target target = (Target) ((AtomicContext) 
context.getContext("target")).getTargetInstance();
         Assert.assertSame(target, targetRef);
         Assert.assertSame(target, source.getTarget());
-        context.publish(new ModuleStopEvent(this));
+        context.publish(new ModuleStop(this));
         context.stop();
     }
 
@@ -71,7 +71,7 @@
         SystemCompositeContext context = createContext();
         context.start();
         
context.registerModelObject(MockFactory.createSystemModuleWithWiredComponents("system.module",Scope.MODULE,
 Scope.INSTANCE));
-        context.publish(new ModuleStartEvent(this));
+        context.publish(new ModuleStart(this));
         Source source = (Source) ((AtomicContext) 
context.getContext("source")).getTargetInstance();
         Assert.assertNotNull(source);
         Target targetRef = source.getTarget();
@@ -82,7 +82,7 @@
         // should be the same since the module scope component was alreadyy 
created and the stateless
         // component will be "attached" to it
         Assert.assertSame(source.getTarget(), source2.getTarget());
-        context.publish(new ModuleStopEvent(this));
+        context.publish(new ModuleStop(this));
         context.stop();
     }
 
@@ -90,7 +90,7 @@
         SystemCompositeContext context = createContext();
         context.start();
         
context.registerModelObject(MockFactory.createSystemModuleWithWiredComponents("system.module",Scope.MODULE,
 Scope.MODULE));
-        context.publish(new ModuleStartEvent(this));
+        context.publish(new ModuleStart(this));
         Source source = (Source) ((AtomicContext) 
context.getContext("source")).getTargetInstance();
         Assert.assertNotNull(source);
         Target target = (Target) ((AtomicContext) 
context.getContext("target")).getTargetInstance();

Modified: 
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeComponentContextTestCase.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeComponentContextTestCase.java?rev=393992&r1=393991&r2=393992&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeComponentContextTestCase.java
 (original)
+++ 
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeComponentContextTestCase.java
 Thu Apr 13 18:01:05 2006
@@ -18,8 +18,8 @@
 import org.apache.tuscany.core.builder.ContextFactoryBuilder;
 import org.apache.tuscany.core.context.CompositeContext;
 import org.apache.tuscany.core.context.QualifiedName;
-import org.apache.tuscany.core.context.event.ModuleStartEvent;
-import org.apache.tuscany.core.context.event.ModuleStopEvent;
+import org.apache.tuscany.core.context.event.ModuleStart;
+import org.apache.tuscany.core.context.event.ModuleStop;
 import org.apache.tuscany.core.context.impl.EventContextImpl;
 import org.apache.tuscany.core.mock.MockConfigContext;
 import org.apache.tuscany.core.mock.MockFactory;
@@ -53,9 +53,9 @@
         EntryPoint ep = MockFactory.createEPSystemBinding("TestService1EP", 
ModuleScopeSystemComponent.class, "TestService1", component);
         childContext.registerModelObject(component);
         childContext.registerModelObject(ep);
-        childContext.publish(new ModuleStartEvent(this));
+        childContext.publish(new ModuleStart(this));
         Assert.assertNotNull(system.getContext("system.child").getInstance(new 
QualifiedName("./TestService1EP")));
-        childContext.publish(new ModuleStopEvent(this));
+        childContext.publish(new ModuleStop(this));
     }
 
     public void testAutowireRegisterBeforeStart() throws Exception {
@@ -64,7 +64,7 @@
         system.registerModelObject(component);
         system.registerModelObject(ep);
         system.start();
-        system.publish(new ModuleStartEvent(this));
+        system.publish(new ModuleStart(this));
         
Assert.assertSame(system.getContext("TestService1EP").getInstance(null), 
system.resolveInstance(ModuleScopeSystemComponent.class));
     }
 
@@ -72,7 +72,7 @@
         Component component = factory.createSystemComponent("TestService1", 
ModuleScopeSystemComponent.class, ModuleScopeSystemComponentImpl.class, 
Scope.MODULE);
         system.registerModelObject(component);
         system.start();
-        system.publish(new ModuleStartEvent(this));
+        system.publish(new ModuleStart(this));
         EntryPoint ep = MockFactory.createEPSystemBinding("TestService1EP", 
ModuleScopeSystemComponent.class, "TestService1", component);
         system.registerModelObject(ep);
         
Assert.assertSame(system.getContext("TestService1EP").getInstance(null), 
system.resolveInstance(ModuleScopeSystemComponent.class));
@@ -81,13 +81,13 @@
     public void testAutowireModuleRegisterBeforeStart() throws Exception {
         system.registerModelObject(MockFactory.createSystemModule());
         system.start();
-        system.publish(new ModuleStartEvent(this));
+        system.publish(new ModuleStart(this));
         
Assert.assertSame(system.getContext("TestService1EP").getInstance(null), 
system.resolveInstance(ModuleScopeSystemComponent.class));
     }
 
     public void testAutowireModuleRegisterAfterStart() throws Exception {
         system.start();
-        system.publish(new ModuleStartEvent(this));
+        system.publish(new ModuleStart(this));
         system.registerModelObject(MockFactory.createSystemModule());
         
Assert.assertSame(system.getContext("TestService1EP").getInstance(null), 
system.resolveInstance(ModuleScopeSystemComponent.class));
     }
@@ -101,7 +101,7 @@
     }
 
     protected void tearDown() throws Exception {
-        system.publish(new ModuleStopEvent(this));
+        system.publish(new ModuleStop(this));
         system.stop();
         super.tearDown();
     }

Modified: 
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemObjectRegistrationTestCase.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemObjectRegistrationTestCase.java?rev=393992&r1=393991&r2=393992&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemObjectRegistrationTestCase.java
 (original)
+++ 
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemObjectRegistrationTestCase.java
 Thu Apr 13 18:01:05 2006
@@ -20,7 +20,7 @@
 import junit.framework.TestCase;
 import org.apache.tuscany.core.config.ConfigurationException;
 import org.apache.tuscany.core.context.SystemCompositeContext;
-import org.apache.tuscany.core.context.event.ModuleStartEvent;
+import org.apache.tuscany.core.context.event.ModuleStart;
 import org.apache.tuscany.core.runtime.RuntimeContext;
 import org.apache.tuscany.core.runtime.RuntimeContextImpl;
 
@@ -42,7 +42,7 @@
         runtime = new RuntimeContextImpl();
         runtime.start();
         systemContext = runtime.getSystemContext();
-        systemContext.publish(new ModuleStartEvent(this));
+        systemContext.publish(new ModuleStart(this));
     }
 
     protected void tearDown() throws Exception {

Modified: 
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyContextListener.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyContextListener.java?rev=393992&r1=393991&r2=393992&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyContextListener.java
 (original)
+++ 
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyContextListener.java
 Thu Apr 13 18:01:05 2006
@@ -37,7 +37,7 @@
 import org.apache.tuscany.core.config.ModuleComponentConfigurationLoader;
 import org.apache.tuscany.core.context.CompositeContext;
 import org.apache.tuscany.core.context.EventException;
-import org.apache.tuscany.core.context.event.ModuleStartEvent;
+import org.apache.tuscany.core.context.event.ModuleStart;
 import org.apache.tuscany.core.runtime.RuntimeContext;
 import org.apache.tuscany.model.assembly.AssemblyFactory;
 import org.apache.tuscany.model.assembly.AssemblyContext;
@@ -90,7 +90,7 @@
         }
 
         try {
-            moduleContext.publish(new ModuleStartEvent(this));
+            moduleContext.publish(new ModuleStart(this));
         } catch (EventException e) {
             log.error(sm.getString("context.moduleStartError"), e);
             // todo unload module component from runtime
@@ -139,7 +139,7 @@
 
     private void stopContext(Context ctx) {
         if (moduleContext!=null) {
-            moduleContext.publish(new ModuleStartEvent(this));
+            moduleContext.publish(new ModuleStart(this));
         }
         // todo unload module component from runtime
     }

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=393992&r1=393991&r2=393992&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
 Thu Apr 13 18:01:05 2006
@@ -32,7 +32,7 @@
 import org.apache.tuscany.core.config.ModuleComponentConfigurationLoader;
 import org.apache.tuscany.core.context.CompositeContext;
 import org.apache.tuscany.core.context.SystemCompositeContext;
-import org.apache.tuscany.core.context.event.ModuleStartEvent;
+import org.apache.tuscany.core.context.event.ModuleStart;
 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.publish(new ModuleStartEvent(this));
+            context.publish(new ModuleStart(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=393992&r1=393991&r2=393992&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
 Thu Apr 13 18:01:05 2006
@@ -28,9 +28,9 @@
 import org.osoa.sca.SCA;
 
 import org.apache.tuscany.core.context.CompositeContext;
-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.context.event.HttpSessionBound;
+import org.apache.tuscany.core.context.event.RequestStart;
+import org.apache.tuscany.core.context.event.RequestEnd;
 import org.apache.tuscany.core.webapp.LazyHTTPSessionId;
 
 /**
@@ -69,14 +69,14 @@
                 HttpSession session = request.getSession(false);
                 if (session != null) {
                     // A session is already active
-                    moduleComponentContext .publish(new 
HttpSessionBoundEvent(this,session));
+                    moduleComponentContext .publish(new 
HttpSessionBound(this,session));
                 } else {
                     // Create a lazy wrapper since a session is not yet active
-                    moduleComponentContext.publish(new 
HttpSessionBoundEvent(this, new LazyHTTPSessionId(request)));
+                    moduleComponentContext.publish(new HttpSessionBound(this, 
new LazyHTTPSessionId(request)));
                 }
 
                 try {
-                    moduleComponentContext.publish(new RequestStartEvent(this, 
requestId));
+                    moduleComponentContext.publish(new RequestStart(this, 
requestId));
                 } catch (Exception e) {
                     throw new ServletException(e.getMessage(), e);
                 }
@@ -89,7 +89,7 @@
                     // notify the runtime the request is ending
                     request.removeNote(REQUEST_ID);
                     try {
-                        moduleComponentContext.publish(new 
RequestEndEvent(this, requestId));
+                        moduleComponentContext.publish(new RequestEnd(this, 
requestId));
                     } catch (Exception e) {
                         // the application already did its work, log and ignore
                         // todo log this exception


Reply via email to