tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmar...@apache.org
Subject svn commit: r412208 [1/2] - in /incubator/tuscany/sandbox/jboynes/sca: containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/ containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/ containers/container.ja...
Date Tue, 06 Jun 2006 20:47:22 GMT
Author: jmarino
Date: Tue Jun  6 13:47:19 2006
New Revision: 412208

URL: http://svn.apache.org/viewvc?rev=412208&view=rev
Log:
rename ScopeContext ScopeContainer

Added:
    incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContainer.java   (contents, props changed)
      - copied, changed from r412206, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContext.java
    incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeContainer.java   (contents, props changed)
      - copied, changed from r412206, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeContext.java
    incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeContainer.java   (contents, props changed)
      - copied, changed from r412206, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeContext.java
    incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeContainer.java   (contents, props changed)
      - copied, changed from r412206, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeContext.java
    incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeContainer.java   (contents, props changed)
      - copied, changed from r412206, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeContext.java
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/ScopeContainer.java   (contents, props changed)
      - copied, changed from r412206, incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/ScopeContext.java
Removed:
    incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContext.java
    incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeContext.java
    incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeContext.java
    incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeContext.java
    incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeContext.java
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/ScopeContext.java
Modified:
    incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicComponent.java
    incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyInstanceWrapper.java
    incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/PropertyTestCase.java
    incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/ScriptInvokeTestCase.java
    incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/WireTestCase.java
    incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/JavaAtomicComponent.java
    incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/JavaComponentBuilder.java
    incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/DifferentInterfaceWireTestCase.java
    incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/GetServiceByNameTestCase.java
    incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/JavaComponentBuilderTestCase.java
    incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/JavaReferenceWireTestCase.java
    incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/JavaTargetInvokerTestCase.java
    incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/ReferenceInjectionTestCase.java
    incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/context/OutboundWireToJavaTestCase.java
    incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/context/ScopeReferenceTestCase.java
    incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockContextFactory.java
    incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/SpringCompositeComponent.java
    incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/AbstractCompositeComponent.java
    incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/PojoAtomicComponent.java
    incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeObjectFactory.java
    incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactory.java
    incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeObjectFactory.java
    incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ScopeRegistryImpl.java
    incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeObjectFactory.java
    incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java
    incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemComponentBuilder.java
    incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemAtomicComponentImpl.java
    incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/BasicHttpSessionScopeTestCase.java
    incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/BasicModuleScopeTestCase.java
    incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/BasicRequestScopeTestCase.java
    incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/BasicStatelessScopeTestCase.java
    incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/DependencyLifecycleTestCase.java
    incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeInstanceLifecycleTestCase.java
    incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeRestartTestCase.java
    incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeInstanceLifecycleTestCase.java
    incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeRestartTestCase.java
    incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeInstanceLifecycleTestCase.java
    incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeRestartTestCase.java
    incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/ScopeRegistryTestCase.java
    incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/builder/AutowireBuilderTestcase.java
    incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/builder/SystemBuildersTestCase.java
    incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockContextFactory.java
    incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/ChildLocateTestCase.java
    incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/AtomicComponentWireInvocationTestCase.java
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/AtomicComponent.java
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/CompositeComponent.java
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/InstanceWrapper.java
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/ScopeRegistry.java
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/deployer/DeploymentContext.java
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java

Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicComponent.java?rev=412208&r1=412207&r2=412208&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicComponent.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicComponent.java Tue Jun  6 13:47:19 2006
@@ -27,7 +27,7 @@
 import org.apache.tuscany.spi.component.CompositeComponent;
 import org.apache.tuscany.spi.component.InstanceWrapper;
 import org.apache.tuscany.spi.component.TargetException;
-import org.apache.tuscany.spi.component.ScopeContext;
+import org.apache.tuscany.spi.component.ScopeContainer;
 import org.apache.tuscany.spi.extension.AtomicComponentExtension;
 import org.apache.tuscany.spi.model.Scope;
 import org.apache.tuscany.spi.wire.OutboundWire;
@@ -50,9 +50,9 @@
                                  Scope scope,
                                  List<PropertyInjector> injectors,
                                  CompositeComponent parent,
-                                 ScopeContext scopeContext,
+                                 ScopeContainer scopeContainer,
                                  WireService wireService) {
-        super(name, parent, scopeContext,wireService);
+        super(name, parent, scopeContainer,wireService);
         this.script = script;
         this.services = services;
         this.scope = scope;
@@ -99,7 +99,7 @@
 
     @SuppressWarnings("unchecked")
     public GroovyObject getTargetInstance() throws TargetException {
-        return (GroovyObject) scopeContext.getInstance(this);
+        return (GroovyObject) scopeContainer.getInstance(this);
     }
 
     @SuppressWarnings("unchecked")

Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyInstanceWrapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyInstanceWrapper.java?rev=412208&r1=412207&r2=412208&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyInstanceWrapper.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyInstanceWrapper.java Tue Jun  6 13:47:19 2006
@@ -7,7 +7,7 @@
 import org.apache.tuscany.spi.component.InstanceWrapper;
 
 /**
- * Wraps a <code>GroovyObject</code> so it can be managed by a <code>ScopeContext</code>
+ * Wraps a <code>GroovyObject</code> so it can be managed by a <code>ScopeContainer</code>
  * 
  * @version $$Rev$$ $$Date$$
  */

Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/PropertyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/PropertyTestCase.java?rev=412208&r1=412207&r2=412208&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/PropertyTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/PropertyTestCase.java Tue Jun  6 13:47:19 2006
@@ -5,7 +5,7 @@
 
 import org.apache.tuscany.container.groovy.injectors.SingletonInjector;
 import org.apache.tuscany.container.groovy.mock.Greeting;
-import org.apache.tuscany.core.component.scope.ModuleScopeContext;
+import org.apache.tuscany.core.component.scope.ModuleScopeContainer;
 import org.apache.tuscany.spi.model.Scope;
 import org.apache.tuscany.test.ArtifactFactory;
 import org.jmock.MockObjectTestCase;
@@ -27,7 +27,7 @@
      * Tests injecting a simple property type on a Groovy implementation instance
      */
     public void testPropertyInjection() throws Exception {
-        ModuleScopeContext scope = new ModuleScopeContext(null);
+        ModuleScopeContainer scope = new ModuleScopeContainer(null);
         scope.start();
         List<Class<?>> services = new ArrayList<Class<?>>();
         services.add(Greeting.class);

Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/ScriptInvokeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/ScriptInvokeTestCase.java?rev=412208&r1=412207&r2=412208&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/ScriptInvokeTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/ScriptInvokeTestCase.java Tue Jun  6 13:47:19 2006
@@ -5,7 +5,7 @@
 
 import groovy.lang.GroovyObject;
 import org.apache.tuscany.container.groovy.mock.Greeting;
-import org.apache.tuscany.core.component.scope.ModuleScopeContext;
+import org.apache.tuscany.core.component.scope.ModuleScopeContainer;
 import org.apache.tuscany.spi.model.Scope;
 import org.apache.tuscany.test.ArtifactFactory;
 import org.jmock.MockObjectTestCase;
@@ -21,7 +21,7 @@
      * Tests the invocation of a Groovy "script" as opposed to a class
      */
     public void testBasicScriptInvocation() throws Exception {
-        ModuleScopeContext scope = new ModuleScopeContext(null);
+        ModuleScopeContainer scope = new ModuleScopeContainer(null);
         scope.start();
         List<Class<?>> services = new ArrayList<Class<?>>();
         services.add(Greeting.class);

Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/WireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/WireTestCase.java?rev=412208&r1=412207&r2=412208&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/WireTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/WireTestCase.java Tue Jun  6 13:47:19 2006
@@ -4,7 +4,7 @@
 import java.util.List;
 
 import org.apache.tuscany.container.groovy.mock.Greeting;
-import org.apache.tuscany.core.component.scope.ModuleScopeContext;
+import org.apache.tuscany.core.component.scope.ModuleScopeContainer;
 import org.apache.tuscany.spi.model.Scope;
 import org.apache.tuscany.spi.wire.InboundInvocationChain;
 import org.apache.tuscany.spi.wire.InboundWire;
@@ -48,7 +48,7 @@
      * Tests a basic invocation down a source wire
      */
     public void testReferenceWireInvocation() throws Exception {
-        ModuleScopeContext scope = new ModuleScopeContext(null);
+        ModuleScopeContainer scope = new ModuleScopeContainer(null);
         scope.start();
 
         List<Class<?>> services = new ArrayList<Class<?>>();
@@ -86,7 +86,7 @@
      * Tests a basic invocation to a target
      */
     public void testTargetInvocation() throws Exception {
-        ModuleScopeContext scope = new ModuleScopeContext(null);
+        ModuleScopeContainer scope = new ModuleScopeContainer(null);
         scope.start();
         List<Class<?>> services = new ArrayList<Class<?>>();
         services.add(Greeting.class);
@@ -103,7 +103,7 @@
      * Tests a basic invocation down a target wire
      */
     public void testTargetWireInvocation() throws Exception {
-        ModuleScopeContext scope = new ModuleScopeContext(null);
+        ModuleScopeContainer scope = new ModuleScopeContainer(null);
         scope.start();
         List<Class<?>> services = new ArrayList<Class<?>>();
         services.add(Greeting.class);

Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/JavaAtomicComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/JavaAtomicComponent.java?rev=412208&r1=412207&r2=412208&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/JavaAtomicComponent.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/JavaAtomicComponent.java Tue Jun  6 13:47:19 2006
@@ -26,7 +26,7 @@
 import org.apache.tuscany.core.injection.Injector;
 import org.apache.tuscany.spi.ObjectFactory;
 import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.component.ScopeContext;
+import org.apache.tuscany.spi.component.ScopeContainer;
 import org.apache.tuscany.spi.component.TargetException;
 import org.apache.tuscany.spi.component.TargetNotFoundException;
 import org.apache.tuscany.spi.model.Scope;
@@ -43,7 +43,7 @@
 
     public JavaAtomicComponent(String name,
                                CompositeComponent<?> parent,
-                               ScopeContext scopeContext,
+                               ScopeContainer scopeContainer,
                                List<Class<?>> serviceInterfaces,
                                ObjectFactory<?> objectFactory,
                                Scope scope,
@@ -53,7 +53,7 @@
                                List<Injector> injectors,
                                Map<String, Member> members,
                                WireService wireService) {
-        super(name, parent, scopeContext, serviceInterfaces, objectFactory, eagerInit, initInvoker, destroyInvoker, injectors, members, wireService);
+        super(name, parent, scopeContainer, serviceInterfaces, objectFactory, eagerInit, initInvoker, destroyInvoker, injectors, members, wireService);
         this.scope = scope;
     }
 

Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/JavaComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/JavaComponentBuilder.java?rev=412208&r1=412207&r2=412208&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/JavaComponentBuilder.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/JavaComponentBuilder.java Tue Jun  6 13:47:19 2006
@@ -13,7 +13,7 @@
 import org.apache.tuscany.spi.builder.BuilderConfigException;
 import org.apache.tuscany.spi.component.Component;
 import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.component.ScopeContext;
+import org.apache.tuscany.spi.component.ScopeContainer;
 import org.apache.tuscany.spi.deployer.DeploymentContext;
 import org.apache.tuscany.spi.extension.ComponentBuilderExtension;
 import org.apache.tuscany.spi.model.ComponentDefinition;
@@ -59,16 +59,16 @@
             }
         }
 
-        ScopeContext scopeContext;
+        ScopeContainer scopeContainer;
         Scope scope = componentType.getLifecycleScope();
         if (Scope.MODULE == scope) {
-            scopeContext = deploymentContext.getModuleScope();
+            scopeContainer = deploymentContext.getModuleScope();
         } else {
-            scopeContext = scopeRegistry.getScopeContext(scope);
+            scopeContainer = scopeRegistry.getScopeContainer(scope);
         }
         return new JavaAtomicComponent(componentDefinition.getName(),
                 parent,
-                scopeContext,
+                scopeContainer,
                 serviceInterfaces,
                 factory,
                 scope,

Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/DifferentInterfaceWireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/DifferentInterfaceWireTestCase.java?rev=412208&r1=412207&r2=412208&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/DifferentInterfaceWireTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/DifferentInterfaceWireTestCase.java Tue Jun  6 13:47:19 2006
@@ -27,9 +27,9 @@
 import org.apache.tuscany.container.java.mock.components.Source;
 import org.apache.tuscany.container.java.mock.components.SourceImpl;
 import org.apache.tuscany.container.java.mock.components.Target;
-import org.apache.tuscany.core.component.scope.ModuleScopeContext;
+import org.apache.tuscany.core.component.scope.ModuleScopeContainer;
 import org.apache.tuscany.spi.component.AtomicComponent;
-import org.apache.tuscany.spi.component.ScopeContext;
+import org.apache.tuscany.spi.component.ScopeContainer;
 
 
 /**
@@ -43,7 +43,7 @@
         Map<String, Member> members = new HashMap<String, Member>();
         Method m = SourceImpl.class.getMethod("setTarget", Target.class);
         members.put("target", m);
-        ScopeContext scope = new ModuleScopeContext(null);
+        ScopeContainer scope = new ModuleScopeContainer(null);
         scope.start();
         Map<String, AtomicComponent> contexts = MockContextFactory.createWiredContexts("source", SourceImpl.class, Target.class, scope,
                 members, "target", OtherTarget.class, OtherTargetImpl.class, scope);
@@ -59,7 +59,7 @@
         Map<String, Member> members = new HashMap<String, Member>();
         Method m = SourceImpl.class.getMethod("setTargets", List.class);
         members.put("target", m);
-        ScopeContext scope = new ModuleScopeContext(null);
+        ScopeContainer scope = new ModuleScopeContainer(null);
         scope.start();
         Map<String, AtomicComponent> contexts = MockContextFactory.createWiredMultiplicity("source", SourceImpl.class, Target.class, scope,
                 "target", OtherTarget.class, OtherTargetImpl.class, members, scope);

Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/GetServiceByNameTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/GetServiceByNameTestCase.java?rev=412208&r1=412207&r2=412208&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/GetServiceByNameTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/GetServiceByNameTestCase.java Tue Jun  6 13:47:19 2006
@@ -5,7 +5,7 @@
 import org.apache.tuscany.container.java.mock.MockContextFactory;
 import org.apache.tuscany.container.java.mock.components.Target;
 import org.apache.tuscany.container.java.mock.components.TargetImpl;
-import org.apache.tuscany.core.component.scope.ModuleScopeContext;
+import org.apache.tuscany.core.component.scope.ModuleScopeContainer;
 import org.apache.tuscany.spi.model.Scope;
 import org.apache.tuscany.spi.wire.InboundWire;
 import org.jmock.Mock;
@@ -17,7 +17,7 @@
 public class GetServiceByNameTestCase extends MockObjectTestCase {
 
     public void testServiceLocate() throws Exception {
-        ModuleScopeContext scope = new ModuleScopeContext(null);
+        ModuleScopeContainer scope = new ModuleScopeContainer(null);
         scope.start();
         final JavaAtomicComponent<?> context =
                 MockContextFactory.createJavaAtomicContext("target", scope, TargetImpl.class, Target.class, Scope.MODULE);

Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/JavaComponentBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/JavaComponentBuilderTestCase.java?rev=412208&r1=412207&r2=412208&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/JavaComponentBuilderTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/JavaComponentBuilderTestCase.java Tue Jun  6 13:47:19 2006
@@ -4,7 +4,7 @@
 import org.apache.tuscany.container.java.mock.components.SourceImpl;
 import org.apache.tuscany.container.java.mock.components.Target;
 import org.apache.tuscany.core.component.CompositeComponentImpl;
-import org.apache.tuscany.core.component.scope.ModuleScopeContext;
+import org.apache.tuscany.core.component.scope.ModuleScopeContainer;
 import org.apache.tuscany.core.model.PojoComponentType;
 import org.apache.tuscany.spi.component.CompositeComponent;
 import org.apache.tuscany.spi.deployer.DeploymentContext;
@@ -25,7 +25,7 @@
     @SuppressWarnings("unchecked")
     public void testBuild() throws Exception {
         CompositeComponent parent = new CompositeComponentImpl(null, null, null, ArtifactFactory.createWireService());
-        ModuleScopeContext scope = new ModuleScopeContext(null);
+        ModuleScopeContainer scope = new ModuleScopeContainer(null);
         scope.start();
         PojoComponentType sourceType = new PojoComponentType();
         sourceType.setLifecycleScope(Scope.MODULE);
@@ -54,6 +54,6 @@
 
     protected void setUp() throws Exception {
         super.setUp();
-        deploymentContext = new DeploymentContext(null, null, new ModuleScopeContext());
+        deploymentContext = new DeploymentContext(null, null, new ModuleScopeContainer());
     }
 }

Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/JavaReferenceWireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/JavaReferenceWireTestCase.java?rev=412208&r1=412207&r2=412208&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/JavaReferenceWireTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/JavaReferenceWireTestCase.java Tue Jun  6 13:47:19 2006
@@ -11,7 +11,7 @@
 import org.apache.tuscany.container.java.mock.components.SourceImpl;
 import org.apache.tuscany.container.java.mock.components.Target;
 import org.apache.tuscany.container.java.mock.components.TargetImpl;
-import org.apache.tuscany.core.component.scope.ModuleScopeContext;
+import org.apache.tuscany.core.component.scope.ModuleScopeContainer;
 import org.apache.tuscany.core.injection.PojoObjectFactory;
 import org.apache.tuscany.spi.wire.OutboundWire;
 import org.apache.tuscany.spi.wire.WireService;
@@ -28,7 +28,7 @@
 public class JavaReferenceWireTestCase extends MockObjectTestCase {
 
     public void testReferenceSet() throws Exception {
-        ModuleScopeContext scope = new ModuleScopeContext(null);
+        ModuleScopeContainer scope = new ModuleScopeContainer(null);
         scope.start();
         final Target target = new TargetImpl();
         Map<String, Member> members = new HashMap<String, Member>();

Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/JavaTargetInvokerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/JavaTargetInvokerTestCase.java?rev=412208&r1=412207&r2=412208&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/JavaTargetInvokerTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/JavaTargetInvokerTestCase.java Tue Jun  6 13:47:19 2006
@@ -20,8 +20,8 @@
 
 import junit.framework.Assert;
 import org.apache.tuscany.container.java.mock.MockContextFactory;
-import org.apache.tuscany.core.component.scope.ModuleScopeContext;
-import org.apache.tuscany.spi.component.ScopeContext;
+import org.apache.tuscany.core.component.scope.ModuleScopeContainer;
+import org.apache.tuscany.spi.component.ScopeContainer;
 import org.apache.tuscany.spi.model.Scope;
 import org.jmock.MockObjectTestCase;
 
@@ -43,7 +43,7 @@
     }
 
     public void testScopedInvoke() throws Exception {
-        ScopeContext scope = new ModuleScopeContext(null);
+        ScopeContainer scope = new ModuleScopeContainer(null);
         scope.start();
         JavaAtomicComponent context = MockContextFactory.createJavaAtomicContext("foo", scope, Echo.class, Scope.MODULE);
         scope.register(context);

Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/ReferenceInjectionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/ReferenceInjectionTestCase.java?rev=412208&r1=412207&r2=412208&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/ReferenceInjectionTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/ReferenceInjectionTestCase.java Tue Jun  6 13:47:19 2006
@@ -12,9 +12,9 @@
 import org.apache.tuscany.container.java.mock.components.SourceImpl;
 import org.apache.tuscany.container.java.mock.components.Target;
 import org.apache.tuscany.container.java.mock.components.TargetImpl;
-import org.apache.tuscany.core.component.scope.ModuleScopeContext;
+import org.apache.tuscany.core.component.scope.ModuleScopeContainer;
 import org.apache.tuscany.spi.component.AtomicComponent;
-import org.apache.tuscany.spi.component.ScopeContext;
+import org.apache.tuscany.spi.component.ScopeContainer;
 
 /**
  * @version $$Rev$$ $$Date$$
@@ -24,7 +24,7 @@
     private Map<String, Member> members;
 
     public void testProxiedReferenceInjection() throws Exception {
-        ScopeContext scope = new ModuleScopeContext(null);
+        ScopeContainer scope = new ModuleScopeContainer(null);
         scope.start();
         Map<String, AtomicComponent> contexts = MockContextFactory.createWiredContexts("source", SourceImpl.class, scope,
                 members, "target", Target.class, TargetImpl.class, scope);

Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/context/OutboundWireToJavaTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/context/OutboundWireToJavaTestCase.java?rev=412208&r1=412207&r2=412208&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/context/OutboundWireToJavaTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/context/OutboundWireToJavaTestCase.java Tue Jun  6 13:47:19 2006
@@ -19,16 +19,16 @@
 import org.apache.tuscany.core.component.event.HttpSessionStart;
 import org.apache.tuscany.core.component.event.RequestEnd;
 import org.apache.tuscany.core.component.event.RequestStart;
-import org.apache.tuscany.core.component.scope.HttpSessionScopeContext;
-import org.apache.tuscany.core.component.scope.ModuleScopeContext;
-import org.apache.tuscany.core.component.scope.RequestScopeContext;
-import org.apache.tuscany.core.component.scope.StatelessScopeContext;
+import org.apache.tuscany.core.component.scope.HttpSessionScopeContainer;
+import org.apache.tuscany.core.component.scope.ModuleScopeContainer;
+import org.apache.tuscany.core.component.scope.RequestScopeContainer;
+import org.apache.tuscany.core.component.scope.StatelessScopeContainer;
 import org.apache.tuscany.core.util.MethodHashMap;
 import org.apache.tuscany.core.wire.OutboundInvocationChainImpl;
 import org.apache.tuscany.core.wire.OutboundWireImpl;
 import org.apache.tuscany.spi.QualifiedName;
 import org.apache.tuscany.spi.component.AtomicComponent;
-import org.apache.tuscany.spi.component.ScopeContext;
+import org.apache.tuscany.spi.component.ScopeContainer;
 import org.apache.tuscany.spi.component.WorkContext;
 import org.apache.tuscany.spi.wire.InboundWire;
 import org.apache.tuscany.spi.wire.OutboundInvocationChain;
@@ -46,7 +46,7 @@
     private WireService wireService = ArtifactFactory.createWireService();
 
     public void testToStatelessScope() throws Exception {
-        StatelessScopeContext scope = new StatelessScopeContext(workContext);
+        StatelessScopeContainer scope = new StatelessScopeContainer(workContext);
         scope.start();
         final OutboundWire<Target> wire = getWire(scope);
         Target service = wireService.createProxy(wire);
@@ -57,7 +57,7 @@
     }
 
     public void testToRequestScope() throws Exception {
-        final RequestScopeContext scope = new RequestScopeContext(workContext);
+        final RequestScopeContainer scope = new RequestScopeContainer(workContext);
         scope.start();
 
         scope.onEvent(new RequestStart(this));
@@ -90,10 +90,10 @@
     }
 
     public void testToSessionScope() throws Exception {
-        HttpSessionScopeContext scope = new HttpSessionScopeContext(workContext);
+        HttpSessionScopeContainer scope = new HttpSessionScopeContainer(workContext);
         scope.start();
         Object session1 = new Object();
-        workContext.setIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER, session1);
+        workContext.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session1);
         scope.onEvent(new HttpSessionStart(this, session1));
 
         final OutboundWire<Target> wire = getWire(scope);
@@ -104,11 +104,11 @@
         assertEquals("foo", service.getString());
         assertEquals("foo", target.getString());
 
-        workContext.clearIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER);
+        workContext.clearIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER);
 
         //second session
         Object session2 = new Object();
-        workContext.setIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER, session2);
+        workContext.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session2);
         scope.onEvent(new HttpSessionStart(this, session2));
 
         Target service2 = wireService.createProxy(wire);
@@ -120,9 +120,9 @@
         assertEquals("bar", target2.getString());
 
         scope.onEvent(new HttpSessionEnd(this, session2));
-        workContext.clearIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER);
+        workContext.clearIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER);
 
-        workContext.setIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER, session1);
+        workContext.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session1);
         assertEquals("foo", service.getString());
 
         scope.onEvent(new HttpSessionEnd(this, session1));
@@ -132,7 +132,7 @@
 
     public void testToModuleScope() throws Exception {
 
-        ModuleScopeContext scope = new ModuleScopeContext(workContext);
+        ModuleScopeContainer scope = new ModuleScopeContainer(workContext);
         scope.start();
         scope.onEvent(new CompositeStart(this, null));
         final OutboundWire<Target> wire = getWire(scope);
@@ -147,7 +147,7 @@
     }
 
     @SuppressWarnings("unchecked")
-    private OutboundWire<Target> getWire(ScopeContext scope) throws NoSuchMethodException {
+    private OutboundWire<Target> getWire(ScopeContainer scope) throws NoSuchMethodException {
         Connector connector = new ConnectorImpl();
         OutboundWire<Target> wire = createOutboundWire(new QualifiedName("target/Target"), Target.class);
 

Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/context/ScopeReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/context/ScopeReferenceTestCase.java?rev=412208&r1=412207&r2=412208&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/context/ScopeReferenceTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/context/ScopeReferenceTestCase.java Tue Jun  6 13:47:19 2006
@@ -35,13 +35,13 @@
 import org.apache.tuscany.core.component.event.HttpSessionStart;
 import org.apache.tuscany.core.component.event.RequestEnd;
 import org.apache.tuscany.core.component.event.RequestStart;
-import org.apache.tuscany.core.component.scope.HttpSessionScopeContext;
-import org.apache.tuscany.core.component.scope.ModuleScopeContext;
-import org.apache.tuscany.core.component.scope.RequestScopeContext;
-import org.apache.tuscany.core.component.scope.StatelessScopeContext;
+import org.apache.tuscany.core.component.scope.HttpSessionScopeContainer;
+import org.apache.tuscany.core.component.scope.ModuleScopeContainer;
+import org.apache.tuscany.core.component.scope.RequestScopeContainer;
+import org.apache.tuscany.core.component.scope.StatelessScopeContainer;
 import org.apache.tuscany.core.util.JavaIntrospectionHelper;
 import org.apache.tuscany.spi.component.AtomicComponent;
-import org.apache.tuscany.spi.component.ScopeContext;
+import org.apache.tuscany.spi.component.ScopeContainer;
 import org.apache.tuscany.spi.component.WorkContext;
 
 /**
@@ -58,7 +58,7 @@
      */
     @SuppressWarnings("unchecked")
     public void testModuleToModule() throws Exception {
-        ScopeContext scope = new ModuleScopeContext(null);
+        ScopeContainer scope = new ModuleScopeContainer(null);
         scope.start();
 
         Map<String, AtomicComponent> contexts = MockContextFactory.createWiredContexts("source", SourceImpl.class, scope, members, "target", Target.class, TargetImpl.class, scope);
@@ -82,16 +82,16 @@
     @SuppressWarnings("unchecked")
     public void testModuleToSession() throws Exception {
         WorkContext ctx = new WorkContextImpl();
-        ScopeContext moduleScope = new ModuleScopeContext(ctx);
+        ScopeContainer moduleScope = new ModuleScopeContainer(ctx);
         moduleScope.start();
-        ScopeContext sessionScope = new HttpSessionScopeContext(ctx);
+        ScopeContainer sessionScope = new HttpSessionScopeContainer(ctx);
         sessionScope.start();
 
         Map<String, AtomicComponent> contexts = MockContextFactory.createWiredContexts("source", SourceImpl.class,
                 moduleScope, members, "target", Target.class, TargetImpl.class, sessionScope);
         moduleScope.onEvent(new CompositeStart(this, null));
         Object session1 = new Object();
-        ctx.setIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER, session1);
+        ctx.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session1);
         sessionScope.onEvent(new HttpSessionStart(this, session1));
         AtomicComponent<Source> sourceComponent = (AtomicComponent<Source>) contexts.get("source");
         AtomicComponent<Target> targetComponent = (AtomicComponent<Target>) contexts.get("target");
@@ -102,12 +102,12 @@
         target.setString("foo");
         assertTrue(Proxy.isProxyClass(source.getTarget().getClass()));
         assertEquals("foo", source.getTarget().getString());
-        ctx.clearIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER);
+        ctx.clearIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER);
         sessionScope.onEvent(new HttpSessionEnd(this, session1));
 
         //second session
         Object session2 = new Object();
-        ctx.setIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER, session2);
+        ctx.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session2);
         sessionScope.onEvent(new HttpSessionStart(this, session2));
 
         Target target2 = targetComponent.getServiceInstance();
@@ -119,7 +119,7 @@
         assertEquals("bar", source.getTarget().getString());
         sessionScope.onEvent(new HttpSessionEnd(this, session2));
 
-        ctx.clearIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER);
+        ctx.clearIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER);
         moduleScope.onEvent(new CompositeStop(this, null));
         sessionScope.stop();
         moduleScope.stop();
@@ -131,9 +131,9 @@
     @SuppressWarnings("unchecked")
     public void testModuleToRequest() throws Exception {
         WorkContext ctx = new WorkContextImpl();
-        ScopeContext moduleScope = new ModuleScopeContext(ctx);
+        ScopeContainer moduleScope = new ModuleScopeContainer(ctx);
         moduleScope.start();
-        final ScopeContext requestScope = new RequestScopeContext(ctx);
+        final ScopeContainer requestScope = new RequestScopeContainer(ctx);
         requestScope.start();
 
         Map<String, AtomicComponent> contexts = MockContextFactory.createWiredContexts("source", SourceImpl.class,
@@ -180,9 +180,9 @@
     @SuppressWarnings("unchecked")
     public void testModuleToStateless() throws Exception {
         WorkContext ctx = new WorkContextImpl();
-        ScopeContext moduleScope = new ModuleScopeContext(ctx);
+        ScopeContainer moduleScope = new ModuleScopeContainer(ctx);
         moduleScope.start();
-        ScopeContext statelessScope = new StatelessScopeContext(ctx);
+        ScopeContainer statelessScope = new StatelessScopeContainer(ctx);
         statelessScope.start();
 
         Map<String, AtomicComponent> contexts = MockContextFactory.createWiredContexts("source", SourceImpl.class,
@@ -214,14 +214,14 @@
     @SuppressWarnings("unchecked")
     public void testSessionToSession() throws Exception {
         WorkContext ctx = new WorkContextImpl();
-        ScopeContext sessionScope = new HttpSessionScopeContext(ctx);
+        ScopeContainer sessionScope = new HttpSessionScopeContainer(ctx);
         sessionScope.start();
 
         Map<String, AtomicComponent> contexts = MockContextFactory.createWiredContexts("source", SourceImpl.class,
                 sessionScope, members, "target", Target.class, TargetImpl.class, sessionScope);
 
         Object session1 = new Object();
-        ctx.setIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER, session1);
+        ctx.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session1);
         sessionScope.onEvent(new HttpSessionStart(this, session1));
         AtomicComponent<Source> sourceComponent = (AtomicComponent<Source>) contexts.get("source");
         AtomicComponent<Target> targetComponent = (AtomicComponent<Target>) contexts.get("target");
@@ -231,12 +231,12 @@
         source.getTarget().setString("foo");
         assertEquals("foo", target.getString());
 
-        ctx.clearIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER);
+        ctx.clearIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER);
         sessionScope.onEvent(new HttpSessionEnd(this, session1));
 
         //second session
         Object session2 = new Object();
-        ctx.setIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER, session2);
+        ctx.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session2);
         sessionScope.onEvent(new HttpSessionStart(this, session2));
 
         Source source2 = sourceComponent.getServiceInstance();
@@ -249,7 +249,7 @@
         source2.getTarget().setString("baz");
         assertEquals("baz", source2.getTarget().getString());
         assertEquals("baz", target2.getString());
-        ctx.clearIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER);
+        ctx.clearIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER);
         sessionScope.onEvent(new HttpSessionEnd(this, session2));
         sessionScope.stop();
     }
@@ -261,16 +261,16 @@
     @SuppressWarnings("unchecked")
     public void testSessionToModule() throws Exception {
         WorkContext ctx = new WorkContextImpl();
-        ScopeContext moduleScope = new ModuleScopeContext(ctx);
+        ScopeContainer moduleScope = new ModuleScopeContainer(ctx);
         moduleScope.start();
-        ScopeContext sessionScope = new HttpSessionScopeContext(ctx);
+        ScopeContainer sessionScope = new HttpSessionScopeContainer(ctx);
         sessionScope.start();
 
         Map<String, AtomicComponent> contexts = MockContextFactory.createWiredContexts("source", SourceImpl.class,
                 sessionScope, members, "target", Target.class, TargetImpl.class, moduleScope);
         moduleScope.onEvent(new CompositeStart(this, null));
         Object session1 = new Object();
-        ctx.setIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER, session1);
+        ctx.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session1);
         sessionScope.onEvent(new HttpSessionStart(this, session1));
         AtomicComponent<Source> sourceComponent = (AtomicComponent<Source>) contexts.get("source");
         AtomicComponent<Target> targetComponent = (AtomicComponent<Target>) contexts.get("target");
@@ -281,12 +281,12 @@
         target.setString("foo");
         assertTrue(Proxy.isProxyClass(source.getTarget().getClass()));
         assertEquals("foo", source.getTarget().getString());
-        ctx.clearIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER);
+        ctx.clearIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER);
         sessionScope.onEvent(new HttpSessionEnd(this, session1));
 
         //second session
         Object session2 = new Object();
-        ctx.setIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER, session2);
+        ctx.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session2);
         sessionScope.onEvent(new HttpSessionStart(this, session2));
 
         Target target2 = targetComponent.getServiceInstance();
@@ -297,7 +297,7 @@
         assertEquals("baz", source2.getTarget().getString());
         assertEquals("baz", target2.getString());
         assertEquals("baz", target.getString());
-        ctx.clearIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER);
+        ctx.clearIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER);
         sessionScope.onEvent(new HttpSessionEnd(this, session2));
         moduleScope.stop();
         sessionScope.stop();
@@ -309,15 +309,15 @@
     @SuppressWarnings("unchecked")
     public void testSessionToRequest() throws Exception {
         WorkContext ctx = new WorkContextImpl();
-        final ScopeContext requestScope = new RequestScopeContext(ctx);
+        final ScopeContainer requestScope = new RequestScopeContainer(ctx);
         requestScope.start();
-        ScopeContext sessionScope = new HttpSessionScopeContext(ctx);
+        ScopeContainer sessionScope = new HttpSessionScopeContainer(ctx);
         sessionScope.start();
 
         Map<String, AtomicComponent> contexts = MockContextFactory.createWiredContexts("source", SourceImpl.class,
                 sessionScope, members, "target", Target.class, TargetImpl.class, requestScope);
         Object session1 = new Object();
-        ctx.setIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER, session1);
+        ctx.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session1);
         sessionScope.onEvent(new HttpSessionStart(this, session1));
         requestScope.onEvent(new RequestStart(this));
         AtomicComponent<Source> sourceComponent = (AtomicComponent<Source>) contexts.get("source");
@@ -348,7 +348,7 @@
         future.get();
         assertEquals("foo", source.getTarget().getString());
         requestScope.onEvent(new RequestEnd(this));
-        ctx.clearIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER);
+        ctx.clearIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER);
         sessionScope.onEvent(new HttpSessionEnd(this, session1));
         requestScope.stop();
         sessionScope.stop();
@@ -361,16 +361,16 @@
     @SuppressWarnings("unchecked")
     public void testSessionToStateless() throws Exception {
         WorkContext ctx = new WorkContextImpl();
-        ScopeContext sessionScope = new HttpSessionScopeContext(ctx);
+        ScopeContainer sessionScope = new HttpSessionScopeContainer(ctx);
         sessionScope.start();
-        ScopeContext statelessScope = new StatelessScopeContext(ctx);
+        ScopeContainer statelessScope = new StatelessScopeContainer(ctx);
         statelessScope.start();
 
         Map<String, AtomicComponent> contexts = MockContextFactory.createWiredContexts("source", SourceImpl.class,
                 sessionScope, members, "target", Target.class, TargetImpl.class, statelessScope);
 
         Object session1 = new Object();
-        ctx.setIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER, session1);
+        ctx.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session1);
         sessionScope.onEvent(new HttpSessionStart(this, session1));
 
         AtomicComponent<Source> sourceComponent = (AtomicComponent<Source>) contexts.get("source");
@@ -387,7 +387,7 @@
         source.getTarget().setString("bar");
         assertFalse("bar".equals(source.getTarget().getString()));
 
-        ctx.clearIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER);
+        ctx.clearIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER);
         sessionScope.onEvent(new HttpSessionEnd(this, session1));
         sessionScope.stop();
         statelessScope.stop();
@@ -399,7 +399,7 @@
     @SuppressWarnings("unchecked")
     public void testRequestToRequest() throws Exception {
         WorkContext ctx = new WorkContextImpl();
-        final ScopeContext requestScope = new RequestScopeContext(ctx);
+        final ScopeContainer requestScope = new RequestScopeContainer(ctx);
         requestScope.start();
 
         Map<String, AtomicComponent> contexts = MockContextFactory.createWiredContexts("source", SourceImpl.class,
@@ -443,8 +443,8 @@
     @SuppressWarnings("unchecked")
     public void testRequestToModule() throws Exception {
         WorkContext ctx = new WorkContextImpl();
-        final ScopeContext requestScope = new RequestScopeContext(ctx);
-        final ScopeContext moduleScope = new ModuleScopeContext(ctx);
+        final ScopeContainer requestScope = new RequestScopeContainer(ctx);
+        final ScopeContainer moduleScope = new ModuleScopeContainer(ctx);
         requestScope.start();
         moduleScope.start();
         moduleScope.onEvent(new CompositeStart(this, null));
@@ -494,13 +494,13 @@
     @SuppressWarnings("unchecked")
     public void testRequestToSession() throws Exception {
         WorkContext ctx = new WorkContextImpl();
-        final ScopeContext requestScope = new RequestScopeContext(ctx);
-        final ScopeContext sessionScope = new HttpSessionScopeContext(ctx);
+        final ScopeContainer requestScope = new RequestScopeContainer(ctx);
+        final ScopeContainer sessionScope = new HttpSessionScopeContainer(ctx);
         requestScope.start();
         sessionScope.start();
 
         Object session1 = new Object();
-        ctx.setIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER, session1);
+        ctx.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session1);
         sessionScope.onEvent(new HttpSessionStart(this, session1));
         Map<String, AtomicComponent> contexts = MockContextFactory.createWiredContexts("source", SourceImpl.class,
                 requestScope, members, "target", Target.class, TargetImpl.class, sessionScope);
@@ -537,7 +537,7 @@
 
         requestScope.onEvent(new RequestEnd(this));
         requestScope.stop();
-        ctx.clearIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER);
+        ctx.clearIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER);
         sessionScope.onEvent(new HttpSessionEnd(this, session1));
         sessionScope.stop();
     }
@@ -549,9 +549,9 @@
     @SuppressWarnings("unchecked")
     public void testRequestToStateless() throws Exception {
         WorkContext ctx = new WorkContextImpl();
-        ScopeContext requestScope = new RequestScopeContext(ctx);
+        ScopeContainer requestScope = new RequestScopeContainer(ctx);
         requestScope.start();
-        ScopeContext statelessScope = new StatelessScopeContext(ctx);
+        ScopeContainer statelessScope = new StatelessScopeContainer(ctx);
         statelessScope.start();
 
         Map<String, AtomicComponent> contexts = MockContextFactory.createWiredContexts("source", SourceImpl.class,
@@ -583,7 +583,7 @@
     @SuppressWarnings("unchecked")
     public void testStatelessToStateless() throws Exception {
         WorkContext ctx = new WorkContextImpl();
-        ScopeContext statelessScope = new StatelessScopeContext(ctx);
+        ScopeContainer statelessScope = new StatelessScopeContainer(ctx);
         statelessScope.start();
 
         Map<String, AtomicComponent> contexts = MockContextFactory.createWiredContexts("source", SourceImpl.class,
@@ -611,9 +611,9 @@
     @SuppressWarnings("unchecked")
     public void testStatelessToRequest() throws Exception {
         WorkContext ctx = new WorkContextImpl();
-        final ScopeContext requestScope = new RequestScopeContext(ctx);
+        final ScopeContainer requestScope = new RequestScopeContainer(ctx);
         requestScope.start();
-        ScopeContext statelessScope = new StatelessScopeContext(ctx);
+        ScopeContainer statelessScope = new StatelessScopeContainer(ctx);
         statelessScope.start();
 
         Map<String, AtomicComponent> contexts = MockContextFactory.createWiredContexts("source", SourceImpl.class,
@@ -655,15 +655,15 @@
     @SuppressWarnings("unchecked")
     public void testStatelessToSession() throws Exception {
         WorkContext ctx = new WorkContextImpl();
-        ScopeContext statelessScope = new StatelessScopeContext(ctx);
+        ScopeContainer statelessScope = new StatelessScopeContainer(ctx);
         statelessScope.start();
-        ScopeContext sessionScope = new HttpSessionScopeContext(ctx);
+        ScopeContainer sessionScope = new HttpSessionScopeContainer(ctx);
         sessionScope.start();
 
         Map<String, AtomicComponent> contexts = MockContextFactory.createWiredContexts("source", SourceImpl.class,
                 statelessScope, members, "target", Target.class, TargetImpl.class, sessionScope);
         Object session1 = new Object();
-        ctx.setIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER, session1);
+        ctx.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session1);
         sessionScope.onEvent(new HttpSessionStart(this, session1));
         AtomicComponent<Source> sourceComponent = (AtomicComponent<Source>) contexts.get("source");
         AtomicComponent<Target> targetComponent = (AtomicComponent<Target>) contexts.get("target");
@@ -674,12 +674,12 @@
         target.setString("foo");
         assertTrue(Proxy.isProxyClass(source.getTarget().getClass()));
         assertEquals("foo", source.getTarget().getString());
-        ctx.clearIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER);
+        ctx.clearIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER);
         sessionScope.onEvent(new HttpSessionEnd(this, session1));
 
         //second session
         Object session2 = new Object();
-        ctx.setIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER, session2);
+        ctx.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session2);
         sessionScope.onEvent(new HttpSessionStart(this, session2));
 
         Target target2 = targetComponent.getServiceInstance();
@@ -691,7 +691,7 @@
         assertEquals("bar", source.getTarget().getString());
         sessionScope.onEvent(new HttpSessionEnd(this, session2));
 
-        ctx.clearIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER);
+        ctx.clearIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER);
         sessionScope.stop();
         statelessScope.stop();
     }
@@ -703,9 +703,9 @@
     @SuppressWarnings("unchecked")
     public void testStatelessToModule() throws Exception {
         WorkContext ctx = new WorkContextImpl();
-        ScopeContext statelessScope = new StatelessScopeContext(ctx);
+        ScopeContainer statelessScope = new StatelessScopeContainer(ctx);
         statelessScope.start();
-        ScopeContext moduleScope = new ModuleScopeContext(ctx);
+        ScopeContainer moduleScope = new ModuleScopeContainer(ctx);
         moduleScope.start();
 
         Map<String, AtomicComponent> contexts = MockContextFactory.createWiredContexts("source", SourceImpl.class,
@@ -723,7 +723,7 @@
 
         //second session
         Object session2 = new Object();
-        ctx.setIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER, session2);
+        ctx.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session2);
         moduleScope.onEvent(new HttpSessionStart(this, session2));
 
         Target target2 = targetComponent.getServiceInstance();

Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockContextFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockContextFactory.java?rev=412208&r1=412207&r2=412208&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockContextFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockContextFactory.java Tue Jun  6 13:47:19 2006
@@ -24,7 +24,7 @@
 import org.apache.tuscany.spi.builder.BuilderConfigException;
 import org.apache.tuscany.spi.component.AtomicComponent;
 import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.component.ScopeContext;
+import org.apache.tuscany.spi.component.ScopeContainer;
 import org.apache.tuscany.spi.model.Scope;
 import org.apache.tuscany.spi.wire.InboundInvocationChain;
 import org.apache.tuscany.spi.wire.InboundWire;
@@ -43,19 +43,19 @@
 
     private static final WireService wireService = ArtifactFactory.createWireService();
 
-    public static JavaAtomicComponent<?> createJavaAtomicContext(String name, ScopeContext scopeContext, Class<?> clazz, Scope scope) throws NoSuchMethodException {
-        return createJavaAtomicContext(name, null, scopeContext, clazz, clazz, scope, false, null, null, null, null);
+    public static JavaAtomicComponent<?> createJavaAtomicContext(String name, ScopeContainer scopeContainer, Class<?> clazz, Scope scope) throws NoSuchMethodException {
+        return createJavaAtomicContext(name, null, scopeContainer, clazz, clazz, scope, false, null, null, null, null);
 
     }
 
-    public static JavaAtomicComponent<?> createJavaAtomicContext(String name, ScopeContext scopeContext, Class<?> clazz, Class<?> service, Scope scope) throws NoSuchMethodException {
-        return createJavaAtomicContext(name, null, scopeContext, clazz, service, scope, false, null, null, null, null);
+    public static JavaAtomicComponent<?> createJavaAtomicContext(String name, ScopeContainer scopeContainer, Class<?> clazz, Class<?> service, Scope scope) throws NoSuchMethodException {
+        return createJavaAtomicContext(name, null, scopeContainer, clazz, service, scope, false, null, null, null, null);
 
     }
 
     public static JavaAtomicComponent<?> createJavaAtomicContext(String name,
                                                                  CompositeComponent<?> parent,
-                                                                 ScopeContext scopeContext,
+                                                                 ScopeContainer scopeContainer,
                                                                  Class<?> clazz,
                                                                  Class<?> service,
                                                                  Scope scope,
@@ -67,7 +67,7 @@
             throws NoSuchMethodException {
         List<Class<?>> serviceInterfaces = new ArrayList<Class<?>>();
         serviceInterfaces.add(service);
-        return new JavaAtomicComponent(name, parent, scopeContext, serviceInterfaces, createObjectFactory(clazz),
+        return new JavaAtomicComponent(name, parent, scopeContainer, serviceInterfaces, createObjectFactory(clazz),
                 scope, eagerInit, initInvoker, destroyInvoker, injectors, members, wireService);
     }
 
@@ -86,9 +86,9 @@
      * @throws Exception
      */
     public static Map<String, AtomicComponent> createWiredContexts(String sourceName, Class<?> sourceClass,
-                                                                   ScopeContext sourceScope,
+                                                                   ScopeContainer sourceScope,
                                                                    Map<String, Member> members, String targetName, Class<?> targetService, Class<?> targetClass,
-                                                                   ScopeContext targetScope) throws Exception {
+                                                                   ScopeContainer targetScope) throws Exception {
         return createWiredContexts(sourceName, sourceClass, targetService, sourceScope, members, targetName, targetService, targetClass, targetScope);
 
     }
@@ -97,22 +97,22 @@
      * Wires two contexts together where the reference interface may be different from the target service
      */
     public static Map<String, AtomicComponent> createWiredContexts(String sourceName, Class<?> sourceClass, Class<?> sourceReferenceClass,
-                                                                   ScopeContext sourceScope,
+                                                                   ScopeContainer sourceScope,
                                                                    Map<String, Member> members, String targetName,
                                                                    Class<?> targetService, Class<?> targetClass,
-                                                                   ScopeContext targetScope) throws Exception {
+                                                                   ScopeContainer targetScope) throws Exception {
         return createWiredContexts(sourceName, sourceClass, sourceReferenceClass, sourceScope, null, null, null, members, targetName, targetService,
                 targetClass, targetScope, null, null, null);
     }
 
     public static Map<String, AtomicComponent> createWiredContexts(String sourceName, Class<?> sourceClass, Class<?> sourceReferenceClass,
-                                                                   ScopeContext sourceScope,
+                                                                   ScopeContainer sourceScope,
                                                                    Interceptor sourceHeadInterceptor,
                                                                    MessageHandler sourceHeadRequestHandler,
                                                                    MessageHandler sourceHeadResponseHandler,
                                                                    Map<String, Member> members,
                                                                    String targetName, Class<?> targetService, Class<?> targetClass,
-                                                                   ScopeContext targetScope,
+                                                                   ScopeContainer targetScope,
                                                                    Interceptor targetHeadInterceptor,
                                                                    MessageHandler targetRequestHeadHandler,
                                                                    MessageHandler targetResponseHeadHandler) throws Exception {
@@ -151,9 +151,9 @@
      * @throws Exception
      */
     public static Map<String, AtomicComponent> createWiredMultiplicity(String sourceName, Class<?> sourceClass, Class<?> sourceReferenceClass,
-                                                                       ScopeContext sourceScope,
+                                                                       ScopeContainer sourceScope,
                                                                        String targetName, Class<?> targetService, Class<?> targetClass,
-                                                                       Map<String, Member> members, ScopeContext targetScope) throws Exception {
+                                                                       Map<String, Member> members, ScopeContainer targetScope) throws Exception {
         JavaAtomicComponent targetContext = createJavaAtomicContext(targetName, targetScope, targetClass, targetScope.getScope());
         InboundWire inboundWire = createServiceWire(targetService.getName().substring(
                 targetService.getName().lastIndexOf('.') + 1), targetService, null, null, null);

Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/SpringCompositeComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/SpringCompositeComponent.java?rev=412208&r1=412207&r2=412208&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/SpringCompositeComponent.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/SpringCompositeComponent.java Tue Jun  6 13:47:19 2006
@@ -8,7 +8,7 @@
 import org.apache.tuscany.spi.component.CompositeComponent;
 import org.apache.tuscany.spi.component.SCAObject;
 import org.apache.tuscany.spi.component.Reference;
-import org.apache.tuscany.spi.component.ScopeContext;
+import org.apache.tuscany.spi.component.ScopeContainer;
 import org.apache.tuscany.spi.component.Service;
 import org.apache.tuscany.spi.extension.CompositeComponentExtension;
 import org.apache.tuscany.spi.wire.TargetInvoker;
@@ -54,7 +54,7 @@
         return new SpringInvoker(serviceName, method, springContext);
     }
 
-    public void setScopeContext(ScopeContext scopeContext) {
+    public void setScopeContext(ScopeContainer scopeContainer) {
         // not needed
     }
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/AbstractCompositeComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/AbstractCompositeComponent.java?rev=412208&r1=412207&r2=412208&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/AbstractCompositeComponent.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/AbstractCompositeComponent.java Tue Jun  6 13:47:19 2006
@@ -16,7 +16,7 @@
 import org.apache.tuscany.spi.component.IllegalTargetException;
 import org.apache.tuscany.spi.component.Reference;
 import org.apache.tuscany.spi.component.SCAObject;
-import org.apache.tuscany.spi.component.ScopeContext;
+import org.apache.tuscany.spi.component.ScopeContainer;
 import org.apache.tuscany.spi.component.Service;
 import org.apache.tuscany.spi.event.Event;
 import org.apache.tuscany.spi.extension.CompositeComponentExtension;
@@ -47,7 +47,7 @@
 
     protected AutowireComponent<?> autowireContext;
 
-    protected ScopeContext scopeContext;
+    protected ScopeContainer scopeContainer;
 
     public AbstractCompositeComponent(String name, CompositeComponent parent, AutowireComponent autowireContext, WireService wireService) {
         super(name, parent, wireService);
@@ -59,8 +59,8 @@
         autowireContext = context;
     }
 
-    public void setScopeContext(ScopeContext scopeContext) {
-        this.scopeContext = scopeContext;
+    public void setScopeContext(ScopeContainer scopeContainer) {
+        this.scopeContainer = scopeContainer;
     }
 
     public void start() {
@@ -69,8 +69,8 @@
                 throw new IllegalStateException("SCAObject not in UNINITIALIZED state");
             }
 
-            if (scopeContext != null) {
-                scopeContext.start();
+            if (scopeContainer != null) {
+                scopeContainer.start();
             }
             for (SCAObject child : children.values()) {
                 child.start();
@@ -88,8 +88,8 @@
         for (SCAObject child : children.values()) {
             child.stop();
         }
-        if (scopeContext != null) {
-            scopeContext.stop();
+        if (scopeContainer != null) {
+            scopeContainer.stop();
         }
 
         // need to block a start until reset is complete

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/PojoAtomicComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/PojoAtomicComponent.java?rev=412208&r1=412207&r2=412208&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/PojoAtomicComponent.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/PojoAtomicComponent.java Tue Jun  6 13:47:19 2006
@@ -22,7 +22,7 @@
 import org.apache.tuscany.spi.component.AtomicComponent;
 import org.apache.tuscany.spi.component.CompositeComponent;
 import org.apache.tuscany.spi.component.InstanceWrapper;
-import org.apache.tuscany.spi.component.ScopeContext;
+import org.apache.tuscany.spi.component.ScopeContainer;
 import org.apache.tuscany.spi.component.TargetException;
 import org.apache.tuscany.spi.extension.AtomicComponentExtension;
 import org.apache.tuscany.spi.wire.OutboundWire;
@@ -45,7 +45,7 @@
 
     public PojoAtomicComponent(String name,
                                CompositeComponent<?> parent,
-                               ScopeContext scopeContext,
+                               ScopeContainer scopeContainer,
                                Class<?> serviceInterface,
                                ObjectFactory<?> objectFactory,
                                boolean eagerInit,
@@ -54,7 +54,7 @@
                                List<Injector> injectors,
                                Map<String, Member> members,
                                WireService wireService) {
-        super(name, parent, scopeContext, wireService);
+        super(name, parent, scopeContainer, wireService);
         assert (objectFactory != null) : "Object factory was null";
         if (eagerInit && initInvoker == null) {
             throw new AssertionError("No intialization method found for eager init implementation");
@@ -73,7 +73,7 @@
 
     public PojoAtomicComponent(String name,
                                CompositeComponent<?> parent,
-                               ScopeContext scopeContext,
+                               ScopeContainer scopeContainer,
                                List<Class<?>> serviceInterfaces,
                                ObjectFactory<?> objectFactory,
                                boolean eagerInit,
@@ -82,7 +82,7 @@
                                List<Injector> injectors,
                                Map<String, Member> members,
                                WireService wireService) {
-        super(name, parent, scopeContext, wireService);
+        super(name, parent, scopeContainer, wireService);
         assert (objectFactory != null) : "Object factory was null";
         if (eagerInit && initInvoker == null) {
             throw new AssertionError("No intialization method found for eager init implementation");
@@ -118,7 +118,7 @@
 
     @SuppressWarnings("unchecked")
     public T getTargetInstance() throws TargetException {
-        return (T) scopeContext.getInstance(this);
+        return (T) scopeContainer.getInstance(this);
     }
 
     public InstanceWrapper createInstance() throws ObjectCreationException {

Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContainer.java (from r412206, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContext.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContainer.java?p2=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContainer.java&p1=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContext.java&r1=412206&r2=412208&rev=412208&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContainer.java Tue Jun  6 13:47:19 2006
@@ -9,7 +9,7 @@
 import org.apache.tuscany.spi.AbstractLifecycle;
 import org.apache.tuscany.spi.component.AtomicComponent;
 import org.apache.tuscany.spi.component.InstanceWrapper;
-import org.apache.tuscany.spi.component.ScopeContext;
+import org.apache.tuscany.spi.component.ScopeContainer;
 import org.apache.tuscany.spi.component.TargetException;
 import org.apache.tuscany.spi.component.WorkContext;
 import org.apache.tuscany.spi.event.Event;
@@ -22,14 +22,14 @@
  *
  * @version $Rev$ $Date$
  */
-public abstract class AbstractScopeContext extends AbstractLifecycle implements ScopeContext {
+public abstract class AbstractScopeContainer extends AbstractLifecycle implements ScopeContainer {
     private final String name;
     // The event context the scope container is associated with
     protected WorkContext workContext;
     private Map<EventFilter, List<RuntimeEventListener>> listeners;
     private static final EventFilter TRUE_FILTER = new TrueFilter();
 
-    public AbstractScopeContext(String name, WorkContext workContext) {
+    public AbstractScopeContainer(String name, WorkContext workContext) {
         this.name = name;
         this.workContext = workContext;
     }
@@ -112,6 +112,6 @@
     }
 
     public String toString() {
-        return "ScopeContext [" + name + "] in state [" + super.toString() + ']';
+        return "ScopeContainer [" + name + "] in state [" + super.toString() + ']';
     }
 }

Propchange: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContainer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContainer.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeContainer.java (from r412206, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeContext.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeContainer.java?p2=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeContainer.java&p1=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeContext.java&r1=412206&r2=412208&rev=412208&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeContainer.java Tue Jun  6 13:47:19 2006
@@ -20,18 +20,18 @@
  *
  * @version $Rev$ $Date$
  */
-public class HttpSessionScopeContext extends AbstractScopeContext {
+public class HttpSessionScopeContainer extends AbstractScopeContainer {
 
     public static final Object HTTP_IDENTIFIER = new Object();
 
     private final Map<AtomicComponent, Map<Object, InstanceWrapper>> contexts;
     private final Map<Object, List<InstanceWrapper>> destroyQueues;
 
-    public HttpSessionScopeContext() {
+    public HttpSessionScopeContainer() {
         this(null);
     }
 
-    public HttpSessionScopeContext(WorkContext workContext) {
+    public HttpSessionScopeContainer(WorkContext workContext) {
         super("Session Scope", workContext);
         contexts = new ConcurrentHashMap<AtomicComponent, Map<Object, InstanceWrapper>>();
         destroyQueues = new ConcurrentHashMap<Object, List<InstanceWrapper>>();

Propchange: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeContainer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeContainer.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeObjectFactory.java?rev=412208&r1=412207&r2=412208&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeObjectFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeObjectFactory.java Tue Jun  6 13:47:19 2006
@@ -8,9 +8,9 @@
  *
  * @version $$Rev$$ $$Date$$
  */
-public class HttpSessionScopeObjectFactory implements ObjectFactory<HttpSessionScopeContext> {
+public class HttpSessionScopeObjectFactory implements ObjectFactory<HttpSessionScopeContainer> {
 
-    public HttpSessionScopeContext getInstance() throws ObjectCreationException {
-        return new HttpSessionScopeContext();
+    public HttpSessionScopeContainer getInstance() throws ObjectCreationException {
+        return new HttpSessionScopeContainer();
     }
 }

Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeContainer.java (from r412206, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeContext.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeContainer.java?p2=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeContainer.java&p1=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeContext.java&r1=412206&r2=412208&rev=412208&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeContainer.java Tue Jun  6 13:47:19 2006
@@ -22,18 +22,18 @@
  *
  * @version $Rev$ $Date$
  */
-public class ModuleScopeContext extends AbstractScopeContext {
+public class ModuleScopeContainer extends AbstractScopeContainer {
 
     private final Map<AtomicComponent, InstanceWrapper> instanceContexts;
     // the queue of instanceContexts to destroy, in the order that their instances were created
     private final List<InstanceWrapper> destroyQueue;
     private static final InstanceWrapper EMPTY = new EmptyWrapper();
 
-    public ModuleScopeContext() {
+    public ModuleScopeContainer() {
         this(null);
     }
 
-    public ModuleScopeContext(WorkContext workContext) {
+    public ModuleScopeContainer(WorkContext workContext) {
         super("Module Scope", workContext);
         instanceContexts = new ConcurrentHashMap<AtomicComponent, InstanceWrapper>();
         destroyQueue = new ArrayList<InstanceWrapper>();

Propchange: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeContainer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeContainer.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactory.java?rev=412208&r1=412207&r2=412208&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactory.java Tue Jun  6 13:47:19 2006
@@ -8,9 +8,9 @@
  *
  * @version $$Rev$$ $$Date$$
  */
-public class ModuleScopeObjectFactory implements ObjectFactory<ModuleScopeContext> {
+public class ModuleScopeObjectFactory implements ObjectFactory<ModuleScopeContainer> {
 
-    public ModuleScopeContext getInstance() throws ObjectCreationException {
-        return new ModuleScopeContext();
+    public ModuleScopeContainer getInstance() throws ObjectCreationException {
+        return new ModuleScopeContainer();
     }
 }

Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeContainer.java (from r412206, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeContext.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeContainer.java?p2=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeContainer.java&p1=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeContext.java&r1=412206&r2=412208&rev=412208&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeContainer.java Tue Jun  6 13:47:19 2006
@@ -20,16 +20,16 @@
  *
  * @version $Rev$ $Date$
  */
-public class RequestScopeContext extends AbstractScopeContext {
+public class RequestScopeContainer extends AbstractScopeContainer {
 
     private final Map<AtomicComponent, Map<Thread, InstanceWrapper>> contexts;
     private final Map<Thread, List<InstanceWrapper>> destroyQueues;
 
-    public RequestScopeContext() {
+    public RequestScopeContainer() {
         this(null);
     }
 
-    public RequestScopeContext(WorkContext workContext) {
+    public RequestScopeContainer(WorkContext workContext) {
         super("Request Scope", workContext);
         contexts = new ConcurrentHashMap<AtomicComponent, Map<Thread, InstanceWrapper>>();
         destroyQueues = new ConcurrentHashMap<Thread, List<InstanceWrapper>>();

Propchange: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeContainer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeContainer.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org


Mime
View raw message