You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tuscany.apache.org by Raymond Feng <en...@gmail.com> on 2006/06/03 06:33:18 UTC
Re: svn commit: r411373 [1/2] - in /incubator/tuscany/sandbox/jboynes/sca: containers/container.java/src/test/java/org/apache/tuscany/container/java/ containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/context/ core2/src/m
Hi, Jim.
A lot of files cannot compile any more with your check-in. There're still a
lot of dangling references to org.apache.tuscany.spi.context instead of
org.apache.tuscany.spi.component.
Thanks,
Raymond
----- Original Message -----
From: <jm...@apache.org>
To: <tu...@ws.apache.org>
Sent: Friday, June 02, 2006 8:52 PM
Subject: svn commit: r411373 [1/2] - in
/incubator/tuscany/sandbox/jboynes/sca:
containers/container.java/src/test/java/org/apache/tuscany/container/java/
containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/context/
core2/src/m...
> Author: jmarino
> Date: Fri Jun 2 20:52:57 2006
> New Revision: 411373
>
> URL: http://svn.apache.org/viewvc?rev=411373&view=rev
> Log:
> more package refactors
>
> Added:
>
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/CompositeEvent.java
> - copied, changed from r411370,
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/ModuleEvent.java
>
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/CompositeStart.java
> - copied, changed from r411370,
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/ModuleStart.java
>
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/CompositeStop.java
> - copied, changed from r411370,
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/ModuleStop.java
>
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/
>
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/ObjectRegistrationException.java
> - copied, changed from r411369,
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/ObjectRegistrationException.java
>
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemAtomicComponent.java
> - copied, changed from r411369,
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemAtomicComponent.java
>
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemAtomicComponentImpl.java
> - copied, changed from r411370,
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemAtomicComponentImpl.java
>
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemCompositeComponent.java
> - copied, changed from r411370,
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemCompositeComponent.java
>
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemCompositeComponentImpl.java
> - copied, changed from r411370,
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemCompositeComponentImpl.java
>
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemReference.java
> - copied, changed from r411369,
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemReference.java
>
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemReferenceImpl.java
> - copied, changed from r411369,
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemReferenceImpl.java
>
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemService.java
> - copied, changed from r411369,
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemService.java
>
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemServiceImpl.java
> - copied, changed from r411369,
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemServiceImpl.java
>
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemSingletonAtomicComponent.java
> - copied, changed from r411369,
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemSingletonAtomicComponent.java
>
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemWireObjectFactory.java
> - copied, changed from r411369,
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemWireObjectFactory.java
>
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/
>
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/AutowireTestCase.java
> - copied, changed from r411369,
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/AutowireTestCase.java
>
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/ChildLocateTestCase.java
> - copied, changed from r411369,
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/ChildLocateTestCase.java
>
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/CompositePropagationTestCase.java
> - copied, changed from r411369,
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/CompositePropagationTestCase.java
>
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/DuplicateRegistrationTestCase.java
> - copied, changed from r411369,
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/DuplicateRegistrationTestCase.java
>
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/SystemAtomicComponentTestCase.java
> - copied, changed from r411369,
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/SystemAtomicComponentTestCase.java
>
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/SystemCompositeComponentResolutionTestCase.java
> - copied, changed from r411369,
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeComponentResolutionTestCase.java
>
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/SystemCompositeComponentTestCase.java
> (contents, props changed)
> - copied, changed from r411370,
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeComponentTestCase.java
>
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/SystemCompositeLifecycleTestCase.java
> - copied, changed from r411369,
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/SystemCompositeLifecycleTestCase.java
>
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/SystemObjectRegistrationTestCase.java
> - copied, changed from r411370,
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/SystemObjectRegistrationTestCase.java
> Removed:
>
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/ModuleEvent.java
>
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/ModuleStart.java
>
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/ModuleStop.java
>
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/
>
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/
>
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/
>
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/
> Modified:
>
> incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/MultiplicityTestCase.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/core2/src/main/java/org/apache/tuscany/core/bootstrap/DefaultRuntime.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/scope/ModuleScopeContext.java
>
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemBindingBuilder.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/builder/SystemCompositeBuilder.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/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/wire/AtomicComponentWireInvocationTestCase.java
>
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/SystemServiceComponentWireTestCase.java
>
> Modified:
> incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/MultiplicityTestCase.java
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/MultiplicityTestCase.java?rev=411373&r1=411372&r2=411373&view=diff
> ==============================================================================
> ---
> incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/MultiplicityTestCase.java
> (original)
> +++
> incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/MultiplicityTestCase.java
> Fri Jun 2 20:52:57 2006
> @@ -27,7 +27,7 @@
> // CompositeComponent context = createContext();
> // context.start();
> //
> context.registerModelObject(MockContextFactory.createModuleWithWiredComponents(Scope.MODULE,
> Scope.MODULE));
> -// context.publish(new ModuleStart(this));
> +// context.publish(new CompositeStart(this));
> // Source source = (Source) ((AtomicComponent)
> context.getContext("source")).getTargetInstance();
> // Assert.assertNotNull(source);
> // Target target = (Target)
> ((AtomicComponent)context.getContext("target")).getTargetInstance();
>
> 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=411373&r1=411372&r2=411373&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
> Fri Jun 2 20:52:57 2006
> @@ -16,8 +16,8 @@
> import org.apache.tuscany.core.component.scope.HttpSessionScopeContext;
> import org.apache.tuscany.core.component.event.HttpSessionEnd;
> import org.apache.tuscany.core.component.event.HttpSessionStart;
> -import org.apache.tuscany.core.component.event.ModuleStart;
> -import org.apache.tuscany.core.component.event.ModuleStop;
> +import org.apache.tuscany.core.component.event.CompositeStart;
> +import org.apache.tuscany.core.component.event.CompositeStop;
> import org.apache.tuscany.core.component.event.RequestEnd;
> import org.apache.tuscany.core.component.event.RequestStart;
> import org.apache.tuscany.core.component.scope.ModuleScopeContext;
> @@ -134,7 +134,7 @@
>
> ModuleScopeContext scope = new ModuleScopeContext(workContext);
> scope.start();
> - scope.onEvent(new ModuleStart(this, null));
> + scope.onEvent(new CompositeStart(this, null));
> final OutboundWire<Target> wire = getWire(scope);
> Target service = wireService.createProxy(wire);
> Target target = wireService.createProxy(wire);
> @@ -142,7 +142,7 @@
> service.setString("foo");
> assertEquals("foo", service.getString());
> assertEquals("foo", target.getString());
> - scope.onEvent(new ModuleStop(this, null));
> + scope.onEvent(new CompositeStop(this, null));
> scope.stop();
> }
>
>
> 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=411373&r1=411372&r2=411373&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
> Fri Jun 2 20:52:57 2006
> @@ -32,8 +32,8 @@
> import org.apache.tuscany.core.component.scope.HttpSessionScopeContext;
> import org.apache.tuscany.core.component.event.HttpSessionEnd;
> import org.apache.tuscany.core.component.event.HttpSessionStart;
> -import org.apache.tuscany.core.component.event.ModuleStart;
> -import org.apache.tuscany.core.component.event.ModuleStop;
> +import org.apache.tuscany.core.component.event.CompositeStart;
> +import org.apache.tuscany.core.component.event.CompositeStop;
> import org.apache.tuscany.core.component.event.RequestEnd;
> import org.apache.tuscany.core.component.event.RequestStart;
> import org.apache.tuscany.core.component.scope.ModuleScopeContext;
> @@ -62,7 +62,7 @@
> scope.start();
>
> Map<String, AtomicComponent> contexts =
> MockContextFactory.createWiredContexts("source", SourceImpl.class, scope,
> members, "target", Target.class, TargetImpl.class, scope);
> - scope.onEvent(new ModuleStart(this, null));
> + scope.onEvent(new CompositeStart(this, null));
> AtomicComponent<Source> sourceComponent =
> (AtomicComponent<Source>) contexts.get("source");
> AtomicComponent<Target> targetComponent =
> (AtomicComponent<Target>) contexts.get("target");
> Source source = sourceComponent.getService();
> @@ -72,7 +72,7 @@
> target.setString("foo");
> assertTrue(Proxy.isProxyClass(source.getTarget().getClass()));
> assertEquals("foo", source.getTarget().getString());
> - scope.onEvent(new ModuleStop(this, null));
> + scope.onEvent(new CompositeStop(this, null));
> scope.stop();
> }
>
> @@ -89,7 +89,7 @@
>
> Map<String, AtomicComponent> contexts =
> MockContextFactory.createWiredContexts("source", SourceImpl.class,
> moduleScope, members, "target", Target.class,
> TargetImpl.class, sessionScope);
> - moduleScope.onEvent(new ModuleStart(this, null));
> + moduleScope.onEvent(new CompositeStart(this, null));
> Object session1 = new Object();
> ctx.setIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER,
> session1);
> sessionScope.onEvent(new HttpSessionStart(this, session1));
> @@ -120,7 +120,7 @@
> sessionScope.onEvent(new HttpSessionEnd(this, session2));
>
> ctx.clearIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER);
> - moduleScope.onEvent(new ModuleStop(this, null));
> + moduleScope.onEvent(new CompositeStop(this, null));
> sessionScope.stop();
> moduleScope.stop();
> }
> @@ -138,7 +138,7 @@
>
> Map<String, AtomicComponent> contexts =
> MockContextFactory.createWiredContexts("source", SourceImpl.class,
> moduleScope, members, "target", Target.class,
> TargetImpl.class, requestScope);
> - moduleScope.onEvent(new ModuleStart(this, null));
> + moduleScope.onEvent(new CompositeStart(this, null));
> requestScope.onEvent(new RequestStart(this));
>
> AtomicComponent<Source> sourceComponent =
> (AtomicComponent<Source>) contexts.get("source");
> @@ -169,7 +169,7 @@
> future.get();
> assertEquals("foo", source.getTarget().getString());
> requestScope.onEvent(new RequestEnd(this));
> - moduleScope.onEvent(new ModuleStop(this,null));
> + moduleScope.onEvent(new CompositeStop(this,null));
> requestScope.stop();
> moduleScope.stop();
> }
> @@ -187,7 +187,7 @@
>
> Map<String, AtomicComponent> contexts =
> MockContextFactory.createWiredContexts("source", SourceImpl.class,
> moduleScope, members, "target", Target.class,
> TargetImpl.class, statelessScope);
> - moduleScope.onEvent(new ModuleStart(this, null));
> + moduleScope.onEvent(new CompositeStart(this, null));
>
> AtomicComponent<Source> sourceComponent =
> (AtomicComponent<Source>) contexts.get("source");
> AtomicComponent<Target> targetComponent =
> (AtomicComponent<Target>) contexts.get("target");
> @@ -202,7 +202,7 @@
> assertFalse("foo".equals(target2.getString()));
> source.getTarget().setString("bar");
> assertFalse("bar".equals(source.getTarget().getString()));
> - moduleScope.onEvent(new ModuleStop(this, null));
> + moduleScope.onEvent(new CompositeStop(this, null));
> moduleScope.stop();
> statelessScope.stop();
> }
> @@ -268,7 +268,7 @@
>
> Map<String, AtomicComponent> contexts =
> MockContextFactory.createWiredContexts("source", SourceImpl.class,
> sessionScope, members, "target", Target.class,
> TargetImpl.class, moduleScope);
> - moduleScope.onEvent(new ModuleStart(this, null));
> + moduleScope.onEvent(new CompositeStart(this, null));
> Object session1 = new Object();
> ctx.setIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER,
> session1);
> sessionScope.onEvent(new HttpSessionStart(this, session1));
> @@ -447,7 +447,7 @@
> final ScopeContext moduleScope = new ModuleScopeContext(ctx);
> requestScope.start();
> moduleScope.start();
> - moduleScope.onEvent(new ModuleStart(this, null));
> + moduleScope.onEvent(new CompositeStart(this, null));
>
> Map<String, AtomicComponent> contexts =
> MockContextFactory.createWiredContexts("source", SourceImpl.class,
> requestScope, members, "target", Target.class,
> TargetImpl.class, moduleScope);
> @@ -484,7 +484,7 @@
>
> requestScope.onEvent(new RequestEnd(this));
> requestScope.stop();
> - moduleScope.onEvent(new ModuleStop(this, null));
> + moduleScope.onEvent(new CompositeStop(this, null));
> moduleScope.stop();
> }
>
> @@ -710,7 +710,7 @@
>
> Map<String, AtomicComponent> contexts =
> MockContextFactory.createWiredContexts("source", SourceImpl.class,
> statelessScope, members, "target", Target.class,
> TargetImpl.class, moduleScope);
> - moduleScope.onEvent(new ModuleStart(this, null));
> + moduleScope.onEvent(new CompositeStart(this, null));
> AtomicComponent<Source> sourceComponent =
> (AtomicComponent<Source>) contexts.get("source");
> AtomicComponent<Target> targetComponent =
> (AtomicComponent<Target>) contexts.get("target");
> Source source = sourceComponent.getService();
> @@ -734,7 +734,7 @@
> assertEquals("bar", target2.getString());
> assertEquals("bar", source.getTarget().getString());
>
> - moduleScope.onEvent(new ModuleStop(this, null));
> + moduleScope.onEvent(new CompositeStop(this, null));
> moduleScope.stop();
> statelessScope.stop();
> }
>
> Modified:
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/bootstrap/DefaultRuntime.java
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/bootstrap/DefaultRuntime.java?rev=411373&r1=411372&r2=411373&view=diff
> ==============================================================================
> ---
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/bootstrap/DefaultRuntime.java
> (original)
> +++
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/bootstrap/DefaultRuntime.java
> Fri Jun 2 20:52:57 2006
> @@ -16,8 +16,8 @@
> */
> package org.apache.tuscany.core.bootstrap;
>
> -import org.apache.tuscany.core.system.context.SystemCompositeComponent;
> -import
> org.apache.tuscany.core.system.context.SystemCompositeComponentImpl;
> +import org.apache.tuscany.core.system.component.SystemCompositeComponent;
> +import
> org.apache.tuscany.core.system.component.SystemCompositeComponentImpl;
> import org.apache.tuscany.spi.bootstrap.RuntimeComponent;
> import org.apache.tuscany.spi.bootstrap.ComponentNames;
> import org.apache.tuscany.spi.context.CompositeComponent;
>
> 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=411373&r1=411372&r2=411373&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
> Fri Jun 2 20:52:57 2006
> @@ -7,7 +7,7 @@
> import java.util.concurrent.CountDownLatch;
> import java.util.concurrent.TimeUnit;
>
> -import org.apache.tuscany.core.system.context.SystemService;
> +import org.apache.tuscany.core.system.component.SystemService;
> import org.apache.tuscany.spi.CoreRuntimeException;
> import org.apache.tuscany.spi.annotation.Autowire;
> import org.apache.tuscany.spi.context.AtomicComponent;
>
> Copied:
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/CompositeEvent.java
> (from r411370,
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/ModuleEvent.java)
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/CompositeEvent.java?p2=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/CompositeEvent.java&p1=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/ModuleEvent.java&r1=411370&r2=411373&rev=411373&view=diff
> ==============================================================================
> ---
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/ModuleEvent.java
> (original)
> +++
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/CompositeEvent.java
> Fri Jun 2 20:52:57 2006
> @@ -4,12 +4,12 @@
> import org.apache.tuscany.spi.context.CompositeComponent;
>
> /**
> - * Implemented by runtime events associated with a module, e.g. lifecycle
> events
> + * Implemented by runtime events associated with a composite, e.g.
> lifecycle events
> *
> * @version $$Rev$$ $$Date$$
> */
> -public interface ModuleEvent extends Event {
> +public interface CompositeEvent extends Event {
>
> - public CompositeComponent getContext();
> + public CompositeComponent getComposite();
>
> }
>
> Copied:
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/CompositeStart.java
> (from r411370,
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/ModuleStart.java)
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/CompositeStart.java?p2=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/CompositeStart.java&p1=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/ModuleStart.java&r1=411370&r2=411373&rev=411373&view=diff
> ==============================================================================
> ---
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/ModuleStart.java
> (original)
> +++
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/CompositeStart.java
> Fri Jun 2 20:52:57 2006
> @@ -2,14 +2,14 @@
>
> import org.apache.tuscany.spi.context.CompositeComponent;
> import org.apache.tuscany.core.component.event.AbstractEvent;
> -import org.apache.tuscany.core.component.event.ModuleEvent;
> +import org.apache.tuscany.core.component.event.CompositeEvent;
>
> /**
> - * Propagated when a module starts
> + * Propagated when a composite starts
> *
> * @version $$Rev$$ $$Date$$
> */
> -public class ModuleStart extends AbstractEvent implements ModuleEvent {
> +public class CompositeStart extends AbstractEvent implements
> CompositeEvent {
>
> private CompositeComponent component;
>
> @@ -18,12 +18,12 @@
> * @param source the source of the event
> * @param ctx the composite component associated the module being
> stopped
> */
> - public ModuleStart(Object source, CompositeComponent ctx) {
> + public CompositeStart(Object source, CompositeComponent ctx) {
> super(source);
> component = ctx;
> }
>
> - public CompositeComponent getContext(){
> + public CompositeComponent getComposite(){
> return component;
> }
>
>
> Copied:
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/CompositeStop.java
> (from r411370,
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/ModuleStop.java)
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/CompositeStop.java?p2=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/CompositeStop.java&p1=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/ModuleStop.java&r1=411370&r2=411373&rev=411373&view=diff
> ==============================================================================
> ---
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/ModuleStop.java
> (original)
> +++
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/CompositeStop.java
> Fri Jun 2 20:52:57 2006
> @@ -2,14 +2,14 @@
>
> import org.apache.tuscany.spi.context.CompositeComponent;
> import org.apache.tuscany.core.component.event.AbstractEvent;
> -import org.apache.tuscany.core.component.event.ModuleEvent;
> +import org.apache.tuscany.core.component.event.CompositeEvent;
>
> /**
> - * Propagated when a module stops
> + * Propagated when a composite stops
> *
> * @version $$Rev$$ $$Date$$
> */
> -public class ModuleStop extends AbstractEvent implements ModuleEvent {
> +public class CompositeStop extends AbstractEvent implements
> CompositeEvent {
>
> private CompositeComponent component;
>
> @@ -18,12 +18,12 @@
> * @param source the source of the event
> * @param ctx the composite component associated the module being
> stopped
> */
> - public ModuleStop(Object source, CompositeComponent ctx) {
> + public CompositeStop(Object source, CompositeComponent ctx) {
> super(source);
> component = ctx;
> }
>
> - public CompositeComponent getContext(){
> + public CompositeComponent getComposite(){
> return component;
> }
> }
>
> Modified:
> 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/ModuleScopeContext.java?rev=411373&r1=411372&r2=411373&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/ModuleScopeContext.java
> Fri Jun 2 20:52:57 2006
> @@ -7,8 +7,8 @@
> import java.util.concurrent.ConcurrentHashMap;
>
> import org.apache.tuscany.spi.AbstractLifecycle;
> -import org.apache.tuscany.core.component.event.ModuleStart;
> -import org.apache.tuscany.core.component.event.ModuleStop;
> +import org.apache.tuscany.core.component.event.CompositeStart;
> +import org.apache.tuscany.core.component.event.CompositeStop;
> import org.apache.tuscany.core.component.scope.AbstractScopeContext;
> import org.apache.tuscany.spi.model.Scope;
> import org.apache.tuscany.spi.CoreRuntimeException;
> @@ -47,10 +47,10 @@
>
> public void onEvent(Event event) {
> checkInit();
> - if (event instanceof ModuleStart) {
> + if (event instanceof CompositeStart) {
> eagerInitContexts();
> lifecycleState = RUNNING;
> - } else if (event instanceof ModuleStop) {
> + } else if (event instanceof CompositeStop) {
> shutdownContexts();
> }
> }
>
> Modified:
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemBindingBuilder.java
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemBindingBuilder.java?rev=411373&r1=411372&r2=411373&view=diff
> ==============================================================================
> ---
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemBindingBuilder.java
> (original)
> +++
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemBindingBuilder.java
> Fri Jun 2 20:52:57 2006
> @@ -1,9 +1,9 @@
> package org.apache.tuscany.core.system.builder;
>
> import org.apache.tuscany.core.component.AutowireComponent;
> -import org.apache.tuscany.core.system.context.SystemReferenceImpl;
> -import org.apache.tuscany.core.system.context.SystemService;
> -import org.apache.tuscany.core.system.context.SystemServiceImpl;
> +import org.apache.tuscany.core.system.component.SystemReferenceImpl;
> +import org.apache.tuscany.core.system.component.SystemService;
> +import org.apache.tuscany.core.system.component.SystemServiceImpl;
> import org.apache.tuscany.core.system.model.SystemBinding;
> import org.apache.tuscany.core.system.wire.SystemInboundWireImpl;
> import org.apache.tuscany.core.system.wire.SystemOutboundAutowire;
>
> Modified:
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemComponentBuilder.java
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemComponentBuilder.java?rev=411373&r1=411372&r2=411373&view=diff
> ==============================================================================
> ---
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemComponentBuilder.java
> (original)
> +++
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemComponentBuilder.java
> Fri Jun 2 20:52:57 2006
> @@ -11,8 +11,8 @@
> import org.apache.tuscany.core.injection.Injector;
> import org.apache.tuscany.core.injection.PojoObjectFactory;
> import org.apache.tuscany.core.model.PojoComponentType;
> -import org.apache.tuscany.core.system.context.SystemAtomicComponent;
> -import org.apache.tuscany.core.system.context.SystemAtomicComponentImpl;
> +import org.apache.tuscany.core.system.component.SystemAtomicComponent;
> +import
> org.apache.tuscany.core.system.component.SystemAtomicComponentImpl;
> import org.apache.tuscany.core.system.model.SystemImplementation;
> import org.apache.tuscany.core.system.wire.SystemInboundWireImpl;
> import org.apache.tuscany.core.system.wire.SystemOutboundAutowire;
>
> Modified:
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemCompositeBuilder.java
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemCompositeBuilder.java?rev=411373&r1=411372&r2=411373&view=diff
> ==============================================================================
> ---
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemCompositeBuilder.java
> (original)
> +++
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemCompositeBuilder.java
> Fri Jun 2 20:52:57 2006
> @@ -17,8 +17,8 @@
> package org.apache.tuscany.core.system.builder;
>
> import org.apache.tuscany.core.component.AutowireComponent;
> -import org.apache.tuscany.core.system.context.SystemCompositeComponent;
> -import
> org.apache.tuscany.core.system.context.SystemCompositeComponentImpl;
> +import org.apache.tuscany.core.system.component.SystemCompositeComponent;
> +import
> org.apache.tuscany.core.system.component.SystemCompositeComponentImpl;
> import org.apache.tuscany.core.system.model.SystemCompositeImplementation;
> import org.apache.tuscany.spi.annotation.Autowire;
> import org.apache.tuscany.spi.builder.BuilderConfigException;
>
> Copied:
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/ObjectRegistrationException.java
> (from r411369,
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/ObjectRegistrationException.java)
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/ObjectRegistrationException.java?p2=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/ObjectRegistrationException.java&p1=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/ObjectRegistrationException.java&r1=411369&r2=411373&rev=411373&view=diff
> ==============================================================================
> ---
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/ObjectRegistrationException.java
> (original)
> +++
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/ObjectRegistrationException.java
> Fri Jun 2 20:52:57 2006
> @@ -1,4 +1,4 @@
> -package org.apache.tuscany.core.system.context;
> +package org.apache.tuscany.core.system.component;
>
> import org.apache.tuscany.spi.context.ComponentRuntimeException;
>
>
> Copied:
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemAtomicComponent.java
> (from r411369,
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemAtomicComponent.java)
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemAtomicComponent.java?p2=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemAtomicComponent.java&p1=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemAtomicComponent.java&r1=411369&r2=411373&rev=411373&view=diff
> ==============================================================================
> ---
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemAtomicComponent.java
> (original)
> +++
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemAtomicComponent.java
> Fri Jun 2 20:52:57 2006
> @@ -1,4 +1,4 @@
> -package org.apache.tuscany.core.system.context;
> +package org.apache.tuscany.core.system.component;
>
> import org.apache.tuscany.spi.context.AtomicComponent;
> import org.apache.tuscany.spi.context.TargetException;
>
> Copied:
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemAtomicComponentImpl.java
> (from r411370,
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemAtomicComponentImpl.java)
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemAtomicComponentImpl.java?p2=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemAtomicComponentImpl.java&p1=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemAtomicComponentImpl.java&r1=411370&r2=411373&rev=411373&view=diff
> ==============================================================================
> ---
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemAtomicComponentImpl.java
> (original)
> +++
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemAtomicComponentImpl.java
> Fri Jun 2 20:52:57 2006
> @@ -1,4 +1,4 @@
> -package org.apache.tuscany.core.system.context;
> +package org.apache.tuscany.core.system.component;
>
> import java.lang.reflect.Field;
> import java.lang.reflect.Member;
> @@ -16,6 +16,7 @@
> import org.apache.tuscany.core.injection.ListMultiplicityObjectFactory;
> import org.apache.tuscany.core.injection.MethodInjector;
> import org.apache.tuscany.core.system.wire.SystemOutboundWire;
> +import org.apache.tuscany.core.system.component.SystemAtomicComponent;
> import org.apache.tuscany.spi.ObjectFactory;
> import org.apache.tuscany.spi.context.CompositeComponent;
> import org.apache.tuscany.spi.context.ScopeContext;
>
> Copied:
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemCompositeComponent.java
> (from r411370,
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemCompositeComponent.java)
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemCompositeComponent.java?p2=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemCompositeComponent.java&p1=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemCompositeComponent.java&r1=411370&r2=411373&rev=411373&view=diff
> ==============================================================================
> ---
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemCompositeComponent.java
> (original)
> +++
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemCompositeComponent.java
> Fri Jun 2 20:52:57 2006
> @@ -1,6 +1,7 @@
> -package org.apache.tuscany.core.system.context;
> +package org.apache.tuscany.core.system.component;
>
> import org.apache.tuscany.core.component.AutowireComponent;
> +import
> org.apache.tuscany.core.system.component.ObjectRegistrationException;
>
> /**
> * Marker type for system composite contexts
>
> Copied:
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemCompositeComponentImpl.java
> (from r411370,
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemCompositeComponentImpl.java)
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemCompositeComponentImpl.java?p2=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemCompositeComponentImpl.java&p1=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemCompositeComponentImpl.java&r1=411370&r2=411373&rev=411373&view=diff
> ==============================================================================
> ---
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemCompositeComponentImpl.java
> (original)
> +++
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemCompositeComponentImpl.java
> Fri Jun 2 20:52:57 2006
> @@ -1,8 +1,10 @@
> -package org.apache.tuscany.core.system.context;
> +package org.apache.tuscany.core.system.component;
>
> import org.apache.tuscany.core.component.AbstractCompositeComponent;
> import org.apache.tuscany.core.component.AutowireComponent;
> import org.apache.tuscany.core.component.AutowireResolutionException;
> +import
> org.apache.tuscany.core.system.component.ObjectRegistrationException;
> +import org.apache.tuscany.core.system.component.SystemCompositeComponent;
> import org.apache.tuscany.spi.context.CompositeComponent;
>
> /**
>
> Copied:
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemReference.java
> (from r411369,
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemReference.java)
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemReference.java?p2=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemReference.java&p1=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemReference.java&r1=411369&r2=411373&rev=411373&view=diff
> ==============================================================================
> ---
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemReference.java
> (original)
> +++
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemReference.java
> Fri Jun 2 20:52:57 2006
> @@ -1,4 +1,4 @@
> -package org.apache.tuscany.core.system.context;
> +package org.apache.tuscany.core.system.component;
>
> import org.apache.tuscany.spi.context.Reference;
>
>
> Copied:
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemReferenceImpl.java
> (from r411369,
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemReferenceImpl.java)
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemReferenceImpl.java?p2=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemReferenceImpl.java&p1=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemReferenceImpl.java&r1=411369&r2=411373&rev=411373&view=diff
> ==============================================================================
> ---
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemReferenceImpl.java
> (original)
> +++
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemReferenceImpl.java
> Fri Jun 2 20:52:57 2006
> @@ -1,9 +1,10 @@
> -package org.apache.tuscany.core.system.context;
> +package org.apache.tuscany.core.system.component;
>
> import java.lang.reflect.Method;
>
> import org.apache.tuscany.core.system.wire.SystemInboundWire;
> import org.apache.tuscany.core.system.wire.SystemOutboundWire;
> +import org.apache.tuscany.core.system.component.SystemReference;
> import org.apache.tuscany.spi.context.AbstractSCAObject;
> import org.apache.tuscany.spi.context.CompositeComponent;
> import org.apache.tuscany.spi.context.TargetException;
>
> Copied:
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemService.java
> (from r411369,
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemService.java)
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemService.java?p2=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemService.java&p1=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemService.java&r1=411369&r2=411373&rev=411373&view=diff
> ==============================================================================
> ---
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemService.java
> (original)
> +++
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemService.java
> Fri Jun 2 20:52:57 2006
> @@ -1,4 +1,4 @@
> -package org.apache.tuscany.core.system.context;
> +package org.apache.tuscany.core.system.component;
>
> import org.apache.tuscany.spi.context.Service;
>
>
> Copied:
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemServiceImpl.java
> (from r411369,
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemServiceImpl.java)
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemServiceImpl.java?p2=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemServiceImpl.java&p1=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemServiceImpl.java&r1=411369&r2=411373&rev=411373&view=diff
> ==============================================================================
> ---
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemServiceImpl.java
> (original)
> +++
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemServiceImpl.java
> Fri Jun 2 20:52:57 2006
> @@ -1,7 +1,8 @@
> -package org.apache.tuscany.core.system.context;
> +package org.apache.tuscany.core.system.component;
>
> import org.apache.tuscany.core.system.wire.SystemInboundWire;
> import org.apache.tuscany.core.system.wire.SystemOutboundWire;
> +import org.apache.tuscany.core.system.component.SystemService;
> import org.apache.tuscany.spi.CoreRuntimeException;
> import org.apache.tuscany.spi.context.AbstractSCAObject;
> import org.apache.tuscany.spi.context.CompositeComponent;
>
> Copied:
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemSingletonAtomicComponent.java
> (from r411369,
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemSingletonAtomicComponent.java)
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemSingletonAtomicComponent.java?p2=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemSingletonAtomicComponent.java&p1=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemSingletonAtomicComponent.java&r1=411369&r2=411373&rev=411373&view=diff
> ==============================================================================
> ---
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemSingletonAtomicComponent.java
> (original)
> +++
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemSingletonAtomicComponent.java
> Fri Jun 2 20:52:57 2006
> @@ -1,4 +1,4 @@
> -package org.apache.tuscany.core.system.context;
> +package org.apache.tuscany.core.system.component;
>
> import java.lang.reflect.Method;
> import java.util.ArrayList;
> @@ -14,6 +14,7 @@
> import org.apache.tuscany.spi.wire.OutboundWire;
> import org.apache.tuscany.spi.wire.TargetInvoker;
> import org.apache.tuscany.spi.wire.InboundWire;
> +import org.apache.tuscany.core.system.component.SystemAtomicComponent;
>
> /**
> * An {@link org.apache.tuscany.spi.context.AtomicComponent} used when
> registering objects directly into a
>
> Copied:
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemWireObjectFactory.java
> (from r411369,
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemWireObjectFactory.java)
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemWireObjectFactory.java?p2=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemWireObjectFactory.java&p1=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemWireObjectFactory.java&r1=411369&r2=411373&rev=411373&view=diff
> ==============================================================================
> ---
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemWireObjectFactory.java
> (original)
> +++
> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemWireObjectFactory.java
> Fri Jun 2 20:52:57 2006
> @@ -1,4 +1,4 @@
> -package org.apache.tuscany.core.system.context;
> +package org.apache.tuscany.core.system.component;
>
> import org.apache.tuscany.core.system.wire.SystemOutboundWire;
> import org.apache.tuscany.spi.ObjectCreationException;
>
> Modified:
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/BasicHttpSessionScopeTestCase.java
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/BasicHttpSessionScopeTestCase.java?rev=411373&r1=411372&r2=411373&view=diff
> ==============================================================================
> ---
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/BasicHttpSessionScopeTestCase.java
> (original)
> +++
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/BasicHttpSessionScopeTestCase.java
> Fri Jun 2 20:52:57 2006
> @@ -8,8 +8,8 @@
> import org.apache.tuscany.core.injection.MethodEventInvoker;
> import org.apache.tuscany.core.injection.PojoObjectFactory;
> import
> org.apache.tuscany.core.mock.component.SessionScopeInitDestroyComponent;
> -import org.apache.tuscany.core.system.context.SystemAtomicComponent;
> -import org.apache.tuscany.core.system.context.SystemAtomicComponentImpl;
> +import org.apache.tuscany.core.system.component.SystemAtomicComponent;
> +import
> org.apache.tuscany.core.system.component.SystemAtomicComponentImpl;
> import org.apache.tuscany.spi.ObjectFactory;
> import org.apache.tuscany.spi.context.WorkContext;
> import org.apache.tuscany.spi.context.ScopeContext;
>
> Modified:
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/BasicModuleScopeTestCase.java
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/BasicModuleScopeTestCase.java?rev=411373&r1=411372&r2=411373&view=diff
> ==============================================================================
> ---
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/BasicModuleScopeTestCase.java
> (original)
> +++
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/BasicModuleScopeTestCase.java
> Fri Jun 2 20:52:57 2006
> @@ -3,13 +3,13 @@
> import junit.framework.TestCase;
> import org.apache.tuscany.core.component.WorkContextImpl;
> import org.apache.tuscany.core.component.scope.ModuleScopeContext;
> -import org.apache.tuscany.core.component.event.ModuleStop;
> +import org.apache.tuscany.core.component.event.CompositeStop;
> import org.apache.tuscany.core.injection.EventInvoker;
> import org.apache.tuscany.core.injection.MethodEventInvoker;
> import org.apache.tuscany.core.injection.PojoObjectFactory;
> import
> org.apache.tuscany.core.mock.component.ModuleScopeInitDestroyComponent;
> -import org.apache.tuscany.core.system.context.SystemAtomicComponent;
> -import org.apache.tuscany.core.system.context.SystemAtomicComponentImpl;
> +import org.apache.tuscany.core.system.component.SystemAtomicComponent;
> +import
> org.apache.tuscany.core.system.component.SystemAtomicComponentImpl;
> import org.apache.tuscany.spi.ObjectFactory;
> import org.apache.tuscany.spi.context.WorkContext;
> import org.apache.tuscany.spi.context.ScopeContext;
> @@ -34,7 +34,7 @@
> assertFalse(o1.isDestroyed());
> ModuleScopeInitDestroyComponent o2 =
> (ModuleScopeInitDestroyComponent) scopeContext.getInstance(atomicContext);
> assertEquals(o1, o2);
> - scopeContext.onEvent(new ModuleStop(this, null));
> + scopeContext.onEvent(new CompositeStop(this, null));
> assertTrue(o1.isDestroyed());
> scopeContext.stop();
> }
> @@ -53,7 +53,7 @@
>
> ModuleScopeInitDestroyComponent o2 =
> (ModuleScopeInitDestroyComponent) scopeContext.getInstance(atomicContext);
> assertSame(o1, o2);
> - scopeContext.onEvent(new ModuleStop(this, null));
> + scopeContext.onEvent(new CompositeStop(this, null));
> assertTrue(o1.isDestroyed());
> scopeContext.stop();
> }
>
> Modified:
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/BasicRequestScopeTestCase.java
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/BasicRequestScopeTestCase.java?rev=411373&r1=411372&r2=411373&view=diff
> ==============================================================================
> ---
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/BasicRequestScopeTestCase.java
> (original)
> +++
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/BasicRequestScopeTestCase.java
> Fri Jun 2 20:52:57 2006
> @@ -7,8 +7,8 @@
> import org.apache.tuscany.core.injection.MethodEventInvoker;
> import org.apache.tuscany.core.injection.PojoObjectFactory;
> import
> org.apache.tuscany.core.mock.component.RequestScopeInitDestroyComponent;
> -import org.apache.tuscany.core.system.context.SystemAtomicComponent;
> -import org.apache.tuscany.core.system.context.SystemAtomicComponentImpl;
> +import org.apache.tuscany.core.system.component.SystemAtomicComponent;
> +import
> org.apache.tuscany.core.system.component.SystemAtomicComponentImpl;
> import org.apache.tuscany.spi.ObjectFactory;
> import org.apache.tuscany.spi.context.ScopeContext;
>
>
> Modified:
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/BasicStatelessScopeTestCase.java
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/BasicStatelessScopeTestCase.java?rev=411373&r1=411372&r2=411373&view=diff
> ==============================================================================
> ---
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/BasicStatelessScopeTestCase.java
> (original)
> +++
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/BasicStatelessScopeTestCase.java
> Fri Jun 2 20:52:57 2006
> @@ -7,7 +7,7 @@
> import org.apache.tuscany.core.mock.factories.MockContextFactory;
> import org.apache.tuscany.core.mock.component.StatelessComponent;
> import org.apache.tuscany.core.mock.component.StatelessComponentImpl;
> -import org.apache.tuscany.core.system.context.SystemAtomicComponent;
> +import org.apache.tuscany.core.system.component.SystemAtomicComponent;
> import org.apache.tuscany.spi.context.WorkContext;
>
> /**
>
> Modified:
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/DependencyLifecycleTestCase.java
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/DependencyLifecycleTestCase.java?rev=411373&r1=411372&r2=411373&view=diff
> ==============================================================================
> ---
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/DependencyLifecycleTestCase.java
> (original)
> +++
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/DependencyLifecycleTestCase.java
> Fri Jun 2 20:52:57 2006
> @@ -8,8 +8,8 @@
> import org.apache.tuscany.core.component.scope.ModuleScopeContext;
> import org.apache.tuscany.core.component.scope.RequestScopeContext;
> import org.apache.tuscany.core.component.event.HttpSessionEnd;
> -import org.apache.tuscany.core.component.event.ModuleStart;
> -import org.apache.tuscany.core.component.event.ModuleStop;
> +import org.apache.tuscany.core.component.event.CompositeStart;
> +import org.apache.tuscany.core.component.event.CompositeStop;
> import org.apache.tuscany.core.component.event.RequestEnd;
> import org.apache.tuscany.core.component.event.RequestStart;
> import org.apache.tuscany.core.mock.factories.MockContextFactory;
> @@ -40,13 +40,13 @@
> AtomicComponent targetComponent = contexts.get("target");
> scopeCtx.register(sourceComponent);
> scopeCtx.register(targetComponent);
> - scopeCtx.onEvent(new ModuleStart(this, null));
> + scopeCtx.onEvent(new CompositeStart(this, null));
> OrderedDependentPojo source =
> (OrderedDependentPojo)scopeCtx.getInstance(sourceComponent);
> OrderedInitPojo target = (OrderedInitPojo)
> scopeCtx.getInstance(targetComponent);
> assertNotNull(source.getPojo());
> assertNotNull(target);
> assertEquals(2, source.getNumberInstantiated());
> - scopeCtx.onEvent(new ModuleStop(this, null));
> + scopeCtx.onEvent(new CompositeStop(this, null));
> assertEquals(0, source.getNumberInstantiated());
> scopeCtx.stop();
> }
> @@ -59,7 +59,7 @@
> scopeCtx, "target", OrderedInitPojoImpl.class, scopeCtx);
> AtomicComponent sourceComponent = contexts.get("source");
> AtomicComponent targetComponent = contexts.get("target");
> - scopeCtx.onEvent(new ModuleStart(this, null));
> + scopeCtx.onEvent(new CompositeStart(this, null));
> scopeCtx.register(sourceComponent);
> scopeCtx.register(targetComponent);
> OrderedDependentPojo source = (OrderedDependentPojo)
> scopeCtx.getInstance(sourceComponent);
> @@ -67,7 +67,7 @@
> assertNotNull(source.getPojo());
> assertNotNull(target);
> assertEquals(2, source.getNumberInstantiated());
> - scopeCtx.onEvent(new ModuleStop(this, null));
> + scopeCtx.onEvent(new CompositeStop(this, null));
> assertEquals(0, source.getNumberInstantiated());
> scopeCtx.stop();
> }
>
> Modified:
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeInstanceLifecycleTestCase.java
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeInstanceLifecycleTestCase.java?rev=411373&r1=411372&r2=411373&view=diff
> ==============================================================================
> ---
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeInstanceLifecycleTestCase.java
> (original)
> +++
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeInstanceLifecycleTestCase.java
> Fri Jun 2 20:52:57 2006
> @@ -13,7 +13,7 @@
> import
> org.apache.tuscany.core.mock.component.RequestScopeDestroyOnlyComponent;
> import
> org.apache.tuscany.core.mock.component.RequestScopeInitDestroyComponent;
> import
> org.apache.tuscany.core.mock.component.RequestScopeInitOnlyComponent;
> -import org.apache.tuscany.core.system.context.SystemAtomicComponent;
> +import org.apache.tuscany.core.system.component.SystemAtomicComponent;
> import org.apache.tuscany.spi.context.WorkContext;
>
> /**
>
> Modified:
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeRestartTestCase.java
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeRestartTestCase.java?rev=411373&r1=411372&r2=411373&view=diff
> ==============================================================================
> ---
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeRestartTestCase.java
> (original)
> +++
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeRestartTestCase.java
> Fri Jun 2 20:52:57 2006
> @@ -10,7 +10,7 @@
> import org.apache.tuscany.core.component.event.HttpSessionEnd;
> import org.apache.tuscany.core.component.event.HttpSessionStart;
> import org.apache.tuscany.core.injection.MethodEventInvoker;
> -import org.apache.tuscany.core.system.context.SystemAtomicComponent;
> +import org.apache.tuscany.core.system.component.SystemAtomicComponent;
> import org.apache.tuscany.core.mock.factories.MockContextFactory;
>
> /**
>
> Modified:
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeInstanceLifecycleTestCase.java
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeInstanceLifecycleTestCase.java?rev=411373&r1=411372&r2=411373&view=diff
> ==============================================================================
> ---
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeInstanceLifecycleTestCase.java
> (original)
> +++
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeInstanceLifecycleTestCase.java
> Fri Jun 2 20:52:57 2006
> @@ -5,8 +5,8 @@
> import junit.framework.TestCase;
> import org.apache.tuscany.core.component.WorkContextImpl;
> import org.apache.tuscany.core.component.scope.ModuleScopeContext;
> -import org.apache.tuscany.core.component.event.ModuleStart;
> -import org.apache.tuscany.core.component.event.ModuleStop;
> +import org.apache.tuscany.core.component.event.CompositeStart;
> +import org.apache.tuscany.core.component.event.CompositeStop;
> import org.apache.tuscany.core.mock.factories.MockContextFactory;
> import
> org.apache.tuscany.core.mock.component.ModuleScopeDestroyOnlyComponent;
> import
> org.apache.tuscany.core.mock.component.ModuleScopeInitDestroyComponent;
> @@ -14,7 +14,7 @@
> import org.apache.tuscany.core.mock.component.OrderedInitPojoImpl;
> import org.apache.tuscany.core.mock.component.OrderedInitPojo;
> import org.apache.tuscany.core.mock.component.OrderedEagerInitPojo;
> -import org.apache.tuscany.core.system.context.SystemAtomicComponent;
> +import org.apache.tuscany.core.system.component.SystemAtomicComponent;
> import org.apache.tuscany.spi.context.WorkContext;
>
> /**
> @@ -38,7 +38,7 @@
> SystemAtomicComponent destroyOnlyContext =
> MockContextFactory.createSystemAtomicContext("DestroyOnly", scope,
> ModuleScopeDestroyOnlyComponent.class);
> destroyOnlyContext.start();
>
> - scope.onEvent(new ModuleStart(this, null));
> + scope.onEvent(new CompositeStart(this, null));
> ModuleScopeInitDestroyComponent initDestroy =
> (ModuleScopeInitDestroyComponent) scope.getInstance(initDestroyContext);
> Assert.assertNotNull(initDestroy);
>
> @@ -54,7 +54,7 @@
> Assert.assertFalse(destroyOnly.isDestroyed());
>
> // expire module
> - scope.onEvent(new ModuleStop(this, null));
> + scope.onEvent(new CompositeStop(this, null));
>
> Assert.assertTrue(initDestroy.isDestroyed());
> Assert.assertTrue(destroyOnly.isDestroyed());
> @@ -74,7 +74,7 @@
> SystemAtomicComponent threeCtx =
> MockContextFactory.createSystemAtomicContext("three", scope,
> OrderedInitPojoImpl.class);
> scope.register(threeCtx);
>
> - scope.onEvent(new ModuleStart(this,null));
> + scope.onEvent(new CompositeStart(this,null));
> OrderedInitPojo one = (OrderedInitPojo) scope.getInstance(oneCtx);
> Assert.assertNotNull(one);
> Assert.assertEquals(1, one.getNumberInstantiated());
> @@ -91,7 +91,7 @@
> Assert.assertEquals(3, three.getInitOrder());
>
> // expire module
> - scope.onEvent(new ModuleStop(this,null));
> + scope.onEvent(new CompositeStop(this,null));
> Assert.assertEquals(0, one.getNumberInstantiated());
> scope.stop();
> }
> @@ -108,7 +108,7 @@
> SystemAtomicComponent threeCtx =
> MockContextFactory.createSystemAtomicContext("three", scope,
> OrderedEagerInitPojo.class);
> scope.register(threeCtx);
>
> - scope.onEvent(new ModuleStart(this,null));
> + scope.onEvent(new CompositeStart(this,null));
> OrderedEagerInitPojo one = (OrderedEagerInitPojo)
> scope.getInstance(oneCtx);
> Assert.assertNotNull(one);
>
> @@ -119,7 +119,7 @@
> Assert.assertNotNull(three);
>
> // expire module
> - scope.onEvent(new ModuleStop(this,null));
> + scope.onEvent(new CompositeStop(this,null));
> Assert.assertEquals(0, one.getNumberInstantiated());
> scope.stop();
> }
>
> Modified:
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeRestartTestCase.java
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeRestartTestCase.java?rev=411373&r1=411372&r2=411373&view=diff
> ==============================================================================
> ---
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeRestartTestCase.java
> (original)
> +++
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeRestartTestCase.java
> Fri Jun 2 20:52:57 2006
> @@ -6,11 +6,11 @@
> import junit.framework.TestCase;
> import org.apache.tuscany.core.component.WorkContextImpl;
> import org.apache.tuscany.core.component.scope.ModuleScopeContext;
> -import org.apache.tuscany.core.component.event.ModuleStart;
> -import org.apache.tuscany.core.component.event.ModuleStop;
> +import org.apache.tuscany.core.component.event.CompositeStart;
> +import org.apache.tuscany.core.component.event.CompositeStop;
> import org.apache.tuscany.core.injection.MethodEventInvoker;
> import org.apache.tuscany.core.mock.factories.MockContextFactory;
> -import org.apache.tuscany.core.system.context.SystemAtomicComponent;
> +import org.apache.tuscany.core.system.component.SystemAtomicComponent;
> import org.apache.tuscany.spi.context.WorkContext;
>
> /**
> @@ -30,20 +30,20 @@
> InitDestroyOnce.class, false, initInvoker, destroyInvoker,
> null,null);
> context.start();
>
> - scope.onEvent(new ModuleStart(this, null));
> + scope.onEvent(new CompositeStart(this, null));
> Object instance = context.getService();
> assertSame(instance, context.getService());
>
> - scope.onEvent(new ModuleStop(this, null));
> + scope.onEvent(new CompositeStop(this, null));
> scope.stop();
> context.stop();
>
> scope.start();
> - scope.onEvent(new ModuleStart(this, null));
> + scope.onEvent(new CompositeStart(this, null));
> scope.register(context);
> context.start();
> assertNotSame(instance, context.getService());
> - scope.onEvent(new ModuleStop(this, null));
> + scope.onEvent(new CompositeStop(this, null));
> scope.stop();
> context.stop();
> }
>
> Modified:
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeInstanceLifecycleTestCase.java
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeInstanceLifecycleTestCase.java?rev=411373&r1=411372&r2=411373&view=diff
> ==============================================================================
> ---
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeInstanceLifecycleTestCase.java
> (original)
> +++
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeInstanceLifecycleTestCase.java
> Fri Jun 2 20:52:57 2006
> @@ -13,7 +13,7 @@
> import
> org.apache.tuscany.core.mock.component.RequestScopeDestroyOnlyComponent;
> import
> org.apache.tuscany.core.mock.component.RequestScopeInitDestroyComponent;
> import
> org.apache.tuscany.core.mock.component.RequestScopeInitOnlyComponent;
> -import org.apache.tuscany.core.system.context.SystemAtomicComponent;
> +import org.apache.tuscany.core.system.component.SystemAtomicComponent;
> import org.apache.tuscany.spi.context.WorkContext;
>
> /**
>
> Modified:
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeRestartTestCase.java
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeRestartTestCase.java?rev=411373&r1=411372&r2=411373&view=diff
> ==============================================================================
> ---
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeRestartTestCase.java
> (original)
> +++
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeRestartTestCase.java
> Fri Jun 2 20:52:57 2006
> @@ -9,7 +9,7 @@
> import org.apache.tuscany.core.component.scope.RequestScopeContext;
> import org.apache.tuscany.core.component.event.RequestEnd;
> import org.apache.tuscany.core.injection.MethodEventInvoker;
> -import org.apache.tuscany.core.system.context.SystemAtomicComponent;
> +import org.apache.tuscany.core.system.component.SystemAtomicComponent;
> import org.apache.tuscany.core.mock.factories.MockContextFactory;
>
> /**
>
> Modified:
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/builder/AutowireBuilderTestcase.java
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/builder/AutowireBuilderTestcase.java?rev=411373&r1=411372&r2=411373&view=diff
> ==============================================================================
> ---
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/builder/AutowireBuilderTestcase.java
> (original)
> +++
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/builder/AutowireBuilderTestcase.java
> Fri Jun 2 20:52:57 2006
> @@ -5,15 +5,15 @@
> import org.apache.tuscany.core.builder.ConnectorImpl;
> import org.apache.tuscany.core.component.WorkContextImpl;
> import org.apache.tuscany.core.component.scope.ModuleScopeContext;
> -import org.apache.tuscany.core.component.event.ModuleStart;
> -import org.apache.tuscany.core.component.event.ModuleStop;
> +import org.apache.tuscany.core.component.event.CompositeStart;
> +import org.apache.tuscany.core.component.event.CompositeStop;
> import org.apache.tuscany.core.mock.factories.MockComponentFactory;
> import org.apache.tuscany.core.mock.component.Source;
> import org.apache.tuscany.core.mock.component.Target;
> import org.apache.tuscany.core.system.builder.SystemBindingBuilder;
> import org.apache.tuscany.core.system.builder.SystemComponentBuilder;
> -import org.apache.tuscany.core.system.context.SystemCompositeComponent;
> -import
> org.apache.tuscany.core.system.context.SystemCompositeComponentImpl;
> +import org.apache.tuscany.core.system.component.SystemCompositeComponent;
> +import
> org.apache.tuscany.core.system.component.SystemCompositeComponentImpl;
> import org.apache.tuscany.core.system.model.SystemBinding;
> import org.apache.tuscany.core.system.model.SystemImplementation;
> import org.apache.tuscany.spi.model.BoundReferenceDefinition;
> @@ -65,14 +65,14 @@
> connector.connect(sourceComponent);
>
> grandParent.start();
> - scope.onEvent(new ModuleStart(this, parent));
> + scope.onEvent(new CompositeStart(this, parent));
> Source source = (Source) parent.getChild("source").getService();
> assertNotNull(source);
> Target target = (Target) parent.getChild("target").getService();
> assertNotNull(target);
> assertSame(target, source.getTarget());
> assertSame(target, grandParent.getChild("target").getService());
> - scope.onEvent(new ModuleStop(this, parent));
> + scope.onEvent(new CompositeStop(this, parent));
> grandParent.stop();
> scope.stop();
> }
> @@ -99,13 +99,13 @@
> parent.register(sourceComponent);
>
> parent.start();
> - scope.onEvent(new ModuleStart(this, parent));
> + scope.onEvent(new CompositeStart(this, parent));
> Source source = (Source) parent.getChild("source").getService();
> assertNotNull(source);
> Target target = (Target) parent.getChild("target").getService();
> assertNotNull(target);
> assertSame(target, source.getTarget());
> - scope.onEvent(new ModuleStop(this, parent));
> + scope.onEvent(new CompositeStop(this, parent));
> parent.stop();
> scope.stop();
> }
>
> Modified:
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/builder/SystemBuildersTestCase.java
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/builder/SystemBuildersTestCase.java?rev=411373&r1=411372&r2=411373&view=diff
> ==============================================================================
> ---
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/builder/SystemBuildersTestCase.java
> (original)
> +++
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/builder/SystemBuildersTestCase.java
> Fri Jun 2 20:52:57 2006
> @@ -5,15 +5,15 @@
> import org.apache.tuscany.core.builder.ConnectorImpl;
> import org.apache.tuscany.core.component.WorkContextImpl;
> import org.apache.tuscany.core.component.scope.ModuleScopeContext;
> -import org.apache.tuscany.core.component.event.ModuleStart;
> -import org.apache.tuscany.core.component.event.ModuleStop;
> +import org.apache.tuscany.core.component.event.CompositeStart;
> +import org.apache.tuscany.core.component.event.CompositeStop;
> import org.apache.tuscany.core.mock.component.Source;
> import org.apache.tuscany.core.mock.component.Target;
> import org.apache.tuscany.core.mock.factories.MockComponentFactory;
> import org.apache.tuscany.core.system.builder.SystemBindingBuilder;
> import org.apache.tuscany.core.system.builder.SystemComponentBuilder;
> -import org.apache.tuscany.core.system.context.SystemCompositeComponent;
> -import
> org.apache.tuscany.core.system.context.SystemCompositeComponentImpl;
> +import org.apache.tuscany.core.system.component.SystemCompositeComponent;
> +import
> org.apache.tuscany.core.system.component.SystemCompositeComponentImpl;
> import org.apache.tuscany.core.system.model.SystemBinding;
> import org.apache.tuscany.core.system.model.SystemImplementation;
> import org.apache.tuscany.spi.context.AtomicComponent;
> @@ -59,13 +59,13 @@
> connector.connect(sourceComponent);
> connector.connect(targetComponent);
> parent.start();
> - scope.onEvent(new ModuleStart(this, parent));
> + scope.onEvent(new CompositeStart(this, parent));
> Source source = (Source) parent.getChild("source").getService();
> assertNotNull(source);
> Target target = (Target) parent.getChild("target").getService();
> assertNotNull(target);
> assertSame(target, source.getTarget());
> - scope.onEvent(new ModuleStop(this, parent));
> + scope.onEvent(new CompositeStop(this, parent));
> parent.stop();
> scope.stop();
> }
> @@ -102,13 +102,13 @@
> connector.connect(sourceComponent);
> grandParent.register(parent);
> grandParent.start();
> - scope.onEvent(new ModuleStart(this, parent));
> + scope.onEvent(new CompositeStart(this, parent));
> Source source = (Source) parent.getChild("source").getService();
> assertNotNull(source);
> Target target = (Target) parent.getChild("target").getService();
> assertNotNull(target);
> assertSame(target, source.getTarget());
> - scope.onEvent(new ModuleStop(this, parent));
> + scope.onEvent(new CompositeStop(this, parent));
> grandParent.stop();
> scope.stop();
> }
> @@ -143,13 +143,13 @@
> String serviceName =
> service.getOutboundWire().getTargetName().getPortName();
> connector.connect(service.getOutboundWire(),
> sourceComponent.getInboundWire(serviceName), parent, true);
> parent.start();
> - scope.onEvent(new ModuleStart(this, parent));
> + scope.onEvent(new CompositeStart(this, parent));
> Target target = (Target)
> parent.getChild("serviceDefinition").getService();
> assertNotNull(target);
> Target target2 = (Target) parent.getChild("target").getService();
> assertNotNull(target);
> assertSame(target, target2);
> - scope.onEvent(new ModuleStop(this, parent));
> + scope.onEvent(new CompositeStop(this, parent));
> parent.stop();
> scope.stop();
>
> @@ -188,13 +188,13 @@
> // connector.connect(serviceContext.getOutboundWire(),
> referenceContext.getInboundWire(),true);
> // grandParent.registerContext(parent);
> // grandParent.start();
> -// scope.onEvent(new ModuleStart(this, parent));
> +// scope.onEvent(new CompositeStart(this, parent));
> // Target target = (Target)
> parent.getContext("service").getService();
> // assertNotNull(target);
> // Target target2 = (Target)
> parent.getContext("target").getService();
> // assertNotNull(target);
> // assertSame(target, target2);
> -// scope.onEvent(new ModuleStop(this, parent));
> +// scope.onEvent(new CompositeStop(this, parent));
> // parent.stop();
> // scope.stop();
>
>
> Modified:
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockContextFactory.java
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockContextFactory.java?rev=411373&r1=411372&r2=411373&view=diff
> ==============================================================================
> ---
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockContextFactory.java
> (original)
> +++
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockContextFactory.java
> Fri Jun 2 20:52:57 2006
> @@ -12,8 +12,8 @@
> import org.apache.tuscany.core.injection.Injector;
> import org.apache.tuscany.core.injection.MethodEventInvoker;
> import org.apache.tuscany.core.injection.PojoObjectFactory;
> -import org.apache.tuscany.core.system.context.SystemAtomicComponent;
> -import org.apache.tuscany.core.system.context.SystemAtomicComponentImpl;
> +import org.apache.tuscany.core.system.component.SystemAtomicComponent;
> +import
> org.apache.tuscany.core.system.component.SystemAtomicComponentImpl;
> import org.apache.tuscany.core.system.wire.SystemInboundWireImpl;
> import org.apache.tuscany.core.system.wire.SystemOutboundWireImpl;
> import org.apache.tuscany.core.system.wire.SystemOutboundWire;
>
> Copied:
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/AutowireTestCase.java
> (from r411369,
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/AutowireTestCase.java)
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/AutowireTestCase.java?p2=incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/AutowireTestCase.java&p1=incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/AutowireTestCase.java&r1=411369&r2=411373&rev=411373&view=diff
> ==============================================================================
> ---
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/AutowireTestCase.java
> (original)
> +++
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/AutowireTestCase.java
> Fri Jun 2 20:52:57 2006
> @@ -1,10 +1,15 @@
> -package org.apache.tuscany.core.system.context;
> +package org.apache.tuscany.core.system.component;
>
> import java.util.ArrayList;
> import java.util.List;
>
> import org.jmock.Mock;
> import org.jmock.MockObjectTestCase;
> +import org.apache.tuscany.core.system.component.SystemAtomicComponent;
> +import org.apache.tuscany.core.system.component.SystemCompositeComponent;
> +import
> org.apache.tuscany.core.system.component.SystemCompositeComponentImpl;
> +import org.apache.tuscany.core.system.component.SystemReference;
> +import org.apache.tuscany.core.system.component.SystemService;
>
> /**
> * Performs basic autowiring tests to composite artifacts
>
> Copied:
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/ChildLocateTestCase.java
> (from r411369,
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/ChildLocateTestCase.java)
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/ChildLocateTestCase.java?p2=incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/ChildLocateTestCase.java&p1=incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/ChildLocateTestCase.java&r1=411369&r2=411373&rev=411373&view=diff
> ==============================================================================
> ---
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/ChildLocateTestCase.java
> (original)
> +++
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/ChildLocateTestCase.java
> Fri Jun 2 20:52:57 2006
> @@ -1,4 +1,4 @@
> -package org.apache.tuscany.core.system.context;
> +package org.apache.tuscany.core.system.component;
>
> import junit.framework.TestCase;
>
> @@ -19,7 +19,7 @@
> // SystemAtomicComponent context =
> MockContextFactory.createSystemAtomicContext("source", SourceImpl.class);
> // scopeContext.register(context);
> // context.setScopeContext(scopeContext);
> -// scopeContext.publish(new ModuleStart(this, parent));
> +// scopeContext.publish(new CompositeStart(this, parent));
> //
> // assertNotNull(source);
> // CompositeComponent composite1 = (CompositeComponent)
> parent.getContext("child1");
> @@ -27,7 +27,7 @@
> // AtomicComponent ctx2 = (AtomicComponent)
> composite2.getContext("source");
> // Source source2 = (Source) ctx2.getInstance();
> // assertSame(source, source2);
> -// scopeContext.onEvent(new ModuleStop(this, parent));
> +// scopeContext.onEvent(new CompositeStop(this, parent));
> // parent.stop();
> // scopeContext.stop();
> /////
> @@ -42,8 +42,8 @@
> // EntryPoint ep =
> MockContextFactory.createEPSystemBinding("TestService1EP",
> ModuleScopeSystemComponent.class, "TestService1", component);
> // childContext.registerModelObject(component);
> // childContext.registerModelObject(ep);
> -// childContext.publish(new ModuleStart(this));
> +// childContext.publish(new CompositeStart(this));
> //
> Assert.assertNotNull(system.getContext("system.child").getInstance(new
> QualifiedName("./TestService1EP")));
> -// childContext.publish(new ModuleStop(this));
> +// childContext.publish(new CompositeStop(this));
> }
> }
>
> Copied:
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/CompositePropagationTestCase.java
> (from r411369,
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/CompositePropagationTestCase.java)
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/CompositePropagationTestCase.java?p2=incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/CompositePropagationTestCase.java&p1=incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/CompositePropagationTestCase.java&r1=411369&r2=411373&rev=411373&view=diff
> ==============================================================================
> ---
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/CompositePropagationTestCase.java
> (original)
> +++
> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/CompositePropagationTestCase.java
> Fri Jun 2 20:52:57 2006
> @@ -1,9 +1,12 @@
> -package org.apache.tuscany.core.system.context;
> +package org.apache.tuscany.core.system.component;
>
> import java.util.ArrayList;
> import java.util.List;
>
> import org.apache.tuscany.core.mock.component.Source;
> +import org.apache.tuscany.core.system.component.SystemAtomicComponent;
> +import org.apache.tuscany.core.system.component.SystemCompositeComponent;
> +import
> org.apache.tuscany.core.system.component.SystemCompositeComponentImpl;
> import org.jmock.Mock;
> import org.jmock.MockObjectTestCase;
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
> For additional commands, e-mail: tuscany-commits-help@ws.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-dev-help@ws.apache.org
Re: svn commit: r411373 [1/2] - in /incubator/tuscany/sandbox/jboynes/sca: containers/container.java/src/test/java/org/apache/tuscany/container/java/ containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/context/ core2/src/m
Posted by Jim Marino <jm...@myromatours.com>.
I fixed that in a subsequent checkin - IntelliJ could not handle the
size of the refactor. Please resync and try again.
Jim
On Jun 2, 2006, at 9:33 PM, Raymond Feng wrote:
> Hi, Jim.
>
> A lot of files cannot compile any more with your check-in. There're
> still a lot of dangling references to
> org.apache.tuscany.spi.context instead of
> org.apache.tuscany.spi.component.
>
> Thanks,
> Raymond
>
> ----- Original Message ----- From: <jm...@apache.org>
> To: <tu...@ws.apache.org>
> Sent: Friday, June 02, 2006 8:52 PM
> Subject: svn commit: r411373 [1/2] - in /incubator/tuscany/sandbox/
> jboynes/sca: containers/container.java/src/test/java/org/apache/
> tuscany/container/java/ containers/container.java/src/test/java/org/
> apache/tuscany/container/java/integration/context/ core2/src/m...
>
>
>> Author: jmarino
>> Date: Fri Jun 2 20:52:57 2006
>> New Revision: 411373
>>
>> URL: http://svn.apache.org/viewvc?rev=411373&view=rev
>> Log:
>> more package refactors
>>
>> Added:
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/component/event/CompositeEvent.java
>> - copied, changed from r411370, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/
>> event/ModuleEvent.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/component/event/CompositeStart.java
>> - copied, changed from r411370, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/
>> event/ModuleStart.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/component/event/CompositeStop.java
>> - copied, changed from r411370, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/
>> event/ModuleStop.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/ObjectRegistrationException.java
>> - copied, changed from r411369, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> context/ObjectRegistrationException.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/SystemAtomicComponent.java
>> - copied, changed from r411369, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> context/SystemAtomicComponent.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/SystemAtomicComponentImpl.java
>> - copied, changed from r411370, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> context/SystemAtomicComponentImpl.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/SystemCompositeComponent.java
>> - copied, changed from r411370, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> context/SystemCompositeComponent.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/
>> SystemCompositeComponentImpl.java
>> - copied, changed from r411370, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> context/SystemCompositeComponentImpl.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/SystemReference.java
>> - copied, changed from r411369, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> context/SystemReference.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/SystemReferenceImpl.java
>> - copied, changed from r411369, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> context/SystemReferenceImpl.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/SystemService.java
>> - copied, changed from r411369, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> context/SystemService.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/SystemServiceImpl.java
>> - copied, changed from r411369, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> context/SystemServiceImpl.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/
>> SystemSingletonAtomicComponent.java
>> - copied, changed from r411369, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> context/SystemSingletonAtomicComponent.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/SystemWireObjectFactory.java
>> - copied, changed from r411369, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> context/SystemWireObjectFactory.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/system/component/
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/system/component/AutowireTestCase.java
>> - copied, changed from r411369, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/
>> context/AutowireTestCase.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/system/component/ChildLocateTestCase.java
>> - copied, changed from r411369, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/
>> context/ChildLocateTestCase.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/system/component/
>> CompositePropagationTestCase.java
>> - copied, changed from r411369, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/
>> context/CompositePropagationTestCase.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/system/component/
>> DuplicateRegistrationTestCase.java
>> - copied, changed from r411369, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/
>> context/DuplicateRegistrationTestCase.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/system/component/
>> SystemAtomicComponentTestCase.java
>> - copied, changed from r411369, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/
>> context/SystemAtomicComponentTestCase.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/system/component/
>> SystemCompositeComponentResolutionTestCase.java
>> - copied, changed from r411369, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/
>> context/SystemCompositeComponentResolutionTestCase.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/system/component/
>> SystemCompositeComponentTestCase.java (contents, props changed)
>> - copied, changed from r411370, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/
>> context/SystemCompositeComponentTestCase.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/system/component/
>> SystemCompositeLifecycleTestCase.java
>> - copied, changed from r411369, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/
>> context/SystemCompositeLifecycleTestCase.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/system/component/
>> SystemObjectRegistrationTestCase.java
>> - copied, changed from r411370, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/
>> context/SystemObjectRegistrationTestCase.java
>> Removed:
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/component/event/ModuleEvent.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/component/event/ModuleStart.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/component/event/ModuleStop.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/context/
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/context/
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/context/
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/system/context/
>> Modified:
>> incubator/tuscany/sandbox/jboynes/sca/containers/container.java/
>> src/test/java/org/apache/tuscany/container/java/
>> MultiplicityTestCase.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/core2/src/main/java/org/
>> apache/tuscany/core/bootstrap/DefaultRuntime.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/scope/ModuleScopeContext.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/builder/SystemBindingBuilder.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/builder/SystemCompositeBuilder.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/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/wire/
>> AtomicComponentWireInvocationTestCase.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/system/wire/
>> SystemServiceComponentWireTestCase.java
>>
>> Modified: incubator/tuscany/sandbox/jboynes/sca/containers/
>> container.java/src/test/java/org/apache/tuscany/container/java/
>> MultiplicityTestCase.java
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/containers/container.java/src/test/java/org/apache/
>> tuscany/container/java/MultiplicityTestCase.java?
>> rev=411373&r1=411372&r2=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/containers/
>> container.java/src/test/java/org/apache/tuscany/container/java/
>> MultiplicityTestCase.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/containers/
>> container.java/src/test/java/org/apache/tuscany/container/java/
>> MultiplicityTestCase.java Fri Jun 2 20:52:57 2006
>> @@ -27,7 +27,7 @@
>> // CompositeComponent context = createContext();
>> // context.start();
>> // context.registerModelObject
>> (MockContextFactory.createModuleWithWiredComponents(Scope.MODULE,
>> Scope.MODULE));
>> -// context.publish(new ModuleStart(this));
>> +// context.publish(new CompositeStart(this));
>> // Source source = (Source) ((AtomicComponent)
>> context.getContext("source")).getTargetInstance();
>> // Assert.assertNotNull(source);
>> // Target target = (Target) ((AtomicComponent)
>> context.getContext("target")).getTargetInstance();
>>
>> 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=411373&r1=411372&r2=411373&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 Fri Jun 2
>> 20:52:57 2006
>> @@ -16,8 +16,8 @@
>> import
>> org.apache.tuscany.core.component.scope.HttpSessionScopeContext;
>> import org.apache.tuscany.core.component.event.HttpSessionEnd;
>> import org.apache.tuscany.core.component.event.HttpSessionStart;
>> -import org.apache.tuscany.core.component.event.ModuleStart;
>> -import org.apache.tuscany.core.component.event.ModuleStop;
>> +import org.apache.tuscany.core.component.event.CompositeStart;
>> +import org.apache.tuscany.core.component.event.CompositeStop;
>> import org.apache.tuscany.core.component.event.RequestEnd;
>> import org.apache.tuscany.core.component.event.RequestStart;
>> import org.apache.tuscany.core.component.scope.ModuleScopeContext;
>> @@ -134,7 +134,7 @@
>>
>> ModuleScopeContext scope = new ModuleScopeContext
>> (workContext);
>> scope.start();
>> - scope.onEvent(new ModuleStart(this, null));
>> + scope.onEvent(new CompositeStart(this, null));
>> final OutboundWire<Target> wire = getWire(scope);
>> Target service = wireService.createProxy(wire);
>> Target target = wireService.createProxy(wire);
>> @@ -142,7 +142,7 @@
>> service.setString("foo");
>> assertEquals("foo", service.getString());
>> assertEquals("foo", target.getString());
>> - scope.onEvent(new ModuleStop(this, null));
>> + scope.onEvent(new CompositeStop(this, null));
>> scope.stop();
>> }
>>
>>
>> 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=411373&r1=411372&r2=411373&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 Fri Jun 2
>> 20:52:57 2006
>> @@ -32,8 +32,8 @@
>> import
>> org.apache.tuscany.core.component.scope.HttpSessionScopeContext;
>> import org.apache.tuscany.core.component.event.HttpSessionEnd;
>> import org.apache.tuscany.core.component.event.HttpSessionStart;
>> -import org.apache.tuscany.core.component.event.ModuleStart;
>> -import org.apache.tuscany.core.component.event.ModuleStop;
>> +import org.apache.tuscany.core.component.event.CompositeStart;
>> +import org.apache.tuscany.core.component.event.CompositeStop;
>> import org.apache.tuscany.core.component.event.RequestEnd;
>> import org.apache.tuscany.core.component.event.RequestStart;
>> import org.apache.tuscany.core.component.scope.ModuleScopeContext;
>> @@ -62,7 +62,7 @@
>> scope.start();
>>
>> Map<String, AtomicComponent> contexts =
>> MockContextFactory.createWiredContexts("source", SourceImpl.class,
>> scope, members, "target", Target.class, TargetImpl.class, scope);
>> - scope.onEvent(new ModuleStart(this, null));
>> + scope.onEvent(new CompositeStart(this, null));
>> AtomicComponent<Source> sourceComponent =
>> (AtomicComponent<Source>) contexts.get("source");
>> AtomicComponent<Target> targetComponent =
>> (AtomicComponent<Target>) contexts.get("target");
>> Source source = sourceComponent.getService();
>> @@ -72,7 +72,7 @@
>> target.setString("foo");
>> assertTrue(Proxy.isProxyClass(source.getTarget().getClass
>> ()));
>> assertEquals("foo", source.getTarget().getString());
>> - scope.onEvent(new ModuleStop(this, null));
>> + scope.onEvent(new CompositeStop(this, null));
>> scope.stop();
>> }
>>
>> @@ -89,7 +89,7 @@
>>
>> Map<String, AtomicComponent> contexts =
>> MockContextFactory.createWiredContexts("source", SourceImpl.class,
>> moduleScope, members, "target", Target.class,
>> TargetImpl.class, sessionScope);
>> - moduleScope.onEvent(new ModuleStart(this, null));
>> + moduleScope.onEvent(new CompositeStart(this, null));
>> Object session1 = new Object();
>> ctx.setIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER,
>> session1);
>> sessionScope.onEvent(new HttpSessionStart(this, session1));
>> @@ -120,7 +120,7 @@
>> sessionScope.onEvent(new HttpSessionEnd(this, session2));
>>
>> ctx.clearIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER);
>> - moduleScope.onEvent(new ModuleStop(this, null));
>> + moduleScope.onEvent(new CompositeStop(this, null));
>> sessionScope.stop();
>> moduleScope.stop();
>> }
>> @@ -138,7 +138,7 @@
>>
>> Map<String, AtomicComponent> contexts =
>> MockContextFactory.createWiredContexts("source", SourceImpl.class,
>> moduleScope, members, "target", Target.class,
>> TargetImpl.class, requestScope);
>> - moduleScope.onEvent(new ModuleStart(this, null));
>> + moduleScope.onEvent(new CompositeStart(this, null));
>> requestScope.onEvent(new RequestStart(this));
>>
>> AtomicComponent<Source> sourceComponent =
>> (AtomicComponent<Source>) contexts.get("source");
>> @@ -169,7 +169,7 @@
>> future.get();
>> assertEquals("foo", source.getTarget().getString());
>> requestScope.onEvent(new RequestEnd(this));
>> - moduleScope.onEvent(new ModuleStop(this,null));
>> + moduleScope.onEvent(new CompositeStop(this,null));
>> requestScope.stop();
>> moduleScope.stop();
>> }
>> @@ -187,7 +187,7 @@
>>
>> Map<String, AtomicComponent> contexts =
>> MockContextFactory.createWiredContexts("source", SourceImpl.class,
>> moduleScope, members, "target", Target.class,
>> TargetImpl.class, statelessScope);
>> - moduleScope.onEvent(new ModuleStart(this, null));
>> + moduleScope.onEvent(new CompositeStart(this, null));
>>
>> AtomicComponent<Source> sourceComponent =
>> (AtomicComponent<Source>) contexts.get("source");
>> AtomicComponent<Target> targetComponent =
>> (AtomicComponent<Target>) contexts.get("target");
>> @@ -202,7 +202,7 @@
>> assertFalse("foo".equals(target2.getString()));
>> source.getTarget().setString("bar");
>> assertFalse("bar".equals(source.getTarget().getString()));
>> - moduleScope.onEvent(new ModuleStop(this, null));
>> + moduleScope.onEvent(new CompositeStop(this, null));
>> moduleScope.stop();
>> statelessScope.stop();
>> }
>> @@ -268,7 +268,7 @@
>>
>> Map<String, AtomicComponent> contexts =
>> MockContextFactory.createWiredContexts("source", SourceImpl.class,
>> sessionScope, members, "target", Target.class,
>> TargetImpl.class, moduleScope);
>> - moduleScope.onEvent(new ModuleStart(this, null));
>> + moduleScope.onEvent(new CompositeStart(this, null));
>> Object session1 = new Object();
>> ctx.setIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER,
>> session1);
>> sessionScope.onEvent(new HttpSessionStart(this, session1));
>> @@ -447,7 +447,7 @@
>> final ScopeContext moduleScope = new ModuleScopeContext(ctx);
>> requestScope.start();
>> moduleScope.start();
>> - moduleScope.onEvent(new ModuleStart(this, null));
>> + moduleScope.onEvent(new CompositeStart(this, null));
>>
>> Map<String, AtomicComponent> contexts =
>> MockContextFactory.createWiredContexts("source", SourceImpl.class,
>> requestScope, members, "target", Target.class,
>> TargetImpl.class, moduleScope);
>> @@ -484,7 +484,7 @@
>>
>> requestScope.onEvent(new RequestEnd(this));
>> requestScope.stop();
>> - moduleScope.onEvent(new ModuleStop(this, null));
>> + moduleScope.onEvent(new CompositeStop(this, null));
>> moduleScope.stop();
>> }
>>
>> @@ -710,7 +710,7 @@
>>
>> Map<String, AtomicComponent> contexts =
>> MockContextFactory.createWiredContexts("source", SourceImpl.class,
>> statelessScope, members, "target", Target.class,
>> TargetImpl.class, moduleScope);
>> - moduleScope.onEvent(new ModuleStart(this, null));
>> + moduleScope.onEvent(new CompositeStart(this, null));
>> AtomicComponent<Source> sourceComponent =
>> (AtomicComponent<Source>) contexts.get("source");
>> AtomicComponent<Target> targetComponent =
>> (AtomicComponent<Target>) contexts.get("target");
>> Source source = sourceComponent.getService();
>> @@ -734,7 +734,7 @@
>> assertEquals("bar", target2.getString());
>> assertEquals("bar", source.getTarget().getString());
>>
>> - moduleScope.onEvent(new ModuleStop(this, null));
>> + moduleScope.onEvent(new CompositeStop(this, null));
>> moduleScope.stop();
>> statelessScope.stop();
>> }
>>
>> Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/
>> java/org/apache/tuscany/core/bootstrap/DefaultRuntime.java
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/bootstrap/
>> DefaultRuntime.java?rev=411373&r1=411372&r2=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/bootstrap/DefaultRuntime.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/bootstrap/DefaultRuntime.java Fri Jun 2
>> 20:52:57 2006
>> @@ -16,8 +16,8 @@
>> */
>> package org.apache.tuscany.core.bootstrap;
>>
>> -import
>> org.apache.tuscany.core.system.context.SystemCompositeComponent;
>> -import
>> org.apache.tuscany.core.system.context.SystemCompositeComponentImpl;
>> +import
>> org.apache.tuscany.core.system.component.SystemCompositeComponent;
>> +import
>> org.apache.tuscany.core.system.component.SystemCompositeComponentImpl
>> ;
>> import org.apache.tuscany.spi.bootstrap.RuntimeComponent;
>> import org.apache.tuscany.spi.bootstrap.ComponentNames;
>> import org.apache.tuscany.spi.context.CompositeComponent;
>>
>> 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=411373&r1=411372&r2=411373&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 Fri
>> Jun 2 20:52:57 2006
>> @@ -7,7 +7,7 @@
>> import java.util.concurrent.CountDownLatch;
>> import java.util.concurrent.TimeUnit;
>>
>> -import org.apache.tuscany.core.system.context.SystemService;
>> +import org.apache.tuscany.core.system.component.SystemService;
>> import org.apache.tuscany.spi.CoreRuntimeException;
>> import org.apache.tuscany.spi.annotation.Autowire;
>> import org.apache.tuscany.spi.context.AtomicComponent;
>>
>> Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/
>> org/apache/tuscany/core/component/event/CompositeEvent.java (from
>> r411370, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/
>> org/apache/tuscany/core/component/event/ModuleEvent.java)
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/
>> event/CompositeEvent.java?p2=incubator/tuscany/sandbox/jboynes/sca/
>> core2/src/main/java/org/apache/tuscany/core/component/event/
>> CompositeEvent.java&p1=incubator/tuscany/sandbox/jboynes/sca/core2/
>> src/main/java/org/apache/tuscany/core/component/event/
>> ModuleEvent.java&r1=411370&r2=411373&rev=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/component/event/ModuleEvent.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/component/event/CompositeEvent.java Fri Jun 2
>> 20:52:57 2006
>> @@ -4,12 +4,12 @@
>> import org.apache.tuscany.spi.context.CompositeComponent;
>>
>> /**
>> - * Implemented by runtime events associated with a module, e.g.
>> lifecycle events
>> + * Implemented by runtime events associated with a composite,
>> e.g. lifecycle events
>> *
>> * @version $$Rev$$ $$Date$$
>> */
>> -public interface ModuleEvent extends Event {
>> +public interface CompositeEvent extends Event {
>>
>> - public CompositeComponent getContext();
>> + public CompositeComponent getComposite();
>>
>> }
>>
>> Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/
>> org/apache/tuscany/core/component/event/CompositeStart.java (from
>> r411370, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/
>> org/apache/tuscany/core/component/event/ModuleStart.java)
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/
>> event/CompositeStart.java?p2=incubator/tuscany/sandbox/jboynes/sca/
>> core2/src/main/java/org/apache/tuscany/core/component/event/
>> CompositeStart.java&p1=incubator/tuscany/sandbox/jboynes/sca/core2/
>> src/main/java/org/apache/tuscany/core/component/event/
>> ModuleStart.java&r1=411370&r2=411373&rev=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/component/event/ModuleStart.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/component/event/CompositeStart.java Fri Jun 2
>> 20:52:57 2006
>> @@ -2,14 +2,14 @@
>>
>> import org.apache.tuscany.spi.context.CompositeComponent;
>> import org.apache.tuscany.core.component.event.AbstractEvent;
>> -import org.apache.tuscany.core.component.event.ModuleEvent;
>> +import org.apache.tuscany.core.component.event.CompositeEvent;
>>
>> /**
>> - * Propagated when a module starts
>> + * Propagated when a composite starts
>> *
>> * @version $$Rev$$ $$Date$$
>> */
>> -public class ModuleStart extends AbstractEvent implements
>> ModuleEvent {
>> +public class CompositeStart extends AbstractEvent implements
>> CompositeEvent {
>>
>> private CompositeComponent component;
>>
>> @@ -18,12 +18,12 @@
>> * @param source the source of the event
>> * @param ctx the composite component associated the module
>> being stopped
>> */
>> - public ModuleStart(Object source, CompositeComponent ctx) {
>> + public CompositeStart(Object source, CompositeComponent ctx) {
>> super(source);
>> component = ctx;
>> }
>>
>> - public CompositeComponent getContext(){
>> + public CompositeComponent getComposite(){
>> return component;
>> }
>>
>>
>> Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/
>> org/apache/tuscany/core/component/event/CompositeStop.java (from
>> r411370, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/
>> org/apache/tuscany/core/component/event/ModuleStop.java)
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/
>> event/CompositeStop.java?p2=incubator/tuscany/sandbox/jboynes/sca/
>> core2/src/main/java/org/apache/tuscany/core/component/event/
>> CompositeStop.java&p1=incubator/tuscany/sandbox/jboynes/sca/core2/
>> src/main/java/org/apache/tuscany/core/component/event/
>> ModuleStop.java&r1=411370&r2=411373&rev=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/component/event/ModuleStop.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/component/event/CompositeStop.java Fri Jun 2
>> 20:52:57 2006
>> @@ -2,14 +2,14 @@
>>
>> import org.apache.tuscany.spi.context.CompositeComponent;
>> import org.apache.tuscany.core.component.event.AbstractEvent;
>> -import org.apache.tuscany.core.component.event.ModuleEvent;
>> +import org.apache.tuscany.core.component.event.CompositeEvent;
>>
>> /**
>> - * Propagated when a module stops
>> + * Propagated when a composite stops
>> *
>> * @version $$Rev$$ $$Date$$
>> */
>> -public class ModuleStop extends AbstractEvent implements
>> ModuleEvent {
>> +public class CompositeStop extends AbstractEvent implements
>> CompositeEvent {
>>
>> private CompositeComponent component;
>>
>> @@ -18,12 +18,12 @@
>> * @param source the source of the event
>> * @param ctx the composite component associated the module
>> being stopped
>> */
>> - public ModuleStop(Object source, CompositeComponent ctx) {
>> + public CompositeStop(Object source, CompositeComponent ctx) {
>> super(source);
>> component = ctx;
>> }
>>
>> - public CompositeComponent getContext(){
>> + public CompositeComponent getComposite(){
>> return component;
>> }
>> }
>>
>> Modified: 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/ModuleScopeContext.java?
>> rev=411373&r1=411372&r2=411373&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/ModuleScopeContext.java Fri
>> Jun 2 20:52:57 2006
>> @@ -7,8 +7,8 @@
>> import java.util.concurrent.ConcurrentHashMap;
>>
>> import org.apache.tuscany.spi.AbstractLifecycle;
>> -import org.apache.tuscany.core.component.event.ModuleStart;
>> -import org.apache.tuscany.core.component.event.ModuleStop;
>> +import org.apache.tuscany.core.component.event.CompositeStart;
>> +import org.apache.tuscany.core.component.event.CompositeStop;
>> import org.apache.tuscany.core.component.scope.AbstractScopeContext;
>> import org.apache.tuscany.spi.model.Scope;
>> import org.apache.tuscany.spi.CoreRuntimeException;
>> @@ -47,10 +47,10 @@
>>
>> public void onEvent(Event event) {
>> checkInit();
>> - if (event instanceof ModuleStart) {
>> + if (event instanceof CompositeStart) {
>> eagerInitContexts();
>> lifecycleState = RUNNING;
>> - } else if (event instanceof ModuleStop) {
>> + } else if (event instanceof CompositeStop) {
>> shutdownContexts();
>> }
>> }
>>
>> Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/
>> java/org/apache/tuscany/core/system/builder/SystemBindingBuilder.java
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> builder/SystemBindingBuilder.java?
>> rev=411373&r1=411372&r2=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/builder/SystemBindingBuilder.java
>> (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/builder/SystemBindingBuilder.java Fri
>> Jun 2 20:52:57 2006
>> @@ -1,9 +1,9 @@
>> package org.apache.tuscany.core.system.builder;
>>
>> import org.apache.tuscany.core.component.AutowireComponent;
>> -import org.apache.tuscany.core.system.context.SystemReferenceImpl;
>> -import org.apache.tuscany.core.system.context.SystemService;
>> -import org.apache.tuscany.core.system.context.SystemServiceImpl;
>> +import org.apache.tuscany.core.system.component.SystemReferenceImpl;
>> +import org.apache.tuscany.core.system.component.SystemService;
>> +import org.apache.tuscany.core.system.component.SystemServiceImpl;
>> import org.apache.tuscany.core.system.model.SystemBinding;
>> import org.apache.tuscany.core.system.wire.SystemInboundWireImpl;
>> import org.apache.tuscany.core.system.wire.SystemOutboundAutowire;
>>
>> Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/
>> java/org/apache/tuscany/core/system/builder/
>> SystemComponentBuilder.java
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> builder/SystemComponentBuilder.java?
>> rev=411373&r1=411372&r2=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/builder/SystemComponentBuilder.java
>> (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/builder/SystemComponentBuilder.java Fri
>> Jun 2 20:52:57 2006
>> @@ -11,8 +11,8 @@
>> import org.apache.tuscany.core.injection.Injector;
>> import org.apache.tuscany.core.injection.PojoObjectFactory;
>> import org.apache.tuscany.core.model.PojoComponentType;
>> -import org.apache.tuscany.core.system.context.SystemAtomicComponent;
>> -import
>> org.apache.tuscany.core.system.context.SystemAtomicComponentImpl;
>> +import
>> org.apache.tuscany.core.system.component.SystemAtomicComponent;
>> +import
>> org.apache.tuscany.core.system.component.SystemAtomicComponentImpl;
>> import org.apache.tuscany.core.system.model.SystemImplementation;
>> import org.apache.tuscany.core.system.wire.SystemInboundWireImpl;
>> import org.apache.tuscany.core.system.wire.SystemOutboundAutowire;
>>
>> Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/
>> java/org/apache/tuscany/core/system/builder/
>> SystemCompositeBuilder.java
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> builder/SystemCompositeBuilder.java?
>> rev=411373&r1=411372&r2=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/builder/SystemCompositeBuilder.java
>> (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/builder/SystemCompositeBuilder.java Fri
>> Jun 2 20:52:57 2006
>> @@ -17,8 +17,8 @@
>> package org.apache.tuscany.core.system.builder;
>>
>> import org.apache.tuscany.core.component.AutowireComponent;
>> -import
>> org.apache.tuscany.core.system.context.SystemCompositeComponent;
>> -import
>> org.apache.tuscany.core.system.context.SystemCompositeComponentImpl;
>> +import
>> org.apache.tuscany.core.system.component.SystemCompositeComponent;
>> +import
>> org.apache.tuscany.core.system.component.SystemCompositeComponentImpl
>> ;
>> import
>> org.apache.tuscany.core.system.model.SystemCompositeImplementation;
>> import org.apache.tuscany.spi.annotation.Autowire;
>> import org.apache.tuscany.spi.builder.BuilderConfigException;
>>
>> Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/
>> org/apache/tuscany/core/system/component/
>> ObjectRegistrationException.java (from r411369, incubator/tuscany/
>> sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/
>> system/context/ObjectRegistrationException.java)
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> component/ObjectRegistrationException.java?p2=incubator/tuscany/
>> sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/
>> system/component/ObjectRegistrationException.java&p1=incubator/
>> tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/
>> core/system/context/
>> ObjectRegistrationException.java&r1=411369&r2=411373&rev=411373&view=
>> diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/context/
>> ObjectRegistrationException.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/
>> ObjectRegistrationException.java Fri Jun 2 20:52:57 2006
>> @@ -1,4 +1,4 @@
>> -package org.apache.tuscany.core.system.context;
>> +package org.apache.tuscany.core.system.component;
>>
>> import org.apache.tuscany.spi.context.ComponentRuntimeException;
>>
>>
>> Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/
>> org/apache/tuscany/core/system/component/
>> SystemAtomicComponent.java (from r411369, incubator/tuscany/
>> sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/
>> system/context/SystemAtomicComponent.java)
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> component/SystemAtomicComponent.java?p2=incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> component/SystemAtomicComponent.java&p1=incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> context/
>> SystemAtomicComponent.java&r1=411369&r2=411373&rev=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/context/SystemAtomicComponent.java
>> (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/SystemAtomicComponent.java
>> Fri Jun 2 20:52:57 2006
>> @@ -1,4 +1,4 @@
>> -package org.apache.tuscany.core.system.context;
>> +package org.apache.tuscany.core.system.component;
>>
>> import org.apache.tuscany.spi.context.AtomicComponent;
>> import org.apache.tuscany.spi.context.TargetException;
>>
>> Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/
>> org/apache/tuscany/core/system/component/
>> SystemAtomicComponentImpl.java (from r411370, incubator/tuscany/
>> sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/
>> system/context/SystemAtomicComponentImpl.java)
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> component/SystemAtomicComponentImpl.java?p2=incubator/tuscany/
>> sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/
>> system/component/SystemAtomicComponentImpl.java&p1=incubator/
>> tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/
>> core/system/context/
>> SystemAtomicComponentImpl.java&r1=411370&r2=411373&rev=411373&view=di
>> ff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/context/SystemAtomicComponentImpl.java
>> (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/
>> SystemAtomicComponentImpl.java Fri Jun 2 20:52:57 2006
>> @@ -1,4 +1,4 @@
>> -package org.apache.tuscany.core.system.context;
>> +package org.apache.tuscany.core.system.component;
>>
>> import java.lang.reflect.Field;
>> import java.lang.reflect.Member;
>> @@ -16,6 +16,7 @@
>> import
>> org.apache.tuscany.core.injection.ListMultiplicityObjectFactory;
>> import org.apache.tuscany.core.injection.MethodInjector;
>> import org.apache.tuscany.core.system.wire.SystemOutboundWire;
>> +import
>> org.apache.tuscany.core.system.component.SystemAtomicComponent;
>> import org.apache.tuscany.spi.ObjectFactory;
>> import org.apache.tuscany.spi.context.CompositeComponent;
>> import org.apache.tuscany.spi.context.ScopeContext;
>>
>> Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/
>> org/apache/tuscany/core/system/component/
>> SystemCompositeComponent.java (from r411370, incubator/tuscany/
>> sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/
>> system/context/SystemCompositeComponent.java)
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> component/SystemCompositeComponent.java?p2=incubator/tuscany/
>> sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/
>> system/component/SystemCompositeComponent.java&p1=incubator/
>> tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/
>> core/system/context/
>> SystemCompositeComponent.java&r1=411370&r2=411373&rev=411373&view=dif
>> f
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/context/SystemCompositeComponent.java
>> (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/SystemCompositeComponent.java
>> Fri Jun 2 20:52:57 2006
>> @@ -1,6 +1,7 @@
>> -package org.apache.tuscany.core.system.context;
>> +package org.apache.tuscany.core.system.component;
>>
>> import org.apache.tuscany.core.component.AutowireComponent;
>> +import
>> org.apache.tuscany.core.system.component.ObjectRegistrationException;
>>
>> /**
>> * Marker type for system composite contexts
>>
>> Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/
>> org/apache/tuscany/core/system/component/
>> SystemCompositeComponentImpl.java (from r411370, incubator/tuscany/
>> sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/
>> system/context/SystemCompositeComponentImpl.java)
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> component/SystemCompositeComponentImpl.java?p2=incubator/tuscany/
>> sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/
>> system/component/SystemCompositeComponentImpl.java&p1=incubator/
>> tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/
>> core/system/context/
>> SystemCompositeComponentImpl.java&r1=411370&r2=411373&rev=411373&view
>> =diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/context/
>> SystemCompositeComponentImpl.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/
>> SystemCompositeComponentImpl.java Fri Jun 2 20:52:57 2006
>> @@ -1,8 +1,10 @@
>> -package org.apache.tuscany.core.system.context;
>> +package org.apache.tuscany.core.system.component;
>>
>> import org.apache.tuscany.core.component.AbstractCompositeComponent;
>> import org.apache.tuscany.core.component.AutowireComponent;
>> import org.apache.tuscany.core.component.AutowireResolutionException;
>> +import
>> org.apache.tuscany.core.system.component.ObjectRegistrationException;
>> +import
>> org.apache.tuscany.core.system.component.SystemCompositeComponent;
>> import org.apache.tuscany.spi.context.CompositeComponent;
>>
>> /**
>>
>> Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/
>> org/apache/tuscany/core/system/component/SystemReference.java
>> (from r411369, incubator/tuscany/sandbox/jboynes/sca/core2/src/
>> main/java/org/apache/tuscany/core/system/context/
>> SystemReference.java)
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> component/SystemReference.java?p2=incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> component/SystemReference.java&p1=incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> context/SystemReference.java&r1=411369&r2=411373&rev=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/context/SystemReference.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/SystemReference.java Fri Jun
>> 2 20:52:57 2006
>> @@ -1,4 +1,4 @@
>> -package org.apache.tuscany.core.system.context;
>> +package org.apache.tuscany.core.system.component;
>>
>> import org.apache.tuscany.spi.context.Reference;
>>
>>
>> Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/
>> org/apache/tuscany/core/system/component/SystemReferenceImpl.java
>> (from r411369, incubator/tuscany/sandbox/jboynes/sca/core2/src/
>> main/java/org/apache/tuscany/core/system/context/
>> SystemReferenceImpl.java)
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> component/SystemReferenceImpl.java?p2=incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> component/SystemReferenceImpl.java&p1=incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> context/
>> SystemReferenceImpl.java&r1=411369&r2=411373&rev=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/context/SystemReferenceImpl.java
>> (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/SystemReferenceImpl.java Fri
>> Jun 2 20:52:57 2006
>> @@ -1,9 +1,10 @@
>> -package org.apache.tuscany.core.system.context;
>> +package org.apache.tuscany.core.system.component;
>>
>> import java.lang.reflect.Method;
>>
>> import org.apache.tuscany.core.system.wire.SystemInboundWire;
>> import org.apache.tuscany.core.system.wire.SystemOutboundWire;
>> +import org.apache.tuscany.core.system.component.SystemReference;
>> import org.apache.tuscany.spi.context.AbstractSCAObject;
>> import org.apache.tuscany.spi.context.CompositeComponent;
>> import org.apache.tuscany.spi.context.TargetException;
>>
>> Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/
>> org/apache/tuscany/core/system/component/SystemService.java (from
>> r411369, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/
>> org/apache/tuscany/core/system/context/SystemService.java)
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> component/SystemService.java?p2=incubator/tuscany/sandbox/jboynes/
>> sca/core2/src/main/java/org/apache/tuscany/core/system/component/
>> SystemService.java&p1=incubator/tuscany/sandbox/jboynes/sca/core2/
>> src/main/java/org/apache/tuscany/core/system/context/
>> SystemService.java&r1=411369&r2=411373&rev=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/context/SystemService.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/SystemService.java Fri Jun 2
>> 20:52:57 2006
>> @@ -1,4 +1,4 @@
>> -package org.apache.tuscany.core.system.context;
>> +package org.apache.tuscany.core.system.component;
>>
>> import org.apache.tuscany.spi.context.Service;
>>
>>
>> Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/
>> org/apache/tuscany/core/system/component/SystemServiceImpl.java
>> (from r411369, incubator/tuscany/sandbox/jboynes/sca/core2/src/
>> main/java/org/apache/tuscany/core/system/context/
>> SystemServiceImpl.java)
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> component/SystemServiceImpl.java?p2=incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> component/SystemServiceImpl.java&p1=incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> context/
>> SystemServiceImpl.java&r1=411369&r2=411373&rev=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/context/SystemServiceImpl.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/SystemServiceImpl.java Fri
>> Jun 2 20:52:57 2006
>> @@ -1,7 +1,8 @@
>> -package org.apache.tuscany.core.system.context;
>> +package org.apache.tuscany.core.system.component;
>>
>> import org.apache.tuscany.core.system.wire.SystemInboundWire;
>> import org.apache.tuscany.core.system.wire.SystemOutboundWire;
>> +import org.apache.tuscany.core.system.component.SystemService;
>> import org.apache.tuscany.spi.CoreRuntimeException;
>> import org.apache.tuscany.spi.context.AbstractSCAObject;
>> import org.apache.tuscany.spi.context.CompositeComponent;
>>
>> Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/
>> org/apache/tuscany/core/system/component/
>> SystemSingletonAtomicComponent.java (from r411369, incubator/
>> tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/
>> core/system/context/SystemSingletonAtomicComponent.java)
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> component/SystemSingletonAtomicComponent.java?p2=incubator/tuscany/
>> sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/
>> system/component/SystemSingletonAtomicComponent.java&p1=incubator/
>> tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/
>> core/system/context/
>> SystemSingletonAtomicComponent.java&r1=411369&r2=411373&rev=411373&vi
>> ew=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/context/
>> SystemSingletonAtomicComponent.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/
>> SystemSingletonAtomicComponent.java Fri Jun 2 20:52:57 2006
>> @@ -1,4 +1,4 @@
>> -package org.apache.tuscany.core.system.context;
>> +package org.apache.tuscany.core.system.component;
>>
>> import java.lang.reflect.Method;
>> import java.util.ArrayList;
>> @@ -14,6 +14,7 @@
>> import org.apache.tuscany.spi.wire.OutboundWire;
>> import org.apache.tuscany.spi.wire.TargetInvoker;
>> import org.apache.tuscany.spi.wire.InboundWire;
>> +import
>> org.apache.tuscany.core.system.component.SystemAtomicComponent;
>>
>> /**
>> * An {@link org.apache.tuscany.spi.context.AtomicComponent} used
>> when registering objects directly into a
>>
>> Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/
>> org/apache/tuscany/core/system/component/
>> SystemWireObjectFactory.java (from r411369, incubator/tuscany/
>> sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/
>> system/context/SystemWireObjectFactory.java)
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> component/SystemWireObjectFactory.java?p2=incubator/tuscany/
>> sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/
>> system/component/SystemWireObjectFactory.java&p1=incubator/tuscany/
>> sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/
>> system/context/
>> SystemWireObjectFactory.java&r1=411369&r2=411373&rev=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/context/SystemWireObjectFactory.java
>> (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/SystemWireObjectFactory.java
>> Fri Jun 2 20:52:57 2006
>> @@ -1,4 +1,4 @@
>> -package org.apache.tuscany.core.system.context;
>> +package org.apache.tuscany.core.system.component;
>>
>> import org.apache.tuscany.core.system.wire.SystemOutboundWire;
>> import org.apache.tuscany.spi.ObjectCreationException;
>>
>> Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/
>> java/org/apache/tuscany/core/component/scope/
>> BasicHttpSessionScopeTestCase.java
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/
>> scope/BasicHttpSessionScopeTestCase.java?
>> rev=411373&r1=411372&r2=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/
>> BasicHttpSessionScopeTestCase.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/
>> BasicHttpSessionScopeTestCase.java Fri Jun 2 20:52:57 2006
>> @@ -8,8 +8,8 @@
>> import org.apache.tuscany.core.injection.MethodEventInvoker;
>> import org.apache.tuscany.core.injection.PojoObjectFactory;
>> import
>> org.apache.tuscany.core.mock.component.SessionScopeInitDestroyCompone
>> nt;
>> -import org.apache.tuscany.core.system.context.SystemAtomicComponent;
>> -import
>> org.apache.tuscany.core.system.context.SystemAtomicComponentImpl;
>> +import
>> org.apache.tuscany.core.system.component.SystemAtomicComponent;
>> +import
>> org.apache.tuscany.core.system.component.SystemAtomicComponentImpl;
>> import org.apache.tuscany.spi.ObjectFactory;
>> import org.apache.tuscany.spi.context.WorkContext;
>> import org.apache.tuscany.spi.context.ScopeContext;
>>
>> Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/
>> java/org/apache/tuscany/core/component/scope/
>> BasicModuleScopeTestCase.java
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/
>> scope/BasicModuleScopeTestCase.java?
>> rev=411373&r1=411372&r2=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/BasicModuleScopeTestCase.java
>> (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/BasicModuleScopeTestCase.java
>> Fri Jun 2 20:52:57 2006
>> @@ -3,13 +3,13 @@
>> import junit.framework.TestCase;
>> import org.apache.tuscany.core.component.WorkContextImpl;
>> import org.apache.tuscany.core.component.scope.ModuleScopeContext;
>> -import org.apache.tuscany.core.component.event.ModuleStop;
>> +import org.apache.tuscany.core.component.event.CompositeStop;
>> import org.apache.tuscany.core.injection.EventInvoker;
>> import org.apache.tuscany.core.injection.MethodEventInvoker;
>> import org.apache.tuscany.core.injection.PojoObjectFactory;
>> import
>> org.apache.tuscany.core.mock.component.ModuleScopeInitDestroyComponen
>> t;
>> -import org.apache.tuscany.core.system.context.SystemAtomicComponent;
>> -import
>> org.apache.tuscany.core.system.context.SystemAtomicComponentImpl;
>> +import
>> org.apache.tuscany.core.system.component.SystemAtomicComponent;
>> +import
>> org.apache.tuscany.core.system.component.SystemAtomicComponentImpl;
>> import org.apache.tuscany.spi.ObjectFactory;
>> import org.apache.tuscany.spi.context.WorkContext;
>> import org.apache.tuscany.spi.context.ScopeContext;
>> @@ -34,7 +34,7 @@
>> assertFalse(o1.isDestroyed());
>> ModuleScopeInitDestroyComponent o2 =
>> (ModuleScopeInitDestroyComponent) scopeContext.getInstance
>> (atomicContext);
>> assertEquals(o1, o2);
>> - scopeContext.onEvent(new ModuleStop(this, null));
>> + scopeContext.onEvent(new CompositeStop(this, null));
>> assertTrue(o1.isDestroyed());
>> scopeContext.stop();
>> }
>> @@ -53,7 +53,7 @@
>>
>> ModuleScopeInitDestroyComponent o2 =
>> (ModuleScopeInitDestroyComponent) scopeContext.getInstance
>> (atomicContext);
>> assertSame(o1, o2);
>> - scopeContext.onEvent(new ModuleStop(this, null));
>> + scopeContext.onEvent(new CompositeStop(this, null));
>> assertTrue(o1.isDestroyed());
>> scopeContext.stop();
>> }
>>
>> Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/
>> java/org/apache/tuscany/core/component/scope/
>> BasicRequestScopeTestCase.java
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/
>> scope/BasicRequestScopeTestCase.java?
>> rev=411373&r1=411372&r2=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/BasicRequestScopeTestCase.java
>> (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/BasicRequestScopeTestCase.java
>> Fri Jun 2 20:52:57 2006
>> @@ -7,8 +7,8 @@
>> import org.apache.tuscany.core.injection.MethodEventInvoker;
>> import org.apache.tuscany.core.injection.PojoObjectFactory;
>> import
>> org.apache.tuscany.core.mock.component.RequestScopeInitDestroyCompone
>> nt;
>> -import org.apache.tuscany.core.system.context.SystemAtomicComponent;
>> -import
>> org.apache.tuscany.core.system.context.SystemAtomicComponentImpl;
>> +import
>> org.apache.tuscany.core.system.component.SystemAtomicComponent;
>> +import
>> org.apache.tuscany.core.system.component.SystemAtomicComponentImpl;
>> import org.apache.tuscany.spi.ObjectFactory;
>> import org.apache.tuscany.spi.context.ScopeContext;
>>
>>
>> Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/
>> java/org/apache/tuscany/core/component/scope/
>> BasicStatelessScopeTestCase.java
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/
>> scope/BasicStatelessScopeTestCase.java?
>> rev=411373&r1=411372&r2=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/
>> BasicStatelessScopeTestCase.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/
>> BasicStatelessScopeTestCase.java Fri Jun 2 20:52:57 2006
>> @@ -7,7 +7,7 @@
>> import org.apache.tuscany.core.mock.factories.MockContextFactory;
>> import org.apache.tuscany.core.mock.component.StatelessComponent;
>> import org.apache.tuscany.core.mock.component.StatelessComponentImpl;
>> -import org.apache.tuscany.core.system.context.SystemAtomicComponent;
>> +import
>> org.apache.tuscany.core.system.component.SystemAtomicComponent;
>> import org.apache.tuscany.spi.context.WorkContext;
>>
>> /**
>>
>> Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/
>> java/org/apache/tuscany/core/component/scope/
>> DependencyLifecycleTestCase.java
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/
>> scope/DependencyLifecycleTestCase.java?
>> rev=411373&r1=411372&r2=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/
>> DependencyLifecycleTestCase.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/
>> DependencyLifecycleTestCase.java Fri Jun 2 20:52:57 2006
>> @@ -8,8 +8,8 @@
>> import org.apache.tuscany.core.component.scope.ModuleScopeContext;
>> import org.apache.tuscany.core.component.scope.RequestScopeContext;
>> import org.apache.tuscany.core.component.event.HttpSessionEnd;
>> -import org.apache.tuscany.core.component.event.ModuleStart;
>> -import org.apache.tuscany.core.component.event.ModuleStop;
>> +import org.apache.tuscany.core.component.event.CompositeStart;
>> +import org.apache.tuscany.core.component.event.CompositeStop;
>> import org.apache.tuscany.core.component.event.RequestEnd;
>> import org.apache.tuscany.core.component.event.RequestStart;
>> import org.apache.tuscany.core.mock.factories.MockContextFactory;
>> @@ -40,13 +40,13 @@
>> AtomicComponent targetComponent = contexts.get("target");
>> scopeCtx.register(sourceComponent);
>> scopeCtx.register(targetComponent);
>> - scopeCtx.onEvent(new ModuleStart(this, null));
>> + scopeCtx.onEvent(new CompositeStart(this, null));
>> OrderedDependentPojo source = (OrderedDependentPojo)
>> scopeCtx.getInstance(sourceComponent);
>> OrderedInitPojo target = (OrderedInitPojo)
>> scopeCtx.getInstance(targetComponent);
>> assertNotNull(source.getPojo());
>> assertNotNull(target);
>> assertEquals(2, source.getNumberInstantiated());
>> - scopeCtx.onEvent(new ModuleStop(this, null));
>> + scopeCtx.onEvent(new CompositeStop(this, null));
>> assertEquals(0, source.getNumberInstantiated());
>> scopeCtx.stop();
>> }
>> @@ -59,7 +59,7 @@
>> scopeCtx, "target", OrderedInitPojoImpl.class,
>> scopeCtx);
>> AtomicComponent sourceComponent = contexts.get("source");
>> AtomicComponent targetComponent = contexts.get("target");
>> - scopeCtx.onEvent(new ModuleStart(this, null));
>> + scopeCtx.onEvent(new CompositeStart(this, null));
>> scopeCtx.register(sourceComponent);
>> scopeCtx.register(targetComponent);
>> OrderedDependentPojo source = (OrderedDependentPojo)
>> scopeCtx.getInstance(sourceComponent);
>> @@ -67,7 +67,7 @@
>> assertNotNull(source.getPojo());
>> assertNotNull(target);
>> assertEquals(2, source.getNumberInstantiated());
>> - scopeCtx.onEvent(new ModuleStop(this, null));
>> + scopeCtx.onEvent(new CompositeStop(this, null));
>> assertEquals(0, source.getNumberInstantiated());
>> scopeCtx.stop();
>> }
>>
>> Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/
>> java/org/apache/tuscany/core/component/scope/
>> HttpSessionScopeInstanceLifecycleTestCase.java
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/
>> scope/HttpSessionScopeInstanceLifecycleTestCase.java?
>> rev=411373&r1=411372&r2=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/
>> HttpSessionScopeInstanceLifecycleTestCase.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/
>> HttpSessionScopeInstanceLifecycleTestCase.java Fri Jun 2 20:52:57
>> 2006
>> @@ -13,7 +13,7 @@
>> import
>> org.apache.tuscany.core.mock.component.RequestScopeDestroyOnlyCompone
>> nt;
>> import
>> org.apache.tuscany.core.mock.component.RequestScopeInitDestroyCompone
>> nt;
>> import
>> org.apache.tuscany.core.mock.component.RequestScopeInitOnlyComponent;
>> -import org.apache.tuscany.core.system.context.SystemAtomicComponent;
>> +import
>> org.apache.tuscany.core.system.component.SystemAtomicComponent;
>> import org.apache.tuscany.spi.context.WorkContext;
>>
>> /**
>>
>> Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/
>> java/org/apache/tuscany/core/component/scope/
>> HttpSessionScopeRestartTestCase.java
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/
>> scope/HttpSessionScopeRestartTestCase.java?
>> rev=411373&r1=411372&r2=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/
>> HttpSessionScopeRestartTestCase.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/
>> HttpSessionScopeRestartTestCase.java Fri Jun 2 20:52:57 2006
>> @@ -10,7 +10,7 @@
>> import org.apache.tuscany.core.component.event.HttpSessionEnd;
>> import org.apache.tuscany.core.component.event.HttpSessionStart;
>> import org.apache.tuscany.core.injection.MethodEventInvoker;
>> -import org.apache.tuscany.core.system.context.SystemAtomicComponent;
>> +import
>> org.apache.tuscany.core.system.component.SystemAtomicComponent;
>> import org.apache.tuscany.core.mock.factories.MockContextFactory;
>>
>> /**
>>
>> Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/
>> java/org/apache/tuscany/core/component/scope/
>> ModuleScopeInstanceLifecycleTestCase.java
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/
>> scope/ModuleScopeInstanceLifecycleTestCase.java?
>> rev=411373&r1=411372&r2=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/
>> ModuleScopeInstanceLifecycleTestCase.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/
>> ModuleScopeInstanceLifecycleTestCase.java Fri Jun 2 20:52:57 2006
>> @@ -5,8 +5,8 @@
>> import junit.framework.TestCase;
>> import org.apache.tuscany.core.component.WorkContextImpl;
>> import org.apache.tuscany.core.component.scope.ModuleScopeContext;
>> -import org.apache.tuscany.core.component.event.ModuleStart;
>> -import org.apache.tuscany.core.component.event.ModuleStop;
>> +import org.apache.tuscany.core.component.event.CompositeStart;
>> +import org.apache.tuscany.core.component.event.CompositeStop;
>> import org.apache.tuscany.core.mock.factories.MockContextFactory;
>> import
>> org.apache.tuscany.core.mock.component.ModuleScopeDestroyOnlyComponen
>> t;
>> import
>> org.apache.tuscany.core.mock.component.ModuleScopeInitDestroyComponen
>> t;
>> @@ -14,7 +14,7 @@
>> import org.apache.tuscany.core.mock.component.OrderedInitPojoImpl;
>> import org.apache.tuscany.core.mock.component.OrderedInitPojo;
>> import org.apache.tuscany.core.mock.component.OrderedEagerInitPojo;
>> -import org.apache.tuscany.core.system.context.SystemAtomicComponent;
>> +import
>> org.apache.tuscany.core.system.component.SystemAtomicComponent;
>> import org.apache.tuscany.spi.context.WorkContext;
>>
>> /**
>> @@ -38,7 +38,7 @@
>> SystemAtomicComponent destroyOnlyContext =
>> MockContextFactory.createSystemAtomicContext("DestroyOnly", scope,
>> ModuleScopeDestroyOnlyComponent.class);
>> destroyOnlyContext.start();
>>
>> - scope.onEvent(new ModuleStart(this, null));
>> + scope.onEvent(new CompositeStart(this, null));
>> ModuleScopeInitDestroyComponent initDestroy =
>> (ModuleScopeInitDestroyComponent) scope.getInstance
>> (initDestroyContext);
>> Assert.assertNotNull(initDestroy);
>>
>> @@ -54,7 +54,7 @@
>> Assert.assertFalse(destroyOnly.isDestroyed());
>>
>> // expire module
>> - scope.onEvent(new ModuleStop(this, null));
>> + scope.onEvent(new CompositeStop(this, null));
>>
>> Assert.assertTrue(initDestroy.isDestroyed());
>> Assert.assertTrue(destroyOnly.isDestroyed());
>> @@ -74,7 +74,7 @@
>> SystemAtomicComponent threeCtx =
>> MockContextFactory.createSystemAtomicContext("three", scope,
>> OrderedInitPojoImpl.class);
>> scope.register(threeCtx);
>>
>> - scope.onEvent(new ModuleStart(this,null));
>> + scope.onEvent(new CompositeStart(this,null));
>> OrderedInitPojo one = (OrderedInitPojo) scope.getInstance
>> (oneCtx);
>> Assert.assertNotNull(one);
>> Assert.assertEquals(1, one.getNumberInstantiated());
>> @@ -91,7 +91,7 @@
>> Assert.assertEquals(3, three.getInitOrder());
>>
>> // expire module
>> - scope.onEvent(new ModuleStop(this,null));
>> + scope.onEvent(new CompositeStop(this,null));
>> Assert.assertEquals(0, one.getNumberInstantiated());
>> scope.stop();
>> }
>> @@ -108,7 +108,7 @@
>> SystemAtomicComponent threeCtx =
>> MockContextFactory.createSystemAtomicContext("three", scope,
>> OrderedEagerInitPojo.class);
>> scope.register(threeCtx);
>>
>> - scope.onEvent(new ModuleStart(this,null));
>> + scope.onEvent(new CompositeStart(this,null));
>> OrderedEagerInitPojo one = (OrderedEagerInitPojo)
>> scope.getInstance(oneCtx);
>> Assert.assertNotNull(one);
>>
>> @@ -119,7 +119,7 @@
>> Assert.assertNotNull(three);
>>
>> // expire module
>> - scope.onEvent(new ModuleStop(this,null));
>> + scope.onEvent(new CompositeStop(this,null));
>> Assert.assertEquals(0, one.getNumberInstantiated());
>> scope.stop();
>> }
>>
>> Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/
>> java/org/apache/tuscany/core/component/scope/
>> ModuleScopeRestartTestCase.java
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/
>> scope/ModuleScopeRestartTestCase.java?
>> rev=411373&r1=411372&r2=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/
>> ModuleScopeRestartTestCase.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/
>> ModuleScopeRestartTestCase.java Fri Jun 2 20:52:57 2006
>> @@ -6,11 +6,11 @@
>> import junit.framework.TestCase;
>> import org.apache.tuscany.core.component.WorkContextImpl;
>> import org.apache.tuscany.core.component.scope.ModuleScopeContext;
>> -import org.apache.tuscany.core.component.event.ModuleStart;
>> -import org.apache.tuscany.core.component.event.ModuleStop;
>> +import org.apache.tuscany.core.component.event.CompositeStart;
>> +import org.apache.tuscany.core.component.event.CompositeStop;
>> import org.apache.tuscany.core.injection.MethodEventInvoker;
>> import org.apache.tuscany.core.mock.factories.MockContextFactory;
>> -import org.apache.tuscany.core.system.context.SystemAtomicComponent;
>> +import
>> org.apache.tuscany.core.system.component.SystemAtomicComponent;
>> import org.apache.tuscany.spi.context.WorkContext;
>>
>> /**
>> @@ -30,20 +30,20 @@
>> InitDestroyOnce.class, false, initInvoker,
>> destroyInvoker, null,null);
>> context.start();
>>
>> - scope.onEvent(new ModuleStart(this, null));
>> + scope.onEvent(new CompositeStart(this, null));
>> Object instance = context.getService();
>> assertSame(instance, context.getService());
>>
>> - scope.onEvent(new ModuleStop(this, null));
>> + scope.onEvent(new CompositeStop(this, null));
>> scope.stop();
>> context.stop();
>>
>> scope.start();
>> - scope.onEvent(new ModuleStart(this, null));
>> + scope.onEvent(new CompositeStart(this, null));
>> scope.register(context);
>> context.start();
>> assertNotSame(instance, context.getService());
>> - scope.onEvent(new ModuleStop(this, null));
>> + scope.onEvent(new CompositeStop(this, null));
>> scope.stop();
>> context.stop();
>> }
>>
>> Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/
>> java/org/apache/tuscany/core/component/scope/
>> RequestScopeInstanceLifecycleTestCase.java
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/
>> scope/RequestScopeInstanceLifecycleTestCase.java?
>> rev=411373&r1=411372&r2=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/
>> RequestScopeInstanceLifecycleTestCase.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/
>> RequestScopeInstanceLifecycleTestCase.java Fri Jun 2 20:52:57 2006
>> @@ -13,7 +13,7 @@
>> import
>> org.apache.tuscany.core.mock.component.RequestScopeDestroyOnlyCompone
>> nt;
>> import
>> org.apache.tuscany.core.mock.component.RequestScopeInitDestroyCompone
>> nt;
>> import
>> org.apache.tuscany.core.mock.component.RequestScopeInitOnlyComponent;
>> -import org.apache.tuscany.core.system.context.SystemAtomicComponent;
>> +import
>> org.apache.tuscany.core.system.component.SystemAtomicComponent;
>> import org.apache.tuscany.spi.context.WorkContext;
>>
>> /**
>>
>> Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/
>> java/org/apache/tuscany/core/component/scope/
>> RequestScopeRestartTestCase.java
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/
>> scope/RequestScopeRestartTestCase.java?
>> rev=411373&r1=411372&r2=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/
>> RequestScopeRestartTestCase.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/
>> RequestScopeRestartTestCase.java Fri Jun 2 20:52:57 2006
>> @@ -9,7 +9,7 @@
>> import org.apache.tuscany.core.component.scope.RequestScopeContext;
>> import org.apache.tuscany.core.component.event.RequestEnd;
>> import org.apache.tuscany.core.injection.MethodEventInvoker;
>> -import org.apache.tuscany.core.system.context.SystemAtomicComponent;
>> +import
>> org.apache.tuscany.core.system.component.SystemAtomicComponent;
>> import org.apache.tuscany.core.mock.factories.MockContextFactory;
>>
>> /**
>>
>> Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/
>> java/org/apache/tuscany/core/integration/system/builder/
>> AutowireBuilderTestcase.java
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/
>> integration/system/builder/AutowireBuilderTestcase.java?
>> rev=411373&r1=411372&r2=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/integration/system/builder/
>> AutowireBuilderTestcase.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/integration/system/builder/
>> AutowireBuilderTestcase.java Fri Jun 2 20:52:57 2006
>> @@ -5,15 +5,15 @@
>> import org.apache.tuscany.core.builder.ConnectorImpl;
>> import org.apache.tuscany.core.component.WorkContextImpl;
>> import org.apache.tuscany.core.component.scope.ModuleScopeContext;
>> -import org.apache.tuscany.core.component.event.ModuleStart;
>> -import org.apache.tuscany.core.component.event.ModuleStop;
>> +import org.apache.tuscany.core.component.event.CompositeStart;
>> +import org.apache.tuscany.core.component.event.CompositeStop;
>> import org.apache.tuscany.core.mock.factories.MockComponentFactory;
>> import org.apache.tuscany.core.mock.component.Source;
>> import org.apache.tuscany.core.mock.component.Target;
>> import org.apache.tuscany.core.system.builder.SystemBindingBuilder;
>> import org.apache.tuscany.core.system.builder.SystemComponentBuilder;
>> -import
>> org.apache.tuscany.core.system.context.SystemCompositeComponent;
>> -import
>> org.apache.tuscany.core.system.context.SystemCompositeComponentImpl;
>> +import
>> org.apache.tuscany.core.system.component.SystemCompositeComponent;
>> +import
>> org.apache.tuscany.core.system.component.SystemCompositeComponentImpl
>> ;
>> import org.apache.tuscany.core.system.model.SystemBinding;
>> import org.apache.tuscany.core.system.model.SystemImplementation;
>> import org.apache.tuscany.spi.model.BoundReferenceDefinition;
>> @@ -65,14 +65,14 @@
>> connector.connect(sourceComponent);
>>
>> grandParent.start();
>> - scope.onEvent(new ModuleStart(this, parent));
>> + scope.onEvent(new CompositeStart(this, parent));
>> Source source = (Source) parent.getChild
>> ("source").getService();
>> assertNotNull(source);
>> Target target = (Target) parent.getChild
>> ("target").getService();
>> assertNotNull(target);
>> assertSame(target, source.getTarget());
>> assertSame(target, grandParent.getChild
>> ("target").getService());
>> - scope.onEvent(new ModuleStop(this, parent));
>> + scope.onEvent(new CompositeStop(this, parent));
>> grandParent.stop();
>> scope.stop();
>> }
>> @@ -99,13 +99,13 @@
>> parent.register(sourceComponent);
>>
>> parent.start();
>> - scope.onEvent(new ModuleStart(this, parent));
>> + scope.onEvent(new CompositeStart(this, parent));
>> Source source = (Source) parent.getChild
>> ("source").getService();
>> assertNotNull(source);
>> Target target = (Target) parent.getChild
>> ("target").getService();
>> assertNotNull(target);
>> assertSame(target, source.getTarget());
>> - scope.onEvent(new ModuleStop(this, parent));
>> + scope.onEvent(new CompositeStop(this, parent));
>> parent.stop();
>> scope.stop();
>> }
>>
>> Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/
>> java/org/apache/tuscany/core/integration/system/builder/
>> SystemBuildersTestCase.java
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/
>> integration/system/builder/SystemBuildersTestCase.java?
>> rev=411373&r1=411372&r2=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/integration/system/builder/
>> SystemBuildersTestCase.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/integration/system/builder/
>> SystemBuildersTestCase.java Fri Jun 2 20:52:57 2006
>> @@ -5,15 +5,15 @@
>> import org.apache.tuscany.core.builder.ConnectorImpl;
>> import org.apache.tuscany.core.component.WorkContextImpl;
>> import org.apache.tuscany.core.component.scope.ModuleScopeContext;
>> -import org.apache.tuscany.core.component.event.ModuleStart;
>> -import org.apache.tuscany.core.component.event.ModuleStop;
>> +import org.apache.tuscany.core.component.event.CompositeStart;
>> +import org.apache.tuscany.core.component.event.CompositeStop;
>> import org.apache.tuscany.core.mock.component.Source;
>> import org.apache.tuscany.core.mock.component.Target;
>> import org.apache.tuscany.core.mock.factories.MockComponentFactory;
>> import org.apache.tuscany.core.system.builder.SystemBindingBuilder;
>> import org.apache.tuscany.core.system.builder.SystemComponentBuilder;
>> -import
>> org.apache.tuscany.core.system.context.SystemCompositeComponent;
>> -import
>> org.apache.tuscany.core.system.context.SystemCompositeComponentImpl;
>> +import
>> org.apache.tuscany.core.system.component.SystemCompositeComponent;
>> +import
>> org.apache.tuscany.core.system.component.SystemCompositeComponentImpl
>> ;
>> import org.apache.tuscany.core.system.model.SystemBinding;
>> import org.apache.tuscany.core.system.model.SystemImplementation;
>> import org.apache.tuscany.spi.context.AtomicComponent;
>> @@ -59,13 +59,13 @@
>> connector.connect(sourceComponent);
>> connector.connect(targetComponent);
>> parent.start();
>> - scope.onEvent(new ModuleStart(this, parent));
>> + scope.onEvent(new CompositeStart(this, parent));
>> Source source = (Source) parent.getChild
>> ("source").getService();
>> assertNotNull(source);
>> Target target = (Target) parent.getChild
>> ("target").getService();
>> assertNotNull(target);
>> assertSame(target, source.getTarget());
>> - scope.onEvent(new ModuleStop(this, parent));
>> + scope.onEvent(new CompositeStop(this, parent));
>> parent.stop();
>> scope.stop();
>> }
>> @@ -102,13 +102,13 @@
>> connector.connect(sourceComponent);
>> grandParent.register(parent);
>> grandParent.start();
>> - scope.onEvent(new ModuleStart(this, parent));
>> + scope.onEvent(new CompositeStart(this, parent));
>> Source source = (Source) parent.getChild
>> ("source").getService();
>> assertNotNull(source);
>> Target target = (Target) parent.getChild
>> ("target").getService();
>> assertNotNull(target);
>> assertSame(target, source.getTarget());
>> - scope.onEvent(new ModuleStop(this, parent));
>> + scope.onEvent(new CompositeStop(this, parent));
>> grandParent.stop();
>> scope.stop();
>> }
>> @@ -143,13 +143,13 @@
>> String serviceName = service.getOutboundWire
>> ().getTargetName().getPortName();
>> connector.connect(service.getOutboundWire(),
>> sourceComponent.getInboundWire(serviceName), parent, true);
>> parent.start();
>> - scope.onEvent(new ModuleStart(this, parent));
>> + scope.onEvent(new CompositeStart(this, parent));
>> Target target = (Target) parent.getChild
>> ("serviceDefinition").getService();
>> assertNotNull(target);
>> Target target2 = (Target) parent.getChild
>> ("target").getService();
>> assertNotNull(target);
>> assertSame(target, target2);
>> - scope.onEvent(new ModuleStop(this, parent));
>> + scope.onEvent(new CompositeStop(this, parent));
>> parent.stop();
>> scope.stop();
>>
>> @@ -188,13 +188,13 @@
>> // connector.connect(serviceContext.getOutboundWire(),
>> referenceContext.getInboundWire(),true);
>> // grandParent.registerContext(parent);
>> // grandParent.start();
>> -// scope.onEvent(new ModuleStart(this, parent));
>> +// scope.onEvent(new CompositeStart(this, parent));
>> // Target target = (Target) parent.getContext
>> ("service").getService();
>> // assertNotNull(target);
>> // Target target2 = (Target) parent.getContext
>> ("target").getService();
>> // assertNotNull(target);
>> // assertSame(target, target2);
>> -// scope.onEvent(new ModuleStop(this, parent));
>> +// scope.onEvent(new CompositeStop(this, parent));
>> // parent.stop();
>> // scope.stop();
>>
>>
>> Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/
>> java/org/apache/tuscany/core/mock/factories/MockContextFactory.java
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/
>> factories/MockContextFactory.java?
>> rev=411373&r1=411372&r2=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/mock/factories/MockContextFactory.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/mock/factories/MockContextFactory.java Fri
>> Jun 2 20:52:57 2006
>> @@ -12,8 +12,8 @@
>> import org.apache.tuscany.core.injection.Injector;
>> import org.apache.tuscany.core.injection.MethodEventInvoker;
>> import org.apache.tuscany.core.injection.PojoObjectFactory;
>> -import org.apache.tuscany.core.system.context.SystemAtomicComponent;
>> -import
>> org.apache.tuscany.core.system.context.SystemAtomicComponentImpl;
>> +import
>> org.apache.tuscany.core.system.component.SystemAtomicComponent;
>> +import
>> org.apache.tuscany.core.system.component.SystemAtomicComponentImpl;
>> import org.apache.tuscany.core.system.wire.SystemInboundWireImpl;
>> import org.apache.tuscany.core.system.wire.SystemOutboundWireImpl;
>> import org.apache.tuscany.core.system.wire.SystemOutboundWire;
>>
>> Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/
>> org/apache/tuscany/core/system/component/AutowireTestCase.java
>> (from r411369, incubator/tuscany/sandbox/jboynes/sca/core2/src/
>> test/java/org/apache/tuscany/core/system/context/
>> AutowireTestCase.java)
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/
>> component/AutowireTestCase.java?p2=incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/
>> component/AutowireTestCase.java&p1=incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/
>> context/
>> AutowireTestCase.java&r1=411369&r2=411373&rev=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/system/context/AutowireTestCase.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/system/component/AutowireTestCase.java Fri
>> Jun 2 20:52:57 2006
>> @@ -1,10 +1,15 @@
>> -package org.apache.tuscany.core.system.context;
>> +package org.apache.tuscany.core.system.component;
>>
>> import java.util.ArrayList;
>> import java.util.List;
>>
>> import org.jmock.Mock;
>> import org.jmock.MockObjectTestCase;
>> +import
>> org.apache.tuscany.core.system.component.SystemAtomicComponent;
>> +import
>> org.apache.tuscany.core.system.component.SystemCompositeComponent;
>> +import
>> org.apache.tuscany.core.system.component.SystemCompositeComponentImpl
>> ;
>> +import org.apache.tuscany.core.system.component.SystemReference;
>> +import org.apache.tuscany.core.system.component.SystemService;
>>
>> /**
>> * Performs basic autowiring tests to composite artifacts
>>
>> Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/
>> org/apache/tuscany/core/system/component/ChildLocateTestCase.java
>> (from r411369, incubator/tuscany/sandbox/jboynes/sca/core2/src/
>> test/java/org/apache/tuscany/core/system/context/
>> ChildLocateTestCase.java)
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/
>> component/ChildLocateTestCase.java?p2=incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/
>> component/ChildLocateTestCase.java&p1=incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/
>> context/
>> ChildLocateTestCase.java&r1=411369&r2=411373&rev=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/system/context/ChildLocateTestCase.java
>> (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/system/component/ChildLocateTestCase.java Fri
>> Jun 2 20:52:57 2006
>> @@ -1,4 +1,4 @@
>> -package org.apache.tuscany.core.system.context;
>> +package org.apache.tuscany.core.system.component;
>>
>> import junit.framework.TestCase;
>>
>> @@ -19,7 +19,7 @@
>> // SystemAtomicComponent context =
>> MockContextFactory.createSystemAtomicContext("source",
>> SourceImpl.class);
>> // scopeContext.register(context);
>> // context.setScopeContext(scopeContext);
>> -// scopeContext.publish(new ModuleStart(this, parent));
>> +// scopeContext.publish(new CompositeStart(this, parent));
>> //
>> // assertNotNull(source);
>> // CompositeComponent composite1 = (CompositeComponent)
>> parent.getContext("child1");
>> @@ -27,7 +27,7 @@
>> // AtomicComponent ctx2 = (AtomicComponent)
>> composite2.getContext("source");
>> // Source source2 = (Source) ctx2.getInstance();
>> // assertSame(source, source2);
>> -// scopeContext.onEvent(new ModuleStop(this, parent));
>> +// scopeContext.onEvent(new CompositeStop(this, parent));
>> // parent.stop();
>> // scopeContext.stop();
>> /////
>> @@ -42,8 +42,8 @@
>> // EntryPoint ep = MockContextFactory.createEPSystemBinding
>> ("TestService1EP", ModuleScopeSystemComponent.class,
>> "TestService1", component);
>> // childContext.registerModelObject(component);
>> // childContext.registerModelObject(ep);
>> -// childContext.publish(new ModuleStart(this));
>> +// childContext.publish(new CompositeStart(this));
>> // Assert.assertNotNull(system.getContext
>> ("system.child").getInstance(new QualifiedName("./TestService1EP")));
>> -// childContext.publish(new ModuleStop(this));
>> +// childContext.publish(new CompositeStop(this));
>> }
>> }
>>
>> Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/
>> org/apache/tuscany/core/system/component/
>> CompositePropagationTestCase.java (from r411369, incubator/tuscany/
>> sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/
>> system/context/CompositePropagationTestCase.java)
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/
>> component/CompositePropagationTestCase.java?p2=incubator/tuscany/
>> sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/
>> system/component/CompositePropagationTestCase.java&p1=incubator/
>> tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/
>> core/system/context/
>> CompositePropagationTestCase.java&r1=411369&r2=411373&rev=411373&view
>> =diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/system/context/
>> CompositePropagationTestCase.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/system/component/
>> CompositePropagationTestCase.java Fri Jun 2 20:52:57 2006
>> @@ -1,9 +1,12 @@
>> -package org.apache.tuscany.core.system.context;
>> +package org.apache.tuscany.core.system.component;
>>
>> import java.util.ArrayList;
>> import java.util.List;
>>
>> import org.apache.tuscany.core.mock.component.Source;
>> +import
>> org.apache.tuscany.core.system.component.SystemAtomicComponent;
>> +import
>> org.apache.tuscany.core.system.component.SystemCompositeComponent;
>> +import
>> org.apache.tuscany.core.system.component.SystemCompositeComponentImpl
>> ;
>> import org.jmock.Mock;
>> import org.jmock.MockObjectTestCase;
>>
>>
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
>> For additional commands, e-mail: tuscany-commits-help@ws.apache.org
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: tuscany-dev-unsubscribe@ws.apache.org
> For additional commands, e-mail: tuscany-dev-help@ws.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-dev-help@ws.apache.org
Re: svn commit: r411373 [1/2] - in /incubator/tuscany/sandbox/jboynes/sca: containers/container.java/src/test/java/org/apache/tuscany/container/java/ containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/context/ core2/src/m
Posted by Jim Marino <ji...@gmail.com>.
I fixed that in a subsequent checkin - IntelliJ could not handle the
size of the refactor. Please resync and try again.
Jim
On Jun 2, 2006, at 9:33 PM, Raymond Feng wrote:
> Hi, Jim.
>
> A lot of files cannot compile any more with your check-in. There're
> still a lot of dangling references to
> org.apache.tuscany.spi.context instead of
> org.apache.tuscany.spi.component.
>
> Thanks,
> Raymond
>
> ----- Original Message ----- From: <jm...@apache.org>
> To: <tu...@ws.apache.org>
> Sent: Friday, June 02, 2006 8:52 PM
> Subject: svn commit: r411373 [1/2] - in /incubator/tuscany/sandbox/
> jboynes/sca: containers/container.java/src/test/java/org/apache/
> tuscany/container/java/ containers/container.java/src/test/java/org/
> apache/tuscany/container/java/integration/context/ core2/src/m...
>
>
>> Author: jmarino
>> Date: Fri Jun 2 20:52:57 2006
>> New Revision: 411373
>>
>> URL: http://svn.apache.org/viewvc?rev=411373&view=rev
>> Log:
>> more package refactors
>>
>> Added:
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/component/event/CompositeEvent.java
>> - copied, changed from r411370, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/
>> event/ModuleEvent.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/component/event/CompositeStart.java
>> - copied, changed from r411370, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/
>> event/ModuleStart.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/component/event/CompositeStop.java
>> - copied, changed from r411370, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/
>> event/ModuleStop.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/ObjectRegistrationException.java
>> - copied, changed from r411369, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> context/ObjectRegistrationException.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/SystemAtomicComponent.java
>> - copied, changed from r411369, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> context/SystemAtomicComponent.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/SystemAtomicComponentImpl.java
>> - copied, changed from r411370, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> context/SystemAtomicComponentImpl.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/SystemCompositeComponent.java
>> - copied, changed from r411370, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> context/SystemCompositeComponent.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/
>> SystemCompositeComponentImpl.java
>> - copied, changed from r411370, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> context/SystemCompositeComponentImpl.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/SystemReference.java
>> - copied, changed from r411369, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> context/SystemReference.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/SystemReferenceImpl.java
>> - copied, changed from r411369, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> context/SystemReferenceImpl.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/SystemService.java
>> - copied, changed from r411369, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> context/SystemService.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/SystemServiceImpl.java
>> - copied, changed from r411369, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> context/SystemServiceImpl.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/
>> SystemSingletonAtomicComponent.java
>> - copied, changed from r411369, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> context/SystemSingletonAtomicComponent.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/SystemWireObjectFactory.java
>> - copied, changed from r411369, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> context/SystemWireObjectFactory.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/system/component/
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/system/component/AutowireTestCase.java
>> - copied, changed from r411369, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/
>> context/AutowireTestCase.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/system/component/ChildLocateTestCase.java
>> - copied, changed from r411369, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/
>> context/ChildLocateTestCase.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/system/component/
>> CompositePropagationTestCase.java
>> - copied, changed from r411369, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/
>> context/CompositePropagationTestCase.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/system/component/
>> DuplicateRegistrationTestCase.java
>> - copied, changed from r411369, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/
>> context/DuplicateRegistrationTestCase.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/system/component/
>> SystemAtomicComponentTestCase.java
>> - copied, changed from r411369, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/
>> context/SystemAtomicComponentTestCase.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/system/component/
>> SystemCompositeComponentResolutionTestCase.java
>> - copied, changed from r411369, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/
>> context/SystemCompositeComponentResolutionTestCase.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/system/component/
>> SystemCompositeComponentTestCase.java (contents, props changed)
>> - copied, changed from r411370, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/
>> context/SystemCompositeComponentTestCase.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/system/component/
>> SystemCompositeLifecycleTestCase.java
>> - copied, changed from r411369, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/
>> context/SystemCompositeLifecycleTestCase.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/system/component/
>> SystemObjectRegistrationTestCase.java
>> - copied, changed from r411370, incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/
>> context/SystemObjectRegistrationTestCase.java
>> Removed:
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/component/event/ModuleEvent.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/component/event/ModuleStart.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/component/event/ModuleStop.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/context/
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/context/
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/context/
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/system/context/
>> Modified:
>> incubator/tuscany/sandbox/jboynes/sca/containers/container.java/
>> src/test/java/org/apache/tuscany/container/java/
>> MultiplicityTestCase.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/core2/src/main/java/org/
>> apache/tuscany/core/bootstrap/DefaultRuntime.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/scope/ModuleScopeContext.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/builder/SystemBindingBuilder.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/builder/SystemCompositeBuilder.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/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/wire/
>> AtomicComponentWireInvocationTestCase.java
>> incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/system/wire/
>> SystemServiceComponentWireTestCase.java
>>
>> Modified: incubator/tuscany/sandbox/jboynes/sca/containers/
>> container.java/src/test/java/org/apache/tuscany/container/java/
>> MultiplicityTestCase.java
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/containers/container.java/src/test/java/org/apache/
>> tuscany/container/java/MultiplicityTestCase.java?
>> rev=411373&r1=411372&r2=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/containers/
>> container.java/src/test/java/org/apache/tuscany/container/java/
>> MultiplicityTestCase.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/containers/
>> container.java/src/test/java/org/apache/tuscany/container/java/
>> MultiplicityTestCase.java Fri Jun 2 20:52:57 2006
>> @@ -27,7 +27,7 @@
>> // CompositeComponent context = createContext();
>> // context.start();
>> // context.registerModelObject
>> (MockContextFactory.createModuleWithWiredComponents(Scope.MODULE,
>> Scope.MODULE));
>> -// context.publish(new ModuleStart(this));
>> +// context.publish(new CompositeStart(this));
>> // Source source = (Source) ((AtomicComponent)
>> context.getContext("source")).getTargetInstance();
>> // Assert.assertNotNull(source);
>> // Target target = (Target) ((AtomicComponent)
>> context.getContext("target")).getTargetInstance();
>>
>> 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=411373&r1=411372&r2=411373&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 Fri Jun 2
>> 20:52:57 2006
>> @@ -16,8 +16,8 @@
>> import
>> org.apache.tuscany.core.component.scope.HttpSessionScopeContext;
>> import org.apache.tuscany.core.component.event.HttpSessionEnd;
>> import org.apache.tuscany.core.component.event.HttpSessionStart;
>> -import org.apache.tuscany.core.component.event.ModuleStart;
>> -import org.apache.tuscany.core.component.event.ModuleStop;
>> +import org.apache.tuscany.core.component.event.CompositeStart;
>> +import org.apache.tuscany.core.component.event.CompositeStop;
>> import org.apache.tuscany.core.component.event.RequestEnd;
>> import org.apache.tuscany.core.component.event.RequestStart;
>> import org.apache.tuscany.core.component.scope.ModuleScopeContext;
>> @@ -134,7 +134,7 @@
>>
>> ModuleScopeContext scope = new ModuleScopeContext
>> (workContext);
>> scope.start();
>> - scope.onEvent(new ModuleStart(this, null));
>> + scope.onEvent(new CompositeStart(this, null));
>> final OutboundWire<Target> wire = getWire(scope);
>> Target service = wireService.createProxy(wire);
>> Target target = wireService.createProxy(wire);
>> @@ -142,7 +142,7 @@
>> service.setString("foo");
>> assertEquals("foo", service.getString());
>> assertEquals("foo", target.getString());
>> - scope.onEvent(new ModuleStop(this, null));
>> + scope.onEvent(new CompositeStop(this, null));
>> scope.stop();
>> }
>>
>>
>> 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=411373&r1=411372&r2=411373&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 Fri Jun 2
>> 20:52:57 2006
>> @@ -32,8 +32,8 @@
>> import
>> org.apache.tuscany.core.component.scope.HttpSessionScopeContext;
>> import org.apache.tuscany.core.component.event.HttpSessionEnd;
>> import org.apache.tuscany.core.component.event.HttpSessionStart;
>> -import org.apache.tuscany.core.component.event.ModuleStart;
>> -import org.apache.tuscany.core.component.event.ModuleStop;
>> +import org.apache.tuscany.core.component.event.CompositeStart;
>> +import org.apache.tuscany.core.component.event.CompositeStop;
>> import org.apache.tuscany.core.component.event.RequestEnd;
>> import org.apache.tuscany.core.component.event.RequestStart;
>> import org.apache.tuscany.core.component.scope.ModuleScopeContext;
>> @@ -62,7 +62,7 @@
>> scope.start();
>>
>> Map<String, AtomicComponent> contexts =
>> MockContextFactory.createWiredContexts("source", SourceImpl.class,
>> scope, members, "target", Target.class, TargetImpl.class, scope);
>> - scope.onEvent(new ModuleStart(this, null));
>> + scope.onEvent(new CompositeStart(this, null));
>> AtomicComponent<Source> sourceComponent =
>> (AtomicComponent<Source>) contexts.get("source");
>> AtomicComponent<Target> targetComponent =
>> (AtomicComponent<Target>) contexts.get("target");
>> Source source = sourceComponent.getService();
>> @@ -72,7 +72,7 @@
>> target.setString("foo");
>> assertTrue(Proxy.isProxyClass(source.getTarget().getClass
>> ()));
>> assertEquals("foo", source.getTarget().getString());
>> - scope.onEvent(new ModuleStop(this, null));
>> + scope.onEvent(new CompositeStop(this, null));
>> scope.stop();
>> }
>>
>> @@ -89,7 +89,7 @@
>>
>> Map<String, AtomicComponent> contexts =
>> MockContextFactory.createWiredContexts("source", SourceImpl.class,
>> moduleScope, members, "target", Target.class,
>> TargetImpl.class, sessionScope);
>> - moduleScope.onEvent(new ModuleStart(this, null));
>> + moduleScope.onEvent(new CompositeStart(this, null));
>> Object session1 = new Object();
>> ctx.setIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER,
>> session1);
>> sessionScope.onEvent(new HttpSessionStart(this, session1));
>> @@ -120,7 +120,7 @@
>> sessionScope.onEvent(new HttpSessionEnd(this, session2));
>>
>> ctx.clearIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER);
>> - moduleScope.onEvent(new ModuleStop(this, null));
>> + moduleScope.onEvent(new CompositeStop(this, null));
>> sessionScope.stop();
>> moduleScope.stop();
>> }
>> @@ -138,7 +138,7 @@
>>
>> Map<String, AtomicComponent> contexts =
>> MockContextFactory.createWiredContexts("source", SourceImpl.class,
>> moduleScope, members, "target", Target.class,
>> TargetImpl.class, requestScope);
>> - moduleScope.onEvent(new ModuleStart(this, null));
>> + moduleScope.onEvent(new CompositeStart(this, null));
>> requestScope.onEvent(new RequestStart(this));
>>
>> AtomicComponent<Source> sourceComponent =
>> (AtomicComponent<Source>) contexts.get("source");
>> @@ -169,7 +169,7 @@
>> future.get();
>> assertEquals("foo", source.getTarget().getString());
>> requestScope.onEvent(new RequestEnd(this));
>> - moduleScope.onEvent(new ModuleStop(this,null));
>> + moduleScope.onEvent(new CompositeStop(this,null));
>> requestScope.stop();
>> moduleScope.stop();
>> }
>> @@ -187,7 +187,7 @@
>>
>> Map<String, AtomicComponent> contexts =
>> MockContextFactory.createWiredContexts("source", SourceImpl.class,
>> moduleScope, members, "target", Target.class,
>> TargetImpl.class, statelessScope);
>> - moduleScope.onEvent(new ModuleStart(this, null));
>> + moduleScope.onEvent(new CompositeStart(this, null));
>>
>> AtomicComponent<Source> sourceComponent =
>> (AtomicComponent<Source>) contexts.get("source");
>> AtomicComponent<Target> targetComponent =
>> (AtomicComponent<Target>) contexts.get("target");
>> @@ -202,7 +202,7 @@
>> assertFalse("foo".equals(target2.getString()));
>> source.getTarget().setString("bar");
>> assertFalse("bar".equals(source.getTarget().getString()));
>> - moduleScope.onEvent(new ModuleStop(this, null));
>> + moduleScope.onEvent(new CompositeStop(this, null));
>> moduleScope.stop();
>> statelessScope.stop();
>> }
>> @@ -268,7 +268,7 @@
>>
>> Map<String, AtomicComponent> contexts =
>> MockContextFactory.createWiredContexts("source", SourceImpl.class,
>> sessionScope, members, "target", Target.class,
>> TargetImpl.class, moduleScope);
>> - moduleScope.onEvent(new ModuleStart(this, null));
>> + moduleScope.onEvent(new CompositeStart(this, null));
>> Object session1 = new Object();
>> ctx.setIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER,
>> session1);
>> sessionScope.onEvent(new HttpSessionStart(this, session1));
>> @@ -447,7 +447,7 @@
>> final ScopeContext moduleScope = new ModuleScopeContext(ctx);
>> requestScope.start();
>> moduleScope.start();
>> - moduleScope.onEvent(new ModuleStart(this, null));
>> + moduleScope.onEvent(new CompositeStart(this, null));
>>
>> Map<String, AtomicComponent> contexts =
>> MockContextFactory.createWiredContexts("source", SourceImpl.class,
>> requestScope, members, "target", Target.class,
>> TargetImpl.class, moduleScope);
>> @@ -484,7 +484,7 @@
>>
>> requestScope.onEvent(new RequestEnd(this));
>> requestScope.stop();
>> - moduleScope.onEvent(new ModuleStop(this, null));
>> + moduleScope.onEvent(new CompositeStop(this, null));
>> moduleScope.stop();
>> }
>>
>> @@ -710,7 +710,7 @@
>>
>> Map<String, AtomicComponent> contexts =
>> MockContextFactory.createWiredContexts("source", SourceImpl.class,
>> statelessScope, members, "target", Target.class,
>> TargetImpl.class, moduleScope);
>> - moduleScope.onEvent(new ModuleStart(this, null));
>> + moduleScope.onEvent(new CompositeStart(this, null));
>> AtomicComponent<Source> sourceComponent =
>> (AtomicComponent<Source>) contexts.get("source");
>> AtomicComponent<Target> targetComponent =
>> (AtomicComponent<Target>) contexts.get("target");
>> Source source = sourceComponent.getService();
>> @@ -734,7 +734,7 @@
>> assertEquals("bar", target2.getString());
>> assertEquals("bar", source.getTarget().getString());
>>
>> - moduleScope.onEvent(new ModuleStop(this, null));
>> + moduleScope.onEvent(new CompositeStop(this, null));
>> moduleScope.stop();
>> statelessScope.stop();
>> }
>>
>> Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/
>> java/org/apache/tuscany/core/bootstrap/DefaultRuntime.java
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/bootstrap/
>> DefaultRuntime.java?rev=411373&r1=411372&r2=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/bootstrap/DefaultRuntime.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/bootstrap/DefaultRuntime.java Fri Jun 2
>> 20:52:57 2006
>> @@ -16,8 +16,8 @@
>> */
>> package org.apache.tuscany.core.bootstrap;
>>
>> -import
>> org.apache.tuscany.core.system.context.SystemCompositeComponent;
>> -import
>> org.apache.tuscany.core.system.context.SystemCompositeComponentImpl;
>> +import
>> org.apache.tuscany.core.system.component.SystemCompositeComponent;
>> +import
>> org.apache.tuscany.core.system.component.SystemCompositeComponentImpl
>> ;
>> import org.apache.tuscany.spi.bootstrap.RuntimeComponent;
>> import org.apache.tuscany.spi.bootstrap.ComponentNames;
>> import org.apache.tuscany.spi.context.CompositeComponent;
>>
>> 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=411373&r1=411372&r2=411373&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 Fri
>> Jun 2 20:52:57 2006
>> @@ -7,7 +7,7 @@
>> import java.util.concurrent.CountDownLatch;
>> import java.util.concurrent.TimeUnit;
>>
>> -import org.apache.tuscany.core.system.context.SystemService;
>> +import org.apache.tuscany.core.system.component.SystemService;
>> import org.apache.tuscany.spi.CoreRuntimeException;
>> import org.apache.tuscany.spi.annotation.Autowire;
>> import org.apache.tuscany.spi.context.AtomicComponent;
>>
>> Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/
>> org/apache/tuscany/core/component/event/CompositeEvent.java (from
>> r411370, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/
>> org/apache/tuscany/core/component/event/ModuleEvent.java)
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/
>> event/CompositeEvent.java?p2=incubator/tuscany/sandbox/jboynes/sca/
>> core2/src/main/java/org/apache/tuscany/core/component/event/
>> CompositeEvent.java&p1=incubator/tuscany/sandbox/jboynes/sca/core2/
>> src/main/java/org/apache/tuscany/core/component/event/
>> ModuleEvent.java&r1=411370&r2=411373&rev=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/component/event/ModuleEvent.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/component/event/CompositeEvent.java Fri Jun 2
>> 20:52:57 2006
>> @@ -4,12 +4,12 @@
>> import org.apache.tuscany.spi.context.CompositeComponent;
>>
>> /**
>> - * Implemented by runtime events associated with a module, e.g.
>> lifecycle events
>> + * Implemented by runtime events associated with a composite,
>> e.g. lifecycle events
>> *
>> * @version $$Rev$$ $$Date$$
>> */
>> -public interface ModuleEvent extends Event {
>> +public interface CompositeEvent extends Event {
>>
>> - public CompositeComponent getContext();
>> + public CompositeComponent getComposite();
>>
>> }
>>
>> Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/
>> org/apache/tuscany/core/component/event/CompositeStart.java (from
>> r411370, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/
>> org/apache/tuscany/core/component/event/ModuleStart.java)
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/
>> event/CompositeStart.java?p2=incubator/tuscany/sandbox/jboynes/sca/
>> core2/src/main/java/org/apache/tuscany/core/component/event/
>> CompositeStart.java&p1=incubator/tuscany/sandbox/jboynes/sca/core2/
>> src/main/java/org/apache/tuscany/core/component/event/
>> ModuleStart.java&r1=411370&r2=411373&rev=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/component/event/ModuleStart.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/component/event/CompositeStart.java Fri Jun 2
>> 20:52:57 2006
>> @@ -2,14 +2,14 @@
>>
>> import org.apache.tuscany.spi.context.CompositeComponent;
>> import org.apache.tuscany.core.component.event.AbstractEvent;
>> -import org.apache.tuscany.core.component.event.ModuleEvent;
>> +import org.apache.tuscany.core.component.event.CompositeEvent;
>>
>> /**
>> - * Propagated when a module starts
>> + * Propagated when a composite starts
>> *
>> * @version $$Rev$$ $$Date$$
>> */
>> -public class ModuleStart extends AbstractEvent implements
>> ModuleEvent {
>> +public class CompositeStart extends AbstractEvent implements
>> CompositeEvent {
>>
>> private CompositeComponent component;
>>
>> @@ -18,12 +18,12 @@
>> * @param source the source of the event
>> * @param ctx the composite component associated the module
>> being stopped
>> */
>> - public ModuleStart(Object source, CompositeComponent ctx) {
>> + public CompositeStart(Object source, CompositeComponent ctx) {
>> super(source);
>> component = ctx;
>> }
>>
>> - public CompositeComponent getContext(){
>> + public CompositeComponent getComposite(){
>> return component;
>> }
>>
>>
>> Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/
>> org/apache/tuscany/core/component/event/CompositeStop.java (from
>> r411370, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/
>> org/apache/tuscany/core/component/event/ModuleStop.java)
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/
>> event/CompositeStop.java?p2=incubator/tuscany/sandbox/jboynes/sca/
>> core2/src/main/java/org/apache/tuscany/core/component/event/
>> CompositeStop.java&p1=incubator/tuscany/sandbox/jboynes/sca/core2/
>> src/main/java/org/apache/tuscany/core/component/event/
>> ModuleStop.java&r1=411370&r2=411373&rev=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/component/event/ModuleStop.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/component/event/CompositeStop.java Fri Jun 2
>> 20:52:57 2006
>> @@ -2,14 +2,14 @@
>>
>> import org.apache.tuscany.spi.context.CompositeComponent;
>> import org.apache.tuscany.core.component.event.AbstractEvent;
>> -import org.apache.tuscany.core.component.event.ModuleEvent;
>> +import org.apache.tuscany.core.component.event.CompositeEvent;
>>
>> /**
>> - * Propagated when a module stops
>> + * Propagated when a composite stops
>> *
>> * @version $$Rev$$ $$Date$$
>> */
>> -public class ModuleStop extends AbstractEvent implements
>> ModuleEvent {
>> +public class CompositeStop extends AbstractEvent implements
>> CompositeEvent {
>>
>> private CompositeComponent component;
>>
>> @@ -18,12 +18,12 @@
>> * @param source the source of the event
>> * @param ctx the composite component associated the module
>> being stopped
>> */
>> - public ModuleStop(Object source, CompositeComponent ctx) {
>> + public CompositeStop(Object source, CompositeComponent ctx) {
>> super(source);
>> component = ctx;
>> }
>>
>> - public CompositeComponent getContext(){
>> + public CompositeComponent getComposite(){
>> return component;
>> }
>> }
>>
>> Modified: 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/ModuleScopeContext.java?
>> rev=411373&r1=411372&r2=411373&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/ModuleScopeContext.java Fri
>> Jun 2 20:52:57 2006
>> @@ -7,8 +7,8 @@
>> import java.util.concurrent.ConcurrentHashMap;
>>
>> import org.apache.tuscany.spi.AbstractLifecycle;
>> -import org.apache.tuscany.core.component.event.ModuleStart;
>> -import org.apache.tuscany.core.component.event.ModuleStop;
>> +import org.apache.tuscany.core.component.event.CompositeStart;
>> +import org.apache.tuscany.core.component.event.CompositeStop;
>> import org.apache.tuscany.core.component.scope.AbstractScopeContext;
>> import org.apache.tuscany.spi.model.Scope;
>> import org.apache.tuscany.spi.CoreRuntimeException;
>> @@ -47,10 +47,10 @@
>>
>> public void onEvent(Event event) {
>> checkInit();
>> - if (event instanceof ModuleStart) {
>> + if (event instanceof CompositeStart) {
>> eagerInitContexts();
>> lifecycleState = RUNNING;
>> - } else if (event instanceof ModuleStop) {
>> + } else if (event instanceof CompositeStop) {
>> shutdownContexts();
>> }
>> }
>>
>> Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/
>> java/org/apache/tuscany/core/system/builder/SystemBindingBuilder.java
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> builder/SystemBindingBuilder.java?
>> rev=411373&r1=411372&r2=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/builder/SystemBindingBuilder.java
>> (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/builder/SystemBindingBuilder.java Fri
>> Jun 2 20:52:57 2006
>> @@ -1,9 +1,9 @@
>> package org.apache.tuscany.core.system.builder;
>>
>> import org.apache.tuscany.core.component.AutowireComponent;
>> -import org.apache.tuscany.core.system.context.SystemReferenceImpl;
>> -import org.apache.tuscany.core.system.context.SystemService;
>> -import org.apache.tuscany.core.system.context.SystemServiceImpl;
>> +import org.apache.tuscany.core.system.component.SystemReferenceImpl;
>> +import org.apache.tuscany.core.system.component.SystemService;
>> +import org.apache.tuscany.core.system.component.SystemServiceImpl;
>> import org.apache.tuscany.core.system.model.SystemBinding;
>> import org.apache.tuscany.core.system.wire.SystemInboundWireImpl;
>> import org.apache.tuscany.core.system.wire.SystemOutboundAutowire;
>>
>> Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/
>> java/org/apache/tuscany/core/system/builder/
>> SystemComponentBuilder.java
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> builder/SystemComponentBuilder.java?
>> rev=411373&r1=411372&r2=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/builder/SystemComponentBuilder.java
>> (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/builder/SystemComponentBuilder.java Fri
>> Jun 2 20:52:57 2006
>> @@ -11,8 +11,8 @@
>> import org.apache.tuscany.core.injection.Injector;
>> import org.apache.tuscany.core.injection.PojoObjectFactory;
>> import org.apache.tuscany.core.model.PojoComponentType;
>> -import org.apache.tuscany.core.system.context.SystemAtomicComponent;
>> -import
>> org.apache.tuscany.core.system.context.SystemAtomicComponentImpl;
>> +import
>> org.apache.tuscany.core.system.component.SystemAtomicComponent;
>> +import
>> org.apache.tuscany.core.system.component.SystemAtomicComponentImpl;
>> import org.apache.tuscany.core.system.model.SystemImplementation;
>> import org.apache.tuscany.core.system.wire.SystemInboundWireImpl;
>> import org.apache.tuscany.core.system.wire.SystemOutboundAutowire;
>>
>> Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/
>> java/org/apache/tuscany/core/system/builder/
>> SystemCompositeBuilder.java
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> builder/SystemCompositeBuilder.java?
>> rev=411373&r1=411372&r2=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/builder/SystemCompositeBuilder.java
>> (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/builder/SystemCompositeBuilder.java Fri
>> Jun 2 20:52:57 2006
>> @@ -17,8 +17,8 @@
>> package org.apache.tuscany.core.system.builder;
>>
>> import org.apache.tuscany.core.component.AutowireComponent;
>> -import
>> org.apache.tuscany.core.system.context.SystemCompositeComponent;
>> -import
>> org.apache.tuscany.core.system.context.SystemCompositeComponentImpl;
>> +import
>> org.apache.tuscany.core.system.component.SystemCompositeComponent;
>> +import
>> org.apache.tuscany.core.system.component.SystemCompositeComponentImpl
>> ;
>> import
>> org.apache.tuscany.core.system.model.SystemCompositeImplementation;
>> import org.apache.tuscany.spi.annotation.Autowire;
>> import org.apache.tuscany.spi.builder.BuilderConfigException;
>>
>> Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/
>> org/apache/tuscany/core/system/component/
>> ObjectRegistrationException.java (from r411369, incubator/tuscany/
>> sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/
>> system/context/ObjectRegistrationException.java)
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> component/ObjectRegistrationException.java?p2=incubator/tuscany/
>> sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/
>> system/component/ObjectRegistrationException.java&p1=incubator/
>> tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/
>> core/system/context/
>> ObjectRegistrationException.java&r1=411369&r2=411373&rev=411373&view=
>> diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/context/
>> ObjectRegistrationException.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/
>> ObjectRegistrationException.java Fri Jun 2 20:52:57 2006
>> @@ -1,4 +1,4 @@
>> -package org.apache.tuscany.core.system.context;
>> +package org.apache.tuscany.core.system.component;
>>
>> import org.apache.tuscany.spi.context.ComponentRuntimeException;
>>
>>
>> Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/
>> org/apache/tuscany/core/system/component/
>> SystemAtomicComponent.java (from r411369, incubator/tuscany/
>> sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/
>> system/context/SystemAtomicComponent.java)
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> component/SystemAtomicComponent.java?p2=incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> component/SystemAtomicComponent.java&p1=incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> context/
>> SystemAtomicComponent.java&r1=411369&r2=411373&rev=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/context/SystemAtomicComponent.java
>> (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/SystemAtomicComponent.java
>> Fri Jun 2 20:52:57 2006
>> @@ -1,4 +1,4 @@
>> -package org.apache.tuscany.core.system.context;
>> +package org.apache.tuscany.core.system.component;
>>
>> import org.apache.tuscany.spi.context.AtomicComponent;
>> import org.apache.tuscany.spi.context.TargetException;
>>
>> Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/
>> org/apache/tuscany/core/system/component/
>> SystemAtomicComponentImpl.java (from r411370, incubator/tuscany/
>> sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/
>> system/context/SystemAtomicComponentImpl.java)
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> component/SystemAtomicComponentImpl.java?p2=incubator/tuscany/
>> sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/
>> system/component/SystemAtomicComponentImpl.java&p1=incubator/
>> tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/
>> core/system/context/
>> SystemAtomicComponentImpl.java&r1=411370&r2=411373&rev=411373&view=di
>> ff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/context/SystemAtomicComponentImpl.java
>> (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/
>> SystemAtomicComponentImpl.java Fri Jun 2 20:52:57 2006
>> @@ -1,4 +1,4 @@
>> -package org.apache.tuscany.core.system.context;
>> +package org.apache.tuscany.core.system.component;
>>
>> import java.lang.reflect.Field;
>> import java.lang.reflect.Member;
>> @@ -16,6 +16,7 @@
>> import
>> org.apache.tuscany.core.injection.ListMultiplicityObjectFactory;
>> import org.apache.tuscany.core.injection.MethodInjector;
>> import org.apache.tuscany.core.system.wire.SystemOutboundWire;
>> +import
>> org.apache.tuscany.core.system.component.SystemAtomicComponent;
>> import org.apache.tuscany.spi.ObjectFactory;
>> import org.apache.tuscany.spi.context.CompositeComponent;
>> import org.apache.tuscany.spi.context.ScopeContext;
>>
>> Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/
>> org/apache/tuscany/core/system/component/
>> SystemCompositeComponent.java (from r411370, incubator/tuscany/
>> sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/
>> system/context/SystemCompositeComponent.java)
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> component/SystemCompositeComponent.java?p2=incubator/tuscany/
>> sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/
>> system/component/SystemCompositeComponent.java&p1=incubator/
>> tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/
>> core/system/context/
>> SystemCompositeComponent.java&r1=411370&r2=411373&rev=411373&view=dif
>> f
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/context/SystemCompositeComponent.java
>> (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/SystemCompositeComponent.java
>> Fri Jun 2 20:52:57 2006
>> @@ -1,6 +1,7 @@
>> -package org.apache.tuscany.core.system.context;
>> +package org.apache.tuscany.core.system.component;
>>
>> import org.apache.tuscany.core.component.AutowireComponent;
>> +import
>> org.apache.tuscany.core.system.component.ObjectRegistrationException;
>>
>> /**
>> * Marker type for system composite contexts
>>
>> Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/
>> org/apache/tuscany/core/system/component/
>> SystemCompositeComponentImpl.java (from r411370, incubator/tuscany/
>> sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/
>> system/context/SystemCompositeComponentImpl.java)
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> component/SystemCompositeComponentImpl.java?p2=incubator/tuscany/
>> sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/
>> system/component/SystemCompositeComponentImpl.java&p1=incubator/
>> tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/
>> core/system/context/
>> SystemCompositeComponentImpl.java&r1=411370&r2=411373&rev=411373&view
>> =diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/context/
>> SystemCompositeComponentImpl.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/
>> SystemCompositeComponentImpl.java Fri Jun 2 20:52:57 2006
>> @@ -1,8 +1,10 @@
>> -package org.apache.tuscany.core.system.context;
>> +package org.apache.tuscany.core.system.component;
>>
>> import org.apache.tuscany.core.component.AbstractCompositeComponent;
>> import org.apache.tuscany.core.component.AutowireComponent;
>> import org.apache.tuscany.core.component.AutowireResolutionException;
>> +import
>> org.apache.tuscany.core.system.component.ObjectRegistrationException;
>> +import
>> org.apache.tuscany.core.system.component.SystemCompositeComponent;
>> import org.apache.tuscany.spi.context.CompositeComponent;
>>
>> /**
>>
>> Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/
>> org/apache/tuscany/core/system/component/SystemReference.java
>> (from r411369, incubator/tuscany/sandbox/jboynes/sca/core2/src/
>> main/java/org/apache/tuscany/core/system/context/
>> SystemReference.java)
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> component/SystemReference.java?p2=incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> component/SystemReference.java&p1=incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> context/SystemReference.java&r1=411369&r2=411373&rev=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/context/SystemReference.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/SystemReference.java Fri Jun
>> 2 20:52:57 2006
>> @@ -1,4 +1,4 @@
>> -package org.apache.tuscany.core.system.context;
>> +package org.apache.tuscany.core.system.component;
>>
>> import org.apache.tuscany.spi.context.Reference;
>>
>>
>> Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/
>> org/apache/tuscany/core/system/component/SystemReferenceImpl.java
>> (from r411369, incubator/tuscany/sandbox/jboynes/sca/core2/src/
>> main/java/org/apache/tuscany/core/system/context/
>> SystemReferenceImpl.java)
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> component/SystemReferenceImpl.java?p2=incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> component/SystemReferenceImpl.java&p1=incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> context/
>> SystemReferenceImpl.java&r1=411369&r2=411373&rev=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/context/SystemReferenceImpl.java
>> (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/SystemReferenceImpl.java Fri
>> Jun 2 20:52:57 2006
>> @@ -1,9 +1,10 @@
>> -package org.apache.tuscany.core.system.context;
>> +package org.apache.tuscany.core.system.component;
>>
>> import java.lang.reflect.Method;
>>
>> import org.apache.tuscany.core.system.wire.SystemInboundWire;
>> import org.apache.tuscany.core.system.wire.SystemOutboundWire;
>> +import org.apache.tuscany.core.system.component.SystemReference;
>> import org.apache.tuscany.spi.context.AbstractSCAObject;
>> import org.apache.tuscany.spi.context.CompositeComponent;
>> import org.apache.tuscany.spi.context.TargetException;
>>
>> Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/
>> org/apache/tuscany/core/system/component/SystemService.java (from
>> r411369, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/
>> org/apache/tuscany/core/system/context/SystemService.java)
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> component/SystemService.java?p2=incubator/tuscany/sandbox/jboynes/
>> sca/core2/src/main/java/org/apache/tuscany/core/system/component/
>> SystemService.java&p1=incubator/tuscany/sandbox/jboynes/sca/core2/
>> src/main/java/org/apache/tuscany/core/system/context/
>> SystemService.java&r1=411369&r2=411373&rev=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/context/SystemService.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/SystemService.java Fri Jun 2
>> 20:52:57 2006
>> @@ -1,4 +1,4 @@
>> -package org.apache.tuscany.core.system.context;
>> +package org.apache.tuscany.core.system.component;
>>
>> import org.apache.tuscany.spi.context.Service;
>>
>>
>> Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/
>> org/apache/tuscany/core/system/component/SystemServiceImpl.java
>> (from r411369, incubator/tuscany/sandbox/jboynes/sca/core2/src/
>> main/java/org/apache/tuscany/core/system/context/
>> SystemServiceImpl.java)
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> component/SystemServiceImpl.java?p2=incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> component/SystemServiceImpl.java&p1=incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> context/
>> SystemServiceImpl.java&r1=411369&r2=411373&rev=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/context/SystemServiceImpl.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/SystemServiceImpl.java Fri
>> Jun 2 20:52:57 2006
>> @@ -1,7 +1,8 @@
>> -package org.apache.tuscany.core.system.context;
>> +package org.apache.tuscany.core.system.component;
>>
>> import org.apache.tuscany.core.system.wire.SystemInboundWire;
>> import org.apache.tuscany.core.system.wire.SystemOutboundWire;
>> +import org.apache.tuscany.core.system.component.SystemService;
>> import org.apache.tuscany.spi.CoreRuntimeException;
>> import org.apache.tuscany.spi.context.AbstractSCAObject;
>> import org.apache.tuscany.spi.context.CompositeComponent;
>>
>> Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/
>> org/apache/tuscany/core/system/component/
>> SystemSingletonAtomicComponent.java (from r411369, incubator/
>> tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/
>> core/system/context/SystemSingletonAtomicComponent.java)
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> component/SystemSingletonAtomicComponent.java?p2=incubator/tuscany/
>> sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/
>> system/component/SystemSingletonAtomicComponent.java&p1=incubator/
>> tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/
>> core/system/context/
>> SystemSingletonAtomicComponent.java&r1=411369&r2=411373&rev=411373&vi
>> ew=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/context/
>> SystemSingletonAtomicComponent.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/
>> SystemSingletonAtomicComponent.java Fri Jun 2 20:52:57 2006
>> @@ -1,4 +1,4 @@
>> -package org.apache.tuscany.core.system.context;
>> +package org.apache.tuscany.core.system.component;
>>
>> import java.lang.reflect.Method;
>> import java.util.ArrayList;
>> @@ -14,6 +14,7 @@
>> import org.apache.tuscany.spi.wire.OutboundWire;
>> import org.apache.tuscany.spi.wire.TargetInvoker;
>> import org.apache.tuscany.spi.wire.InboundWire;
>> +import
>> org.apache.tuscany.core.system.component.SystemAtomicComponent;
>>
>> /**
>> * An {@link org.apache.tuscany.spi.context.AtomicComponent} used
>> when registering objects directly into a
>>
>> Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/
>> org/apache/tuscany/core/system/component/
>> SystemWireObjectFactory.java (from r411369, incubator/tuscany/
>> sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/
>> system/context/SystemWireObjectFactory.java)
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/
>> component/SystemWireObjectFactory.java?p2=incubator/tuscany/
>> sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/
>> system/component/SystemWireObjectFactory.java&p1=incubator/tuscany/
>> sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/
>> system/context/
>> SystemWireObjectFactory.java&r1=411369&r2=411373&rev=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/context/SystemWireObjectFactory.java
>> (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/
>> apache/tuscany/core/system/component/SystemWireObjectFactory.java
>> Fri Jun 2 20:52:57 2006
>> @@ -1,4 +1,4 @@
>> -package org.apache.tuscany.core.system.context;
>> +package org.apache.tuscany.core.system.component;
>>
>> import org.apache.tuscany.core.system.wire.SystemOutboundWire;
>> import org.apache.tuscany.spi.ObjectCreationException;
>>
>> Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/
>> java/org/apache/tuscany/core/component/scope/
>> BasicHttpSessionScopeTestCase.java
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/
>> scope/BasicHttpSessionScopeTestCase.java?
>> rev=411373&r1=411372&r2=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/
>> BasicHttpSessionScopeTestCase.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/
>> BasicHttpSessionScopeTestCase.java Fri Jun 2 20:52:57 2006
>> @@ -8,8 +8,8 @@
>> import org.apache.tuscany.core.injection.MethodEventInvoker;
>> import org.apache.tuscany.core.injection.PojoObjectFactory;
>> import
>> org.apache.tuscany.core.mock.component.SessionScopeInitDestroyCompone
>> nt;
>> -import org.apache.tuscany.core.system.context.SystemAtomicComponent;
>> -import
>> org.apache.tuscany.core.system.context.SystemAtomicComponentImpl;
>> +import
>> org.apache.tuscany.core.system.component.SystemAtomicComponent;
>> +import
>> org.apache.tuscany.core.system.component.SystemAtomicComponentImpl;
>> import org.apache.tuscany.spi.ObjectFactory;
>> import org.apache.tuscany.spi.context.WorkContext;
>> import org.apache.tuscany.spi.context.ScopeContext;
>>
>> Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/
>> java/org/apache/tuscany/core/component/scope/
>> BasicModuleScopeTestCase.java
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/
>> scope/BasicModuleScopeTestCase.java?
>> rev=411373&r1=411372&r2=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/BasicModuleScopeTestCase.java
>> (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/BasicModuleScopeTestCase.java
>> Fri Jun 2 20:52:57 2006
>> @@ -3,13 +3,13 @@
>> import junit.framework.TestCase;
>> import org.apache.tuscany.core.component.WorkContextImpl;
>> import org.apache.tuscany.core.component.scope.ModuleScopeContext;
>> -import org.apache.tuscany.core.component.event.ModuleStop;
>> +import org.apache.tuscany.core.component.event.CompositeStop;
>> import org.apache.tuscany.core.injection.EventInvoker;
>> import org.apache.tuscany.core.injection.MethodEventInvoker;
>> import org.apache.tuscany.core.injection.PojoObjectFactory;
>> import
>> org.apache.tuscany.core.mock.component.ModuleScopeInitDestroyComponen
>> t;
>> -import org.apache.tuscany.core.system.context.SystemAtomicComponent;
>> -import
>> org.apache.tuscany.core.system.context.SystemAtomicComponentImpl;
>> +import
>> org.apache.tuscany.core.system.component.SystemAtomicComponent;
>> +import
>> org.apache.tuscany.core.system.component.SystemAtomicComponentImpl;
>> import org.apache.tuscany.spi.ObjectFactory;
>> import org.apache.tuscany.spi.context.WorkContext;
>> import org.apache.tuscany.spi.context.ScopeContext;
>> @@ -34,7 +34,7 @@
>> assertFalse(o1.isDestroyed());
>> ModuleScopeInitDestroyComponent o2 =
>> (ModuleScopeInitDestroyComponent) scopeContext.getInstance
>> (atomicContext);
>> assertEquals(o1, o2);
>> - scopeContext.onEvent(new ModuleStop(this, null));
>> + scopeContext.onEvent(new CompositeStop(this, null));
>> assertTrue(o1.isDestroyed());
>> scopeContext.stop();
>> }
>> @@ -53,7 +53,7 @@
>>
>> ModuleScopeInitDestroyComponent o2 =
>> (ModuleScopeInitDestroyComponent) scopeContext.getInstance
>> (atomicContext);
>> assertSame(o1, o2);
>> - scopeContext.onEvent(new ModuleStop(this, null));
>> + scopeContext.onEvent(new CompositeStop(this, null));
>> assertTrue(o1.isDestroyed());
>> scopeContext.stop();
>> }
>>
>> Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/
>> java/org/apache/tuscany/core/component/scope/
>> BasicRequestScopeTestCase.java
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/
>> scope/BasicRequestScopeTestCase.java?
>> rev=411373&r1=411372&r2=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/BasicRequestScopeTestCase.java
>> (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/BasicRequestScopeTestCase.java
>> Fri Jun 2 20:52:57 2006
>> @@ -7,8 +7,8 @@
>> import org.apache.tuscany.core.injection.MethodEventInvoker;
>> import org.apache.tuscany.core.injection.PojoObjectFactory;
>> import
>> org.apache.tuscany.core.mock.component.RequestScopeInitDestroyCompone
>> nt;
>> -import org.apache.tuscany.core.system.context.SystemAtomicComponent;
>> -import
>> org.apache.tuscany.core.system.context.SystemAtomicComponentImpl;
>> +import
>> org.apache.tuscany.core.system.component.SystemAtomicComponent;
>> +import
>> org.apache.tuscany.core.system.component.SystemAtomicComponentImpl;
>> import org.apache.tuscany.spi.ObjectFactory;
>> import org.apache.tuscany.spi.context.ScopeContext;
>>
>>
>> Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/
>> java/org/apache/tuscany/core/component/scope/
>> BasicStatelessScopeTestCase.java
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/
>> scope/BasicStatelessScopeTestCase.java?
>> rev=411373&r1=411372&r2=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/
>> BasicStatelessScopeTestCase.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/
>> BasicStatelessScopeTestCase.java Fri Jun 2 20:52:57 2006
>> @@ -7,7 +7,7 @@
>> import org.apache.tuscany.core.mock.factories.MockContextFactory;
>> import org.apache.tuscany.core.mock.component.StatelessComponent;
>> import org.apache.tuscany.core.mock.component.StatelessComponentImpl;
>> -import org.apache.tuscany.core.system.context.SystemAtomicComponent;
>> +import
>> org.apache.tuscany.core.system.component.SystemAtomicComponent;
>> import org.apache.tuscany.spi.context.WorkContext;
>>
>> /**
>>
>> Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/
>> java/org/apache/tuscany/core/component/scope/
>> DependencyLifecycleTestCase.java
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/
>> scope/DependencyLifecycleTestCase.java?
>> rev=411373&r1=411372&r2=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/
>> DependencyLifecycleTestCase.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/
>> DependencyLifecycleTestCase.java Fri Jun 2 20:52:57 2006
>> @@ -8,8 +8,8 @@
>> import org.apache.tuscany.core.component.scope.ModuleScopeContext;
>> import org.apache.tuscany.core.component.scope.RequestScopeContext;
>> import org.apache.tuscany.core.component.event.HttpSessionEnd;
>> -import org.apache.tuscany.core.component.event.ModuleStart;
>> -import org.apache.tuscany.core.component.event.ModuleStop;
>> +import org.apache.tuscany.core.component.event.CompositeStart;
>> +import org.apache.tuscany.core.component.event.CompositeStop;
>> import org.apache.tuscany.core.component.event.RequestEnd;
>> import org.apache.tuscany.core.component.event.RequestStart;
>> import org.apache.tuscany.core.mock.factories.MockContextFactory;
>> @@ -40,13 +40,13 @@
>> AtomicComponent targetComponent = contexts.get("target");
>> scopeCtx.register(sourceComponent);
>> scopeCtx.register(targetComponent);
>> - scopeCtx.onEvent(new ModuleStart(this, null));
>> + scopeCtx.onEvent(new CompositeStart(this, null));
>> OrderedDependentPojo source = (OrderedDependentPojo)
>> scopeCtx.getInstance(sourceComponent);
>> OrderedInitPojo target = (OrderedInitPojo)
>> scopeCtx.getInstance(targetComponent);
>> assertNotNull(source.getPojo());
>> assertNotNull(target);
>> assertEquals(2, source.getNumberInstantiated());
>> - scopeCtx.onEvent(new ModuleStop(this, null));
>> + scopeCtx.onEvent(new CompositeStop(this, null));
>> assertEquals(0, source.getNumberInstantiated());
>> scopeCtx.stop();
>> }
>> @@ -59,7 +59,7 @@
>> scopeCtx, "target", OrderedInitPojoImpl.class,
>> scopeCtx);
>> AtomicComponent sourceComponent = contexts.get("source");
>> AtomicComponent targetComponent = contexts.get("target");
>> - scopeCtx.onEvent(new ModuleStart(this, null));
>> + scopeCtx.onEvent(new CompositeStart(this, null));
>> scopeCtx.register(sourceComponent);
>> scopeCtx.register(targetComponent);
>> OrderedDependentPojo source = (OrderedDependentPojo)
>> scopeCtx.getInstance(sourceComponent);
>> @@ -67,7 +67,7 @@
>> assertNotNull(source.getPojo());
>> assertNotNull(target);
>> assertEquals(2, source.getNumberInstantiated());
>> - scopeCtx.onEvent(new ModuleStop(this, null));
>> + scopeCtx.onEvent(new CompositeStop(this, null));
>> assertEquals(0, source.getNumberInstantiated());
>> scopeCtx.stop();
>> }
>>
>> Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/
>> java/org/apache/tuscany/core/component/scope/
>> HttpSessionScopeInstanceLifecycleTestCase.java
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/
>> scope/HttpSessionScopeInstanceLifecycleTestCase.java?
>> rev=411373&r1=411372&r2=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/
>> HttpSessionScopeInstanceLifecycleTestCase.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/
>> HttpSessionScopeInstanceLifecycleTestCase.java Fri Jun 2 20:52:57
>> 2006
>> @@ -13,7 +13,7 @@
>> import
>> org.apache.tuscany.core.mock.component.RequestScopeDestroyOnlyCompone
>> nt;
>> import
>> org.apache.tuscany.core.mock.component.RequestScopeInitDestroyCompone
>> nt;
>> import
>> org.apache.tuscany.core.mock.component.RequestScopeInitOnlyComponent;
>> -import org.apache.tuscany.core.system.context.SystemAtomicComponent;
>> +import
>> org.apache.tuscany.core.system.component.SystemAtomicComponent;
>> import org.apache.tuscany.spi.context.WorkContext;
>>
>> /**
>>
>> Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/
>> java/org/apache/tuscany/core/component/scope/
>> HttpSessionScopeRestartTestCase.java
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/
>> scope/HttpSessionScopeRestartTestCase.java?
>> rev=411373&r1=411372&r2=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/
>> HttpSessionScopeRestartTestCase.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/
>> HttpSessionScopeRestartTestCase.java Fri Jun 2 20:52:57 2006
>> @@ -10,7 +10,7 @@
>> import org.apache.tuscany.core.component.event.HttpSessionEnd;
>> import org.apache.tuscany.core.component.event.HttpSessionStart;
>> import org.apache.tuscany.core.injection.MethodEventInvoker;
>> -import org.apache.tuscany.core.system.context.SystemAtomicComponent;
>> +import
>> org.apache.tuscany.core.system.component.SystemAtomicComponent;
>> import org.apache.tuscany.core.mock.factories.MockContextFactory;
>>
>> /**
>>
>> Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/
>> java/org/apache/tuscany/core/component/scope/
>> ModuleScopeInstanceLifecycleTestCase.java
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/
>> scope/ModuleScopeInstanceLifecycleTestCase.java?
>> rev=411373&r1=411372&r2=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/
>> ModuleScopeInstanceLifecycleTestCase.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/
>> ModuleScopeInstanceLifecycleTestCase.java Fri Jun 2 20:52:57 2006
>> @@ -5,8 +5,8 @@
>> import junit.framework.TestCase;
>> import org.apache.tuscany.core.component.WorkContextImpl;
>> import org.apache.tuscany.core.component.scope.ModuleScopeContext;
>> -import org.apache.tuscany.core.component.event.ModuleStart;
>> -import org.apache.tuscany.core.component.event.ModuleStop;
>> +import org.apache.tuscany.core.component.event.CompositeStart;
>> +import org.apache.tuscany.core.component.event.CompositeStop;
>> import org.apache.tuscany.core.mock.factories.MockContextFactory;
>> import
>> org.apache.tuscany.core.mock.component.ModuleScopeDestroyOnlyComponen
>> t;
>> import
>> org.apache.tuscany.core.mock.component.ModuleScopeInitDestroyComponen
>> t;
>> @@ -14,7 +14,7 @@
>> import org.apache.tuscany.core.mock.component.OrderedInitPojoImpl;
>> import org.apache.tuscany.core.mock.component.OrderedInitPojo;
>> import org.apache.tuscany.core.mock.component.OrderedEagerInitPojo;
>> -import org.apache.tuscany.core.system.context.SystemAtomicComponent;
>> +import
>> org.apache.tuscany.core.system.component.SystemAtomicComponent;
>> import org.apache.tuscany.spi.context.WorkContext;
>>
>> /**
>> @@ -38,7 +38,7 @@
>> SystemAtomicComponent destroyOnlyContext =
>> MockContextFactory.createSystemAtomicContext("DestroyOnly", scope,
>> ModuleScopeDestroyOnlyComponent.class);
>> destroyOnlyContext.start();
>>
>> - scope.onEvent(new ModuleStart(this, null));
>> + scope.onEvent(new CompositeStart(this, null));
>> ModuleScopeInitDestroyComponent initDestroy =
>> (ModuleScopeInitDestroyComponent) scope.getInstance
>> (initDestroyContext);
>> Assert.assertNotNull(initDestroy);
>>
>> @@ -54,7 +54,7 @@
>> Assert.assertFalse(destroyOnly.isDestroyed());
>>
>> // expire module
>> - scope.onEvent(new ModuleStop(this, null));
>> + scope.onEvent(new CompositeStop(this, null));
>>
>> Assert.assertTrue(initDestroy.isDestroyed());
>> Assert.assertTrue(destroyOnly.isDestroyed());
>> @@ -74,7 +74,7 @@
>> SystemAtomicComponent threeCtx =
>> MockContextFactory.createSystemAtomicContext("three", scope,
>> OrderedInitPojoImpl.class);
>> scope.register(threeCtx);
>>
>> - scope.onEvent(new ModuleStart(this,null));
>> + scope.onEvent(new CompositeStart(this,null));
>> OrderedInitPojo one = (OrderedInitPojo) scope.getInstance
>> (oneCtx);
>> Assert.assertNotNull(one);
>> Assert.assertEquals(1, one.getNumberInstantiated());
>> @@ -91,7 +91,7 @@
>> Assert.assertEquals(3, three.getInitOrder());
>>
>> // expire module
>> - scope.onEvent(new ModuleStop(this,null));
>> + scope.onEvent(new CompositeStop(this,null));
>> Assert.assertEquals(0, one.getNumberInstantiated());
>> scope.stop();
>> }
>> @@ -108,7 +108,7 @@
>> SystemAtomicComponent threeCtx =
>> MockContextFactory.createSystemAtomicContext("three", scope,
>> OrderedEagerInitPojo.class);
>> scope.register(threeCtx);
>>
>> - scope.onEvent(new ModuleStart(this,null));
>> + scope.onEvent(new CompositeStart(this,null));
>> OrderedEagerInitPojo one = (OrderedEagerInitPojo)
>> scope.getInstance(oneCtx);
>> Assert.assertNotNull(one);
>>
>> @@ -119,7 +119,7 @@
>> Assert.assertNotNull(three);
>>
>> // expire module
>> - scope.onEvent(new ModuleStop(this,null));
>> + scope.onEvent(new CompositeStop(this,null));
>> Assert.assertEquals(0, one.getNumberInstantiated());
>> scope.stop();
>> }
>>
>> Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/
>> java/org/apache/tuscany/core/component/scope/
>> ModuleScopeRestartTestCase.java
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/
>> scope/ModuleScopeRestartTestCase.java?
>> rev=411373&r1=411372&r2=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/
>> ModuleScopeRestartTestCase.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/
>> ModuleScopeRestartTestCase.java Fri Jun 2 20:52:57 2006
>> @@ -6,11 +6,11 @@
>> import junit.framework.TestCase;
>> import org.apache.tuscany.core.component.WorkContextImpl;
>> import org.apache.tuscany.core.component.scope.ModuleScopeContext;
>> -import org.apache.tuscany.core.component.event.ModuleStart;
>> -import org.apache.tuscany.core.component.event.ModuleStop;
>> +import org.apache.tuscany.core.component.event.CompositeStart;
>> +import org.apache.tuscany.core.component.event.CompositeStop;
>> import org.apache.tuscany.core.injection.MethodEventInvoker;
>> import org.apache.tuscany.core.mock.factories.MockContextFactory;
>> -import org.apache.tuscany.core.system.context.SystemAtomicComponent;
>> +import
>> org.apache.tuscany.core.system.component.SystemAtomicComponent;
>> import org.apache.tuscany.spi.context.WorkContext;
>>
>> /**
>> @@ -30,20 +30,20 @@
>> InitDestroyOnce.class, false, initInvoker,
>> destroyInvoker, null,null);
>> context.start();
>>
>> - scope.onEvent(new ModuleStart(this, null));
>> + scope.onEvent(new CompositeStart(this, null));
>> Object instance = context.getService();
>> assertSame(instance, context.getService());
>>
>> - scope.onEvent(new ModuleStop(this, null));
>> + scope.onEvent(new CompositeStop(this, null));
>> scope.stop();
>> context.stop();
>>
>> scope.start();
>> - scope.onEvent(new ModuleStart(this, null));
>> + scope.onEvent(new CompositeStart(this, null));
>> scope.register(context);
>> context.start();
>> assertNotSame(instance, context.getService());
>> - scope.onEvent(new ModuleStop(this, null));
>> + scope.onEvent(new CompositeStop(this, null));
>> scope.stop();
>> context.stop();
>> }
>>
>> Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/
>> java/org/apache/tuscany/core/component/scope/
>> RequestScopeInstanceLifecycleTestCase.java
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/
>> scope/RequestScopeInstanceLifecycleTestCase.java?
>> rev=411373&r1=411372&r2=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/
>> RequestScopeInstanceLifecycleTestCase.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/
>> RequestScopeInstanceLifecycleTestCase.java Fri Jun 2 20:52:57 2006
>> @@ -13,7 +13,7 @@
>> import
>> org.apache.tuscany.core.mock.component.RequestScopeDestroyOnlyCompone
>> nt;
>> import
>> org.apache.tuscany.core.mock.component.RequestScopeInitDestroyCompone
>> nt;
>> import
>> org.apache.tuscany.core.mock.component.RequestScopeInitOnlyComponent;
>> -import org.apache.tuscany.core.system.context.SystemAtomicComponent;
>> +import
>> org.apache.tuscany.core.system.component.SystemAtomicComponent;
>> import org.apache.tuscany.spi.context.WorkContext;
>>
>> /**
>>
>> Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/
>> java/org/apache/tuscany/core/component/scope/
>> RequestScopeRestartTestCase.java
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/
>> scope/RequestScopeRestartTestCase.java?
>> rev=411373&r1=411372&r2=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/
>> RequestScopeRestartTestCase.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/component/scope/
>> RequestScopeRestartTestCase.java Fri Jun 2 20:52:57 2006
>> @@ -9,7 +9,7 @@
>> import org.apache.tuscany.core.component.scope.RequestScopeContext;
>> import org.apache.tuscany.core.component.event.RequestEnd;
>> import org.apache.tuscany.core.injection.MethodEventInvoker;
>> -import org.apache.tuscany.core.system.context.SystemAtomicComponent;
>> +import
>> org.apache.tuscany.core.system.component.SystemAtomicComponent;
>> import org.apache.tuscany.core.mock.factories.MockContextFactory;
>>
>> /**
>>
>> Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/
>> java/org/apache/tuscany/core/integration/system/builder/
>> AutowireBuilderTestcase.java
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/
>> integration/system/builder/AutowireBuilderTestcase.java?
>> rev=411373&r1=411372&r2=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/integration/system/builder/
>> AutowireBuilderTestcase.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/integration/system/builder/
>> AutowireBuilderTestcase.java Fri Jun 2 20:52:57 2006
>> @@ -5,15 +5,15 @@
>> import org.apache.tuscany.core.builder.ConnectorImpl;
>> import org.apache.tuscany.core.component.WorkContextImpl;
>> import org.apache.tuscany.core.component.scope.ModuleScopeContext;
>> -import org.apache.tuscany.core.component.event.ModuleStart;
>> -import org.apache.tuscany.core.component.event.ModuleStop;
>> +import org.apache.tuscany.core.component.event.CompositeStart;
>> +import org.apache.tuscany.core.component.event.CompositeStop;
>> import org.apache.tuscany.core.mock.factories.MockComponentFactory;
>> import org.apache.tuscany.core.mock.component.Source;
>> import org.apache.tuscany.core.mock.component.Target;
>> import org.apache.tuscany.core.system.builder.SystemBindingBuilder;
>> import org.apache.tuscany.core.system.builder.SystemComponentBuilder;
>> -import
>> org.apache.tuscany.core.system.context.SystemCompositeComponent;
>> -import
>> org.apache.tuscany.core.system.context.SystemCompositeComponentImpl;
>> +import
>> org.apache.tuscany.core.system.component.SystemCompositeComponent;
>> +import
>> org.apache.tuscany.core.system.component.SystemCompositeComponentImpl
>> ;
>> import org.apache.tuscany.core.system.model.SystemBinding;
>> import org.apache.tuscany.core.system.model.SystemImplementation;
>> import org.apache.tuscany.spi.model.BoundReferenceDefinition;
>> @@ -65,14 +65,14 @@
>> connector.connect(sourceComponent);
>>
>> grandParent.start();
>> - scope.onEvent(new ModuleStart(this, parent));
>> + scope.onEvent(new CompositeStart(this, parent));
>> Source source = (Source) parent.getChild
>> ("source").getService();
>> assertNotNull(source);
>> Target target = (Target) parent.getChild
>> ("target").getService();
>> assertNotNull(target);
>> assertSame(target, source.getTarget());
>> assertSame(target, grandParent.getChild
>> ("target").getService());
>> - scope.onEvent(new ModuleStop(this, parent));
>> + scope.onEvent(new CompositeStop(this, parent));
>> grandParent.stop();
>> scope.stop();
>> }
>> @@ -99,13 +99,13 @@
>> parent.register(sourceComponent);
>>
>> parent.start();
>> - scope.onEvent(new ModuleStart(this, parent));
>> + scope.onEvent(new CompositeStart(this, parent));
>> Source source = (Source) parent.getChild
>> ("source").getService();
>> assertNotNull(source);
>> Target target = (Target) parent.getChild
>> ("target").getService();
>> assertNotNull(target);
>> assertSame(target, source.getTarget());
>> - scope.onEvent(new ModuleStop(this, parent));
>> + scope.onEvent(new CompositeStop(this, parent));
>> parent.stop();
>> scope.stop();
>> }
>>
>> Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/
>> java/org/apache/tuscany/core/integration/system/builder/
>> SystemBuildersTestCase.java
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/
>> integration/system/builder/SystemBuildersTestCase.java?
>> rev=411373&r1=411372&r2=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/integration/system/builder/
>> SystemBuildersTestCase.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/integration/system/builder/
>> SystemBuildersTestCase.java Fri Jun 2 20:52:57 2006
>> @@ -5,15 +5,15 @@
>> import org.apache.tuscany.core.builder.ConnectorImpl;
>> import org.apache.tuscany.core.component.WorkContextImpl;
>> import org.apache.tuscany.core.component.scope.ModuleScopeContext;
>> -import org.apache.tuscany.core.component.event.ModuleStart;
>> -import org.apache.tuscany.core.component.event.ModuleStop;
>> +import org.apache.tuscany.core.component.event.CompositeStart;
>> +import org.apache.tuscany.core.component.event.CompositeStop;
>> import org.apache.tuscany.core.mock.component.Source;
>> import org.apache.tuscany.core.mock.component.Target;
>> import org.apache.tuscany.core.mock.factories.MockComponentFactory;
>> import org.apache.tuscany.core.system.builder.SystemBindingBuilder;
>> import org.apache.tuscany.core.system.builder.SystemComponentBuilder;
>> -import
>> org.apache.tuscany.core.system.context.SystemCompositeComponent;
>> -import
>> org.apache.tuscany.core.system.context.SystemCompositeComponentImpl;
>> +import
>> org.apache.tuscany.core.system.component.SystemCompositeComponent;
>> +import
>> org.apache.tuscany.core.system.component.SystemCompositeComponentImpl
>> ;
>> import org.apache.tuscany.core.system.model.SystemBinding;
>> import org.apache.tuscany.core.system.model.SystemImplementation;
>> import org.apache.tuscany.spi.context.AtomicComponent;
>> @@ -59,13 +59,13 @@
>> connector.connect(sourceComponent);
>> connector.connect(targetComponent);
>> parent.start();
>> - scope.onEvent(new ModuleStart(this, parent));
>> + scope.onEvent(new CompositeStart(this, parent));
>> Source source = (Source) parent.getChild
>> ("source").getService();
>> assertNotNull(source);
>> Target target = (Target) parent.getChild
>> ("target").getService();
>> assertNotNull(target);
>> assertSame(target, source.getTarget());
>> - scope.onEvent(new ModuleStop(this, parent));
>> + scope.onEvent(new CompositeStop(this, parent));
>> parent.stop();
>> scope.stop();
>> }
>> @@ -102,13 +102,13 @@
>> connector.connect(sourceComponent);
>> grandParent.register(parent);
>> grandParent.start();
>> - scope.onEvent(new ModuleStart(this, parent));
>> + scope.onEvent(new CompositeStart(this, parent));
>> Source source = (Source) parent.getChild
>> ("source").getService();
>> assertNotNull(source);
>> Target target = (Target) parent.getChild
>> ("target").getService();
>> assertNotNull(target);
>> assertSame(target, source.getTarget());
>> - scope.onEvent(new ModuleStop(this, parent));
>> + scope.onEvent(new CompositeStop(this, parent));
>> grandParent.stop();
>> scope.stop();
>> }
>> @@ -143,13 +143,13 @@
>> String serviceName = service.getOutboundWire
>> ().getTargetName().getPortName();
>> connector.connect(service.getOutboundWire(),
>> sourceComponent.getInboundWire(serviceName), parent, true);
>> parent.start();
>> - scope.onEvent(new ModuleStart(this, parent));
>> + scope.onEvent(new CompositeStart(this, parent));
>> Target target = (Target) parent.getChild
>> ("serviceDefinition").getService();
>> assertNotNull(target);
>> Target target2 = (Target) parent.getChild
>> ("target").getService();
>> assertNotNull(target);
>> assertSame(target, target2);
>> - scope.onEvent(new ModuleStop(this, parent));
>> + scope.onEvent(new CompositeStop(this, parent));
>> parent.stop();
>> scope.stop();
>>
>> @@ -188,13 +188,13 @@
>> // connector.connect(serviceContext.getOutboundWire(),
>> referenceContext.getInboundWire(),true);
>> // grandParent.registerContext(parent);
>> // grandParent.start();
>> -// scope.onEvent(new ModuleStart(this, parent));
>> +// scope.onEvent(new CompositeStart(this, parent));
>> // Target target = (Target) parent.getContext
>> ("service").getService();
>> // assertNotNull(target);
>> // Target target2 = (Target) parent.getContext
>> ("target").getService();
>> // assertNotNull(target);
>> // assertSame(target, target2);
>> -// scope.onEvent(new ModuleStop(this, parent));
>> +// scope.onEvent(new CompositeStop(this, parent));
>> // parent.stop();
>> // scope.stop();
>>
>>
>> Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/
>> java/org/apache/tuscany/core/mock/factories/MockContextFactory.java
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/
>> factories/MockContextFactory.java?
>> rev=411373&r1=411372&r2=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/mock/factories/MockContextFactory.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/mock/factories/MockContextFactory.java Fri
>> Jun 2 20:52:57 2006
>> @@ -12,8 +12,8 @@
>> import org.apache.tuscany.core.injection.Injector;
>> import org.apache.tuscany.core.injection.MethodEventInvoker;
>> import org.apache.tuscany.core.injection.PojoObjectFactory;
>> -import org.apache.tuscany.core.system.context.SystemAtomicComponent;
>> -import
>> org.apache.tuscany.core.system.context.SystemAtomicComponentImpl;
>> +import
>> org.apache.tuscany.core.system.component.SystemAtomicComponent;
>> +import
>> org.apache.tuscany.core.system.component.SystemAtomicComponentImpl;
>> import org.apache.tuscany.core.system.wire.SystemInboundWireImpl;
>> import org.apache.tuscany.core.system.wire.SystemOutboundWireImpl;
>> import org.apache.tuscany.core.system.wire.SystemOutboundWire;
>>
>> Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/
>> org/apache/tuscany/core/system/component/AutowireTestCase.java
>> (from r411369, incubator/tuscany/sandbox/jboynes/sca/core2/src/
>> test/java/org/apache/tuscany/core/system/context/
>> AutowireTestCase.java)
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/
>> component/AutowireTestCase.java?p2=incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/
>> component/AutowireTestCase.java&p1=incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/
>> context/
>> AutowireTestCase.java&r1=411369&r2=411373&rev=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/system/context/AutowireTestCase.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/system/component/AutowireTestCase.java Fri
>> Jun 2 20:52:57 2006
>> @@ -1,10 +1,15 @@
>> -package org.apache.tuscany.core.system.context;
>> +package org.apache.tuscany.core.system.component;
>>
>> import java.util.ArrayList;
>> import java.util.List;
>>
>> import org.jmock.Mock;
>> import org.jmock.MockObjectTestCase;
>> +import
>> org.apache.tuscany.core.system.component.SystemAtomicComponent;
>> +import
>> org.apache.tuscany.core.system.component.SystemCompositeComponent;
>> +import
>> org.apache.tuscany.core.system.component.SystemCompositeComponentImpl
>> ;
>> +import org.apache.tuscany.core.system.component.SystemReference;
>> +import org.apache.tuscany.core.system.component.SystemService;
>>
>> /**
>> * Performs basic autowiring tests to composite artifacts
>>
>> Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/
>> org/apache/tuscany/core/system/component/ChildLocateTestCase.java
>> (from r411369, incubator/tuscany/sandbox/jboynes/sca/core2/src/
>> test/java/org/apache/tuscany/core/system/context/
>> ChildLocateTestCase.java)
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/
>> component/ChildLocateTestCase.java?p2=incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/
>> component/ChildLocateTestCase.java&p1=incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/
>> context/
>> ChildLocateTestCase.java&r1=411369&r2=411373&rev=411373&view=diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/system/context/ChildLocateTestCase.java
>> (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/system/component/ChildLocateTestCase.java Fri
>> Jun 2 20:52:57 2006
>> @@ -1,4 +1,4 @@
>> -package org.apache.tuscany.core.system.context;
>> +package org.apache.tuscany.core.system.component;
>>
>> import junit.framework.TestCase;
>>
>> @@ -19,7 +19,7 @@
>> // SystemAtomicComponent context =
>> MockContextFactory.createSystemAtomicContext("source",
>> SourceImpl.class);
>> // scopeContext.register(context);
>> // context.setScopeContext(scopeContext);
>> -// scopeContext.publish(new ModuleStart(this, parent));
>> +// scopeContext.publish(new CompositeStart(this, parent));
>> //
>> // assertNotNull(source);
>> // CompositeComponent composite1 = (CompositeComponent)
>> parent.getContext("child1");
>> @@ -27,7 +27,7 @@
>> // AtomicComponent ctx2 = (AtomicComponent)
>> composite2.getContext("source");
>> // Source source2 = (Source) ctx2.getInstance();
>> // assertSame(source, source2);
>> -// scopeContext.onEvent(new ModuleStop(this, parent));
>> +// scopeContext.onEvent(new CompositeStop(this, parent));
>> // parent.stop();
>> // scopeContext.stop();
>> /////
>> @@ -42,8 +42,8 @@
>> // EntryPoint ep = MockContextFactory.createEPSystemBinding
>> ("TestService1EP", ModuleScopeSystemComponent.class,
>> "TestService1", component);
>> // childContext.registerModelObject(component);
>> // childContext.registerModelObject(ep);
>> -// childContext.publish(new ModuleStart(this));
>> +// childContext.publish(new CompositeStart(this));
>> // Assert.assertNotNull(system.getContext
>> ("system.child").getInstance(new QualifiedName("./TestService1EP")));
>> -// childContext.publish(new ModuleStop(this));
>> +// childContext.publish(new CompositeStop(this));
>> }
>> }
>>
>> Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/
>> org/apache/tuscany/core/system/component/
>> CompositePropagationTestCase.java (from r411369, incubator/tuscany/
>> sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/
>> system/context/CompositePropagationTestCase.java)
>> URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/
>> jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/
>> component/CompositePropagationTestCase.java?p2=incubator/tuscany/
>> sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/
>> system/component/CompositePropagationTestCase.java&p1=incubator/
>> tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/
>> core/system/context/
>> CompositePropagationTestCase.java&r1=411369&r2=411373&rev=411373&view
>> =diff
>> =====================================================================
>> =========
>> --- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/system/context/
>> CompositePropagationTestCase.java (original)
>> +++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/
>> apache/tuscany/core/system/component/
>> CompositePropagationTestCase.java Fri Jun 2 20:52:57 2006
>> @@ -1,9 +1,12 @@
>> -package org.apache.tuscany.core.system.context;
>> +package org.apache.tuscany.core.system.component;
>>
>> import java.util.ArrayList;
>> import java.util.List;
>>
>> import org.apache.tuscany.core.mock.component.Source;
>> +import
>> org.apache.tuscany.core.system.component.SystemAtomicComponent;
>> +import
>> org.apache.tuscany.core.system.component.SystemCompositeComponent;
>> +import
>> org.apache.tuscany.core.system.component.SystemCompositeComponentImpl
>> ;
>> import org.jmock.Mock;
>> import org.jmock.MockObjectTestCase;
>>
>>
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
>> For additional commands, e-mail: tuscany-commits-help@ws.apache.org
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: tuscany-dev-unsubscribe@ws.apache.org
> For additional commands, e-mail: tuscany-dev-help@ws.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-dev-help@ws.apache.org