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=392199&r1=392198&r2=392199&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 6 23:32:29 2006 @@ -15,9 +15,9 @@ package org.apache.tuscany.core.system.context; import junit.framework.TestCase; -import org.apache.tuscany.core.context.AggregateContext; +import org.apache.tuscany.core.context.CompositeContext; import org.apache.tuscany.core.context.EventContext; -import org.apache.tuscany.core.context.SystemAggregateContext; +import org.apache.tuscany.core.context.SystemCompositeContext; import org.apache.tuscany.core.mock.MockFactory; import org.apache.tuscany.core.mock.component.AutowireSourceImpl; import org.apache.tuscany.core.mock.component.Source; @@ -65,15 +65,15 @@ */ public void testScenario1() throws Exception { RuntimeContext runtime = createScenario1Runtime(); - AggregateContext root = runtime.getRootContext(); - SystemAggregateContext system = runtime.getSystemContext(); - AggregateContext system1 = (AggregateContext) system.getContext("system1"); + CompositeContext root = runtime.getRootContext(); + SystemCompositeContext system = runtime.getSystemContext(); + CompositeContext system1 = (CompositeContext) system.getContext("system1"); system1.fireEvent(EventContext.MODULE_START, null); Target target = (Target) system.getContext("target.system.ep").getInstance(null); assertNotNull(target); - AggregateContext app1 = (AggregateContext) root.getContext("app1"); + CompositeContext app1 = (CompositeContext) root.getContext("app1"); app1.fireEvent(EventContext.MODULE_START, null); - AggregateContext app1a = (AggregateContext) app1.getContext("app1a"); + CompositeContext app1a = (CompositeContext) app1.getContext("app1a"); app1a.fireEvent(EventContext.MODULE_START, null); app1a.fireEvent(EventContext.MODULE_STOP, null); app1.fireEvent(EventContext.MODULE_STOP, null); @@ -89,12 +89,12 @@ */ public void testScenario2() throws Exception { RuntimeContext runtime = createScenario2Runtime(); - AggregateContext root = runtime.getRootContext(); - AggregateContext app1 = (AggregateContext) root.getContext("app1"); + CompositeContext root = runtime.getRootContext(); + CompositeContext app1 = (CompositeContext) root.getContext("app1"); app1.fireEvent(EventContext.MODULE_START, null); - AggregateContext app1b = (AggregateContext) app1.getContext("app1b"); + CompositeContext app1b = (CompositeContext) app1.getContext("app1b"); app1b.fireEvent(EventContext.MODULE_START, null); - AggregateContext app1a = (AggregateContext) app1.getContext("app1a"); + CompositeContext app1a = (CompositeContext) app1.getContext("app1a"); app1a.fireEvent(EventContext.MODULE_START, null); Target target = (Target) app1b.getContext("target.ep").getInstance(null); assertNotNull(target); @@ -110,16 +110,16 @@ */ public void testScenario3() throws Exception { RuntimeContext runtime = createScenario3Runtime(); - SystemAggregateContext system = runtime.getSystemContext(); + SystemCompositeContext system = runtime.getSystemContext(); - AggregateContext system2 = (AggregateContext) system.getContext("system2"); + CompositeContext system2 = (CompositeContext) system.getContext("system2"); system2.fireEvent(EventContext.MODULE_START, null); Target target = (Target) system2.getContext("target.ep").getInstance(null); assertNotNull(target); - AggregateContext system1 = (AggregateContext) system.getContext("system1"); + CompositeContext system1 = (CompositeContext) system.getContext("system1"); system1.fireEvent(EventContext.MODULE_START, null); - AggregateContext system1a = (AggregateContext) system1.getContext("system1a"); + CompositeContext system1a = (CompositeContext) system1.getContext("system1a"); system1a.fireEvent(EventContext.MODULE_START, null); Source source = (Source) system1a.getContext("source").getInstance(null); @@ -134,12 +134,12 @@ */ public void testScenario4() throws Exception { RuntimeContext runtime = createScenario4Runtime(); - SystemAggregateContext system = runtime.getSystemContext(); - AggregateContext system1 = (AggregateContext) system.getContext("system1"); + SystemCompositeContext system = runtime.getSystemContext(); + CompositeContext system1 = (CompositeContext) system.getContext("system1"); system1.fireEvent(EventContext.MODULE_START, null); Target target = (Target) system1.getContext("target").getInstance(null); assertNotNull(target); - AggregateContext system1a = (AggregateContext) system1.getContext("system1a"); + CompositeContext system1a = (CompositeContext) system1.getContext("system1a"); system1a.fireEvent(EventContext.MODULE_START, null); Source source = (Source) system1a.getContext("source").getInstance(null); @@ -154,12 +154,12 @@ */ public void testScenario5() throws Exception { RuntimeContext runtime = createScenario5Runtime(); - SystemAggregateContext system = runtime.getSystemContext(); - AggregateContext system1 = (AggregateContext) system.getContext("system1"); + SystemCompositeContext system = runtime.getSystemContext(); + CompositeContext system1 = (CompositeContext) system.getContext("system1"); system1.fireEvent(EventContext.MODULE_START, null); Target target = (Target) system.getContext("target").getInstance(null); assertNotNull(target); - AggregateContext system1a = (AggregateContext) system1.getContext("system1a"); + CompositeContext system1a = (CompositeContext) system1.getContext("system1a"); system1a.fireEvent(EventContext.MODULE_START, null); Source source = (Source) system1a.getContext("source").getInstance(null); @@ -171,9 +171,9 @@ private RuntimeContext createScenario1Runtime() throws Exception { RuntimeContext runtime = MockFactory.createCoreRuntime(); runtime.start(); - SystemAggregateContext system = runtime.getSystemContext(); - ModuleComponent system1Component = MockFactory.createSystemAggregateComponent("system1"); - ModuleComponent system1aComponent = MockFactory.createSystemAggregateComponent("system1a"); + SystemCompositeContext system = runtime.getSystemContext(); + ModuleComponent system1Component = MockFactory.createSystemCompositeComponent("system1"); + ModuleComponent system1aComponent = MockFactory.createSystemCompositeComponent("system1a"); system1Component.getModuleImplementation().getComponents().add(system1aComponent); Component target = MockFactory.createSystemComponent("target", Target.class, TargetImpl.class, Scope.MODULE); system1Component.getModuleImplementation().getComponents().add(target); @@ -194,7 +194,7 @@ Component source = MockFactory.createSystemComponent("source", Source.class, AutowireSourceImpl.class, Scope.MODULE); app1aComponent.getModuleImplementation().getComponents().add(source); app1Component.getModuleImplementation().getComponents().add(app1aComponent); - AggregateContext root = runtime.getRootContext(); + CompositeContext root = runtime.getRootContext(); root.registerModelObject(app1Component); system.fireEvent(EventContext.MODULE_START, null); return runtime; @@ -222,7 +222,7 @@ ep.getConfiguredReference().getTargetConfiguredServices().get(0).setService(service); app1bComponent.getModuleImplementation().getEntryPoints().add(ep); - AggregateContext root = runtime.getRootContext(); + CompositeContext root = runtime.getRootContext(); root.registerModelObject(app1Component); return runtime; } @@ -230,10 +230,10 @@ private RuntimeContext createScenario3Runtime() throws Exception { RuntimeContext runtime = MockFactory.createCoreRuntime(); runtime.start(); - SystemAggregateContext system = runtime.getSystemContext(); - ModuleComponent system1Component = MockFactory.createSystemAggregateComponent("system1"); - ModuleComponent system2Component = MockFactory.createSystemAggregateComponent("system2"); - ModuleComponent system1aComponent = MockFactory.createSystemAggregateComponent("system1a"); + SystemCompositeContext system = runtime.getSystemContext(); + ModuleComponent system1Component = MockFactory.createSystemCompositeComponent("system1"); + ModuleComponent system2Component = MockFactory.createSystemCompositeComponent("system2"); + ModuleComponent system1aComponent = MockFactory.createSystemCompositeComponent("system1a"); system1Component.getModuleImplementation().getComponents().add(system1aComponent); Component target = MockFactory.createSystemComponent("target", Target.class, TargetImpl.class, Scope.MODULE); @@ -252,9 +252,9 @@ private RuntimeContext createScenario4Runtime() throws Exception { RuntimeContext runtime = MockFactory.createCoreRuntime(); runtime.start(); - SystemAggregateContext system = runtime.getSystemContext(); - ModuleComponent system1Component = MockFactory.createSystemAggregateComponent("system1"); - ModuleComponent system1aComponent = MockFactory.createSystemAggregateComponent("system1a"); + SystemCompositeContext system = runtime.getSystemContext(); + ModuleComponent system1Component = MockFactory.createSystemCompositeComponent("system1"); + ModuleComponent system1aComponent = MockFactory.createSystemCompositeComponent("system1a"); system1Component.getModuleImplementation().getComponents().add(system1aComponent); Component target = MockFactory.createSystemComponent("target", Target.class, TargetImpl.class, Scope.MODULE); @@ -270,9 +270,9 @@ private RuntimeContext createScenario5Runtime() throws Exception { RuntimeContext runtime = MockFactory.createCoreRuntime(); runtime.start(); - SystemAggregateContext system = runtime.getSystemContext(); - ModuleComponent system1Component = MockFactory.createSystemAggregateComponent("system1"); - ModuleComponent system1aComponent = MockFactory.createSystemAggregateComponent("system1a"); + SystemCompositeContext system = runtime.getSystemContext(); + ModuleComponent system1Component = MockFactory.createSystemCompositeComponent("system1"); + ModuleComponent system1aComponent = MockFactory.createSystemCompositeComponent("system1a"); system1Component.getModuleImplementation().getComponents().add(system1aComponent); Component target = MockFactory.createSystemComponent("target", Target.class, TargetImpl.class, Scope.MODULE);
Copied: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/CompositeNestingTestCase.java (from r392189, incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/AggregateNestingTestCase.java) URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/CompositeNestingTestCase.java?p2=incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/CompositeNestingTestCase.java&p1=incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/AggregateNestingTestCase.java&r1=392189&r2=392199&rev=392199&view=diff ============================================================================== --- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/AggregateNestingTestCase.java (original) +++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/CompositeNestingTestCase.java Thu Apr 6 23:32:29 2006 @@ -15,7 +15,7 @@ import junit.framework.Assert; import junit.framework.TestCase; -import org.apache.tuscany.core.context.AggregateContext; +import org.apache.tuscany.core.context.CompositeContext; import org.apache.tuscany.core.context.EventContext; import org.apache.tuscany.core.mock.MockFactory; import org.apache.tuscany.core.mock.component.Source; @@ -25,28 +25,28 @@ import org.apache.tuscany.model.assembly.Scope; /** - * Tests registering arbirarily deep child aggregate contexts + * Tests registering arbirarily deep child composite contexts * * @version $Rev$ $Date$ */ -public class AggregateNestingTestCase extends TestCase { +public class CompositeNestingTestCase extends TestCase { /** - * Tests registration of a 3-level deep hierarchy under the top-level system aggregate context + * Tests registration of a 3-level deep hierarchy under the top-level system composite context */ public void testSystemContext() throws Exception { RuntimeContext runtime = MockFactory.createCoreRuntime(); ModuleComponent child1 = createHierarchy(); runtime.getSystemContext().registerModelObject(child1); - AggregateContext child1Ctx = (AggregateContext) runtime.getSystemContext().getContext("child1"); + CompositeContext child1Ctx = (CompositeContext) runtime.getSystemContext().getContext("child1"); Assert.assertNotNull(child1Ctx); child1Ctx.fireEvent(EventContext.MODULE_START, null); analyzeLeafComponents(child1Ctx); - AggregateContext child2Ctx = (AggregateContext) child1Ctx.getContext("child2"); + CompositeContext child2Ctx = (CompositeContext) child1Ctx.getContext("child2"); Assert.assertNotNull(child2Ctx); child2Ctx.fireEvent(EventContext.MODULE_START, null); analyzeLeafComponents(child2Ctx); - AggregateContext child3Ctx = (AggregateContext) child2Ctx.getContext("child3"); + CompositeContext child3Ctx = (CompositeContext) child2Ctx.getContext("child3"); Assert.assertNotNull(child3Ctx); child3Ctx.fireEvent(EventContext.MODULE_START, null); analyzeLeafComponents(child3Ctx); @@ -55,21 +55,21 @@ } /** - * Tests registration of a 3-level deep hierarchy under the root application aggregate context + * Tests registration of a 3-level deep hierarchy under the root application composite context */ public void testRootContext() throws Exception { RuntimeContext runtime = MockFactory.createCoreRuntime(); ModuleComponent child1 = createHierarchy(); runtime.getRootContext().registerModelObject(child1); - AggregateContext child1Ctx = (AggregateContext) runtime.getRootContext().getContext("child1"); + CompositeContext child1Ctx = (CompositeContext) runtime.getRootContext().getContext("child1"); Assert.assertNotNull(child1Ctx); child1Ctx.fireEvent(EventContext.MODULE_START, null); analyzeLeafComponents(child1Ctx); - AggregateContext child2Ctx = (AggregateContext) child1Ctx.getContext("child2"); + CompositeContext child2Ctx = (CompositeContext) child1Ctx.getContext("child2"); Assert.assertNotNull(child2Ctx); child2Ctx.fireEvent(EventContext.MODULE_START, null); analyzeLeafComponents(child2Ctx); - AggregateContext child3Ctx = (AggregateContext) child2Ctx.getContext("child3"); + CompositeContext child3Ctx = (CompositeContext) child2Ctx.getContext("child3"); Assert.assertNotNull(child3Ctx); child3Ctx.fireEvent(EventContext.MODULE_START, null); analyzeLeafComponents(child3Ctx); @@ -86,7 +86,7 @@ return child1; } - private void analyzeLeafComponents(AggregateContext ctx) throws Exception { + private void analyzeLeafComponents(CompositeContext ctx) throws Exception { Source source = (Source) ctx.getContext("source").getInstance(null); Assert.assertNotNull(source); Target target = source.getTarget(); Copied: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/IntraCompositeWireTestCase.java (from r392189, incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/IntraAggregateWireTestCase.java) URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/IntraCompositeWireTestCase.java?p2=incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/IntraCompositeWireTestCase.java&p1=incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/IntraAggregateWireTestCase.java&r1=392189&r2=392199&rev=392199&view=diff ============================================================================== --- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/IntraAggregateWireTestCase.java (original) +++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/IntraCompositeWireTestCase.java Thu Apr 6 23:32:29 2006 @@ -16,8 +16,8 @@ import junit.framework.Assert; import junit.framework.TestCase; import org.apache.tuscany.core.context.EventContext; -import org.apache.tuscany.core.context.SimpleComponentContext; -import org.apache.tuscany.core.context.SystemAggregateContext; +import org.apache.tuscany.core.context.AtomicContext; +import org.apache.tuscany.core.context.SystemCompositeContext; import org.apache.tuscany.core.mock.MockConfigContext; import org.apache.tuscany.core.mock.MockFactory; import org.apache.tuscany.core.mock.component.Source; @@ -27,22 +27,22 @@ import java.util.List; /** - * Tests intra-aggregate system component wiring scenarios + * Tests intra-composite system component wiring scenarios * * @version $Rev$ $Date$ */ -public class IntraAggregateWireTestCase extends TestCase { +public class IntraCompositeWireTestCase extends TestCase { public void testModuleToModuleScope() throws Exception { - SystemAggregateContext context = createContext(); + SystemCompositeContext context = createContext(); context.start(); context.registerModelObject(MockFactory.createSystemModuleWithWiredComponents("system.module",Scope.MODULE, Scope.MODULE)); context.fireEvent(EventContext.MODULE_START, null); - Source source = (Source) ((SimpleComponentContext) context.getContext("source")).getImplementationInstance(); + Source source = (Source) ((AtomicContext) context.getContext("source")).getImplementationInstance(); Assert.assertNotNull(source); Target targetRef = source.getTarget(); Assert.assertNotNull(targetRef); - Target target = (Target) ((SimpleComponentContext) context.getContext("target")).getImplementationInstance(); + Target target = (Target) ((AtomicContext) context.getContext("target")).getImplementationInstance(); Assert.assertSame(target, targetRef); Assert.assertSame(target, source.getTarget()); context.fireEvent(EventContext.MODULE_STOP, null); @@ -50,16 +50,16 @@ } public void testStatelessToModuleScope() throws Exception { - SystemAggregateContext context = createContext(); + SystemCompositeContext context = createContext(); context.start(); context.registerModelObject(MockFactory.createSystemModuleWithWiredComponents("system.module",Scope.INSTANCE, Scope.MODULE)); context.fireEvent(EventContext.MODULE_START, null); - Source source = (Source) ((SimpleComponentContext) context.getContext("source")).getImplementationInstance(); + Source source = (Source) ((AtomicContext) context.getContext("source")).getImplementationInstance(); Assert.assertNotNull(source); Target targetRef = source.getTarget(); Assert.assertNotNull(targetRef); - source = (Source) ((SimpleComponentContext) context.getContext("source")).getImplementationInstance(); - Target target = (Target) ((SimpleComponentContext) context.getContext("target")).getImplementationInstance(); + source = (Source) ((AtomicContext) context.getContext("source")).getImplementationInstance(); + Target target = (Target) ((AtomicContext) context.getContext("target")).getImplementationInstance(); Assert.assertSame(target, targetRef); Assert.assertSame(target, source.getTarget()); context.fireEvent(EventContext.MODULE_STOP, null); @@ -67,17 +67,17 @@ } public void testModuleToStatelessScope() throws Exception { - SystemAggregateContext context = createContext(); + SystemCompositeContext context = createContext(); context.start(); context.registerModelObject(MockFactory.createSystemModuleWithWiredComponents("system.module",Scope.MODULE, Scope.INSTANCE)); context.fireEvent(EventContext.MODULE_START, null); - Source source = (Source) ((SimpleComponentContext) context.getContext("source")).getImplementationInstance(); + Source source = (Source) ((AtomicContext) context.getContext("source")).getImplementationInstance(); Assert.assertNotNull(source); Target targetRef = source.getTarget(); Assert.assertNotNull(targetRef); - Target target = (Target) ((SimpleComponentContext) context.getContext("target")).getImplementationInstance(); + Target target = (Target) ((AtomicContext) context.getContext("target")).getImplementationInstance(); Assert.assertNotSame(target, targetRef); - Source source2 = (Source) ((SimpleComponentContext) context.getContext("source")).getImplementationInstance(); + Source source2 = (Source) ((AtomicContext) context.getContext("source")).getImplementationInstance(); // 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()); @@ -86,13 +86,13 @@ } public void testMultiplicity() throws Exception { - SystemAggregateContext context = createContext(); + SystemCompositeContext context = createContext(); context.start(); context.registerModelObject(MockFactory.createSystemModuleWithWiredComponents("system.module",Scope.MODULE, Scope.MODULE)); context.fireEvent(EventContext.MODULE_START, null); - Source source = (Source) ((SimpleComponentContext) context.getContext("source")).getImplementationInstance(); + Source source = (Source) ((AtomicContext) context.getContext("source")).getImplementationInstance(); Assert.assertNotNull(source); - Target target = (Target) ((SimpleComponentContext) context.getContext("target")).getImplementationInstance(); + Target target = (Target) ((AtomicContext) context.getContext("target")).getImplementationInstance(); Assert.assertNotNull(target); // test setter injection List<Target> targets = source.getTargets(); @@ -112,8 +112,8 @@ } - private SystemAggregateContext createContext() { - SystemAggregateContextImpl context = new SystemAggregateContextImpl(); + private SystemCompositeContext createContext() { + SystemCompositeContextImpl context = new SystemCompositeContextImpl(); context.setName("system.context"); context.setConfigurationContext(new MockConfigContext(MockFactory.createSystemBuilders())); return context; Copied: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeComponentContextTestCase.java (from r392189, incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemAggregateComponentContextTestCase.java) URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeComponentContextTestCase.java?p2=incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeComponentContextTestCase.java&p1=incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemAggregateComponentContextTestCase.java&r1=392189&r2=392199&rev=392199&view=diff ============================================================================== --- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemAggregateComponentContextTestCase.java (original) +++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeComponentContextTestCase.java Thu Apr 6 23:32:29 2006 @@ -17,7 +17,7 @@ import junit.framework.TestCase; import org.apache.tuscany.common.monitor.impl.NullMonitorFactory; import org.apache.tuscany.core.builder.ContextFactoryBuilder; -import org.apache.tuscany.core.context.AggregateContext; +import org.apache.tuscany.core.context.CompositeContext; import org.apache.tuscany.core.context.EventContext; import org.apache.tuscany.core.context.QualifiedName; import org.apache.tuscany.core.context.impl.EventContextImpl; @@ -34,19 +34,19 @@ import java.util.List; /** - * Tests the system aggregate context + * Tests the system composite context * * @version $Rev$ $Date$ */ -public class SystemAggregateComponentContextTestCase extends TestCase { +public class SystemCompositeComponentContextTestCase extends TestCase { private SystemAssemblyFactory factory; - private SystemAggregateContextImpl system; + private SystemCompositeContextImpl system; public void testChildLocate() throws Exception { system.start(); - Component aggregateComponent = MockFactory.createAggregateComponent("system.child"); - system.registerModelObject(aggregateComponent); - AggregateContext childContext = (AggregateContext) system.getContext("system.child"); + Component compositeComponent = MockFactory.createCompositeComponent("system.child"); + system.registerModelObject(compositeComponent); + CompositeContext childContext = (CompositeContext) system.getContext("system.child"); Assert.assertNotNull(childContext); Component component = factory.createSystemComponent("TestService1", ModuleScopeSystemComponent.class, ModuleScopeSystemComponentImpl.class, Scope.MODULE); @@ -97,7 +97,7 @@ factory = new SystemAssemblyFactoryImpl(); List<ContextFactoryBuilder> builders = MockFactory.createSystemBuilders(); - system = new SystemAggregateContextImpl("system", null, null, new SystemScopeStrategy(), + system = new SystemCompositeContextImpl("system", null, null, new SystemScopeStrategy(), new EventContextImpl(), new MockConfigContext(builders), new NullMonitorFactory(), null, null); } Propchange: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeComponentContextTestCase.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Copied: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeContextRegisterTestCase.java (from r392189, incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemAggregateComponentContextRegisterTestCase.java) URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeContextRegisterTestCase.java?p2=incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeContextRegisterTestCase.java&p1=incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemAggregateComponentContextRegisterTestCase.java&r1=392189&r2=392199&rev=392199&view=diff ============================================================================== --- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemAggregateComponentContextRegisterTestCase.java (original) +++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeContextRegisterTestCase.java Thu Apr 6 23:32:29 2006 @@ -15,8 +15,8 @@ import org.apache.tuscany.common.monitor.impl.NullMonitorFactory; import org.apache.tuscany.core.builder.ContextFactoryBuilder; -import org.apache.tuscany.core.context.AggregateComponentContextRegisterTestCase; -import org.apache.tuscany.core.context.AggregateContext; +import org.apache.tuscany.core.context.CompositeContextRegisterTestCase; +import org.apache.tuscany.core.context.CompositeContext; import org.apache.tuscany.core.context.impl.EventContextImpl; import org.apache.tuscany.core.context.scope.DefaultScopeStrategy; import org.apache.tuscany.core.mock.MockConfigContext; @@ -25,15 +25,15 @@ import java.util.List; /** - * Tests registration of model objects for an system aggregate context + * Tests registration of model objects for an system composite context * * @version $Rev$ $Date$ */ -public class SystemAggregateComponentContextRegisterTestCase extends AggregateComponentContextRegisterTestCase { +public class SystemCompositeContextRegisterTestCase extends CompositeContextRegisterTestCase { - protected AggregateContext createContext() { + protected CompositeContext createContext() { List<ContextFactoryBuilder> builders = MockFactory.createSystemBuilders(); - return new SystemAggregateContextImpl("test.context", null, + return new SystemCompositeContextImpl("test.context", null, null, new DefaultScopeStrategy(), new EventContextImpl(), new MockConfigContext(builders), new NullMonitorFactory(), null, null); } } Propchange: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeContextRegisterTestCase.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Copied: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeHierarchyTestCase.java (from r392189, incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemAggregateHierarchyTestCase.java) URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeHierarchyTestCase.java?p2=incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeHierarchyTestCase.java&p1=incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemAggregateHierarchyTestCase.java&r1=392189&r2=392199&rev=392199&view=diff ============================================================================== --- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemAggregateHierarchyTestCase.java (original) +++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeHierarchyTestCase.java Thu Apr 6 23:32:29 2006 @@ -16,8 +16,8 @@ import junit.framework.Assert; import org.apache.tuscany.common.monitor.impl.NullMonitorFactory; import org.apache.tuscany.core.builder.ContextFactoryBuilder; -import org.apache.tuscany.core.context.AbstractAggregateHierarchyTests; -import org.apache.tuscany.core.context.AggregateContext; +import org.apache.tuscany.core.context.AbstractCompositeHierarchyTests; +import org.apache.tuscany.core.context.CompositeContext; import org.apache.tuscany.core.context.impl.EventContextImpl; import org.apache.tuscany.core.context.scope.DefaultScopeStrategy; import org.apache.tuscany.core.mock.MockConfigContext; @@ -30,17 +30,17 @@ * * @version $Rev$ $Date$ */ -public class SystemAggregateHierarchyTestCase extends AbstractAggregateHierarchyTests { +public class SystemCompositeHierarchyTestCase extends AbstractCompositeHierarchyTests { - protected AggregateContext createContextHierachy() throws Exception { + protected CompositeContext createContextHierachy() throws Exception { List<ContextFactoryBuilder> mockBuilders = MockFactory.createSystemBuilders(); - AggregateContext parent = new SystemAggregateContextImpl("test.parent", null, null, new DefaultScopeStrategy(), + CompositeContext parent = new SystemCompositeContextImpl("test.parent", null, null, new DefaultScopeStrategy(), new EventContextImpl(), new MockConfigContext(mockBuilders), new NullMonitorFactory(), null, null); - parent.registerModelObject(MockFactory.createAggregateComponent("test.child")); + parent.registerModelObject(MockFactory.createCompositeComponent("test.child")); parent.start(); - AggregateContext child = (AggregateContext) parent.getContext("test.child"); + CompositeContext child = (CompositeContext) parent.getContext("test.child"); Assert.assertNotNull(child); return parent; } Propchange: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeHierarchyTestCase.java ------------------------------------------------------------------------------ svn:keywords = Rev Date 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=392199&r1=392198&r2=392199&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 6 23:32:29 2006 @@ -20,7 +20,7 @@ import junit.framework.TestCase; import org.apache.tuscany.core.config.ConfigurationException; import org.apache.tuscany.core.context.EventContext; -import org.apache.tuscany.core.context.SystemAggregateContext; +import org.apache.tuscany.core.context.SystemCompositeContext; import org.apache.tuscany.core.runtime.RuntimeContext; import org.apache.tuscany.core.runtime.RuntimeContextImpl; @@ -29,7 +29,7 @@ */ public class SystemObjectRegistrationTestCase extends TestCase { private RuntimeContext runtime; - private SystemAggregateContext systemContext; + private SystemCompositeContext systemContext; public void testRegistration() throws ConfigurationException { MockComponent instance = new MockComponent(); 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=392199&r1=392198&r2=392199&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 6 23:32:29 2006 @@ -35,7 +35,7 @@ import org.apache.tuscany.core.client.BootstrapHelper; import org.apache.tuscany.core.config.ConfigurationException; import org.apache.tuscany.core.config.ModuleComponentConfigurationLoader; -import org.apache.tuscany.core.context.AggregateContext; +import org.apache.tuscany.core.context.CompositeContext; import org.apache.tuscany.core.context.EventContext; import org.apache.tuscany.core.context.EventException; import org.apache.tuscany.core.runtime.RuntimeContext; @@ -58,7 +58,7 @@ private final AssemblyModelLoader modelLoader; private final RuntimeContext runtime; private final ResourceLoader systemLoader; - private AggregateContext moduleContext; + private CompositeContext moduleContext; public TuscanyContextListener(RuntimeContext runtimeContext, AssemblyFactory modelFactory, AssemblyModelLoader modelLoader, ResourceLoader systemLoader) { this.runtime = runtimeContext; @@ -131,9 +131,9 @@ ModuleComponent moduleComponent = loader.loadModuleComponent(ctx.getName(), ctx.getPath()); // Register it under the root application context - AggregateContext rootContext = runtime.getRootContext(); + CompositeContext rootContext = runtime.getRootContext(); rootContext.registerModelObject(moduleComponent); - moduleContext = (AggregateContext)rootContext.getContext(moduleComponent.getName()); + moduleContext = (CompositeContext)rootContext.getContext(moduleComponent.getName()); } finally { Thread.currentThread().setContextClassLoader(oldCl); } 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=392199&r1=392198&r2=392199&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 6 23:32:29 2006 @@ -31,9 +31,9 @@ import org.apache.tuscany.core.client.BootstrapHelper; import org.apache.tuscany.core.config.ConfigurationLoadException; import org.apache.tuscany.core.config.ModuleComponentConfigurationLoader; -import org.apache.tuscany.core.context.AggregateContext; +import org.apache.tuscany.core.context.CompositeContext; import org.apache.tuscany.core.context.EventContext; -import org.apache.tuscany.core.context.SystemAggregateContext; +import org.apache.tuscany.core.context.SystemCompositeContext; import org.apache.tuscany.core.runtime.RuntimeContext; import org.apache.tuscany.core.runtime.RuntimeContextImpl; import org.apache.tuscany.model.assembly.AssemblyFactory; @@ -83,10 +83,10 @@ // Load and start the system configuration try { - SystemAggregateContext systemContext = runtime.getSystemContext(); + SystemCompositeContext systemContext = runtime.getSystemContext(); ModuleComponentConfigurationLoader loader = BootstrapHelper.getConfigurationLoader(systemContext, modelContext); ModuleComponent systemModuleComponent = loader.loadSystemModuleComponent(SYSTEM_MODULE_COMPONENT, SYSTEM_MODULE_COMPONENT); - AggregateContext context = BootstrapHelper.registerModule(systemContext, systemModuleComponent); + CompositeContext context = BootstrapHelper.registerModule(systemContext, systemModuleComponent); context.fireEvent(EventContext.MODULE_START, null); } catch (ConfigurationLoadException e) { getLogger().warn(sm.getString("runtime.loadSystemFailed"), e); 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=392199&r1=392198&r2=392199&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 6 23:32:29 2006 @@ -27,7 +27,7 @@ import org.osoa.sca.ModuleContext; import org.osoa.sca.SCA; -import org.apache.tuscany.core.context.AggregateContext; +import org.apache.tuscany.core.context.CompositeContext; import org.apache.tuscany.core.context.EventContext; import org.apache.tuscany.core.webapp.LazyHTTPSessionId; @@ -44,9 +44,9 @@ private static final ContextBinder BINDER = new ContextBinder(); - private final AggregateContext moduleComponentContext; + private final CompositeContext moduleComponentContext; - public TuscanyValve(AggregateContext moduleComponentContext) { + public TuscanyValve(CompositeContext moduleComponentContext) { this.moduleComponentContext = moduleComponentContext; } Modified: incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/lifecycle/listener/WebAppLifecycleListener.java URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/lifecycle/listener/WebAppLifecycleListener.java?rev=392199&r1=392198&r2=392199&view=diff ============================================================================== --- incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/lifecycle/listener/WebAppLifecycleListener.java (original) +++ incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/lifecycle/listener/WebAppLifecycleListener.java Thu Apr 6 23:32:29 2006 @@ -27,7 +27,7 @@ import org.apache.catalina.deploy.FilterMap; import org.apache.tuscany.common.TuscanyRuntimeException; import org.apache.tuscany.core.config.ConfigurationException; -import org.apache.tuscany.core.context.AggregateContext; +import org.apache.tuscany.core.context.CompositeContext; import org.apache.tuscany.core.context.EventContext; import org.apache.tuscany.core.context.webapp.HTTPSessionExpirationListener; import org.apache.tuscany.core.context.webapp.TuscanyRequestFilter; @@ -87,14 +87,14 @@ } // create the module component runtime.registerModelObject(moduleComponent); - AggregateContext aggregateContext = (AggregateContext) runtime.getContext(moduleComponent.getName()); - TuscanyWebAppRuntime tuscanyRuntime = new TuscanyWebAppRuntime(aggregateContext); + CompositeContext compositeContext = (CompositeContext) runtime.getContext(moduleComponent.getName()); + TuscanyWebAppRuntime tuscanyRuntime = new TuscanyWebAppRuntime(compositeContext); context.getServletContext().setAttribute(TuscanyWebAppRuntime.class.getName(), tuscanyRuntime); // Start the runtime and the module component context tuscanyRuntime.start(); try { - aggregateContext.start(); - aggregateContext.fireEvent(EventContext.MODULE_START, null); + compositeContext.start(); + compositeContext.fireEvent(EventContext.MODULE_START, null); } finally { tuscanyRuntime.stop(); } @@ -131,9 +131,9 @@ try { // Stop the module context tuscanyRuntime.start(); - AggregateContext aggregateContext = tuscanyRuntime.getModuleComponentContext(); - aggregateContext.fireEvent(EventContext.MODULE_STOP, null); - aggregateContext.stop(); + CompositeContext compositeContext = tuscanyRuntime.getModuleComponentContext(); + compositeContext.fireEvent(EventContext.MODULE_STOP, null); + compositeContext.stop(); } catch (TuscanyRuntimeException e) { monitor.log(e); } finally { Modified: incubator/tuscany/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TestServlet.java URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TestServlet.java?rev=392199&r1=392198&r2=392199&view=diff ============================================================================== --- incubator/tuscany/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TestServlet.java (original) +++ incubator/tuscany/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TestServlet.java Thu Apr 6 23:32:29 2006 @@ -38,7 +38,7 @@ } Object module = getServletContext().getAttribute("org.apache.tuscany.core.webapp.ModuleComponentContext"); - if (module == null || "org.apache.tuscany.core.context.AggregateContext".equals(module.getClass().getName())) { + if (module == null || "org.apache.tuscany.core.context.CompositeContext".equals(module.getClass().getName())) { throw new ServletException("Module aggregate not bound to org.apache.tuscany.core.webapp.ModuleComponentContext"); }
