You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jb...@apache.org on 2007/03/13 23:30:30 UTC
svn commit: r517914 - in /incubator/tuscany/java/sca/kernel:
core/src/main/java/org/apache/tuscany/core/component/scope/
core/src/main/java/org/apache/tuscany/core/implementation/
core/src/test/java/org/apache/tuscany/core/component/scope/ core/src/tes...
Author: jboynes
Date: Tue Mar 13 15:30:27 2007
New Revision: 517914
URL: http://svn.apache.org/viewvc?view=rev&rev=517914
Log:
add groupId when registering a component with the scope container
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContainer.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeContainer.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainer.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeContainer.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeContainer.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoComponent.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicCompositeScopeTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicHttpSessionScopeTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicRequestScopeTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicStatelessScopeTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeInitDestroyErrorTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerPersistenceTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/PojoAtomicComponentTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/PojoComponentTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderMetadataTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ScopeContainer.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContainer.java?view=diff&rev=517914&r1=517913&r2=517914
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContainer.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContainer.java Tue Mar 13 15:30:27 2007
@@ -45,7 +45,7 @@
this.monitor = monitor;
}
- public void register(AtomicComponent component) {
+ public void register(GROUP groupId, AtomicComponent component) {
checkInit();
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeContainer.java?view=diff&rev=517914&r1=517913&r2=517914
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeContainer.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeContainer.java Tue Mar 13 15:30:27 2007
@@ -115,8 +115,8 @@
}
}
- public void register(AtomicComponent component) {
- super.register(component);
+ public void register(Object groupId, AtomicComponent component) {
+ super.register(groupId, component);
instanceWrappers.put(component, EMPTY);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainer.java?view=diff&rev=517914&r1=517913&r2=517914
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainer.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainer.java Tue Mar 13 15:30:27 2007
@@ -69,8 +69,8 @@
lifecycleState = STOPPED;
}
- public void register(AtomicComponent component) {
- super.register(component);
+ public void register(Object groupId, AtomicComponent component) {
+ super.register(groupId, component);
component.addListener(this);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeContainer.java?view=diff&rev=517914&r1=517913&r2=517914
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeContainer.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeContainer.java Tue Mar 13 15:30:27 2007
@@ -78,7 +78,7 @@
lifecycleState = STOPPED;
}
- public void register(AtomicComponent component) {
+ public void register(Object groupId, AtomicComponent component) {
contexts.put(component, new ConcurrentHashMap<Object, InstanceWrapper>());
component.addListener(this);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeContainer.java?view=diff&rev=517914&r1=517913&r2=517914
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeContainer.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeContainer.java Tue Mar 13 15:30:27 2007
@@ -76,8 +76,8 @@
lifecycleState = STOPPED;
}
- public void register(AtomicComponent component) {
- super.register(component);
+ public void register(Object groupId, AtomicComponent component) {
+ super.register(groupId, component);
contexts.put(component, new ConcurrentHashMap<Thread, InstanceWrapper>());
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoComponent.java?view=diff&rev=517914&r1=517913&r2=517914
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoComponent.java Tue Mar 13 15:30:27 2007
@@ -101,7 +101,7 @@
public void start() {
super.start();
- scopeContainer.register(this);
+ scopeContainer.register(null, this);
instanceFactory = provider.createFactory();
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicCompositeScopeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicCompositeScopeTestCase.java?view=diff&rev=517914&r1=517913&r2=517914
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicCompositeScopeTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicCompositeScopeTestCase.java Tue Mar 13 15:30:27 2007
@@ -29,8 +29,6 @@
import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.core.component.event.ComponentStart;
import org.apache.tuscany.core.component.event.ComponentStop;
-import org.apache.tuscany.core.component.event.HttpSessionStart;
-import org.apache.tuscany.core.component.event.HttpSessionEnd;
/**
* @version $$Rev$$ $$Date$$
@@ -147,9 +145,9 @@
wrapper2.stop();
control.replay();
- scopeContainer.register(component1);
- scopeContainer.register(component2);
- scopeContainer.register(component3);
+ scopeContainer.register(null, component1);
+ scopeContainer.register(null, component2);
+ scopeContainer.register(null, component3);
scopeContainer.onEvent(new ComponentStart(this, null));
assertSame(wrapper1, scopeContainer.getWrapper(component1));
assertSame(wrapper2, scopeContainer.getWrapper(component2));
@@ -165,6 +163,6 @@
scopeContainer = new CompositeScopeContainer(null);
scopeContainer.start();
- scopeContainer.register(component);
+ scopeContainer.register(null, component);
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicHttpSessionScopeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicHttpSessionScopeTestCase.java?view=diff&rev=517914&r1=517913&r2=517914
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicHttpSessionScopeTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicHttpSessionScopeTestCase.java Tue Mar 13 15:30:27 2007
@@ -156,9 +156,9 @@
wrapper1.stop();
control.replay();
- scopeContainer.register(component1);
- scopeContainer.register(component2);
- scopeContainer.register(component3);
+ scopeContainer.register(null, component1);
+ scopeContainer.register(null, component2);
+ scopeContainer.register(null, component3);
scopeContainer.onEvent(new HttpSessionStart(this, session));
assertSame(wrapper1, scopeContainer.getWrapper(component1));
assertSame(wrapper2, scopeContainer.getWrapper(component2));
@@ -185,7 +185,7 @@
wrapper2.stop();
control.replay();
- scopeContainer.register(component1);
+ scopeContainer.register(null, component1);
scopeContainer.onEvent(new HttpSessionStart(this, session));
assertSame(wrapper1, scopeContainer.getWrapper(component1));
scopeContainer.onEvent(new HttpSessionEnd(this, session));
@@ -208,7 +208,7 @@
component.addListener(scopeContainer);
EasyMock.replay(component);
- scopeContainer.register(component);
+ scopeContainer.register(null, component);
EasyMock.reset(component);
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicRequestScopeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicRequestScopeTestCase.java?view=diff&rev=517914&r1=517913&r2=517914
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicRequestScopeTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicRequestScopeTestCase.java Tue Mar 13 15:30:27 2007
@@ -89,8 +89,8 @@
wrapper2.stop();
control.replay();
- scopeContainer.register(component1);
- scopeContainer.register(component2);
+ scopeContainer.register(null, component1);
+ scopeContainer.register(null, component2);
scopeContainer.onEvent(new RequestStart(this));
assertSame(wrapper1, scopeContainer.getWrapper(component1));
scopeContainer.onEvent(new RequestEnd(this));
@@ -135,9 +135,9 @@
wrapper1.stop();
control.replay();
- scopeContainer.register(component1);
- scopeContainer.register(component2);
- scopeContainer.register(component3);
+ scopeContainer.register(null, component1);
+ scopeContainer.register(null, component2);
+ scopeContainer.register(null, component3);
scopeContainer.onEvent(new RequestStart(this));
assertSame(wrapper1, scopeContainer.getWrapper(component1));
assertSame(wrapper2, scopeContainer.getWrapper(component2));
@@ -156,7 +156,7 @@
component.addListener(scopeContainer);
EasyMock.replay(component);
- scopeContainer.register(component);
+ scopeContainer.register(null, component);
EasyMock.reset(component);
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicStatelessScopeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicStatelessScopeTestCase.java?view=diff&rev=517914&r1=517913&r2=517914
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicStatelessScopeTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicStatelessScopeTestCase.java Tue Mar 13 15:30:27 2007
@@ -73,7 +73,7 @@
scopeContainer = new StatelessScopeContainer(null, null);
scopeContainer.start();
EasyMock.replay(component);
- scopeContainer.register(component);
+ scopeContainer.register(null, component);
EasyMock.reset(component);
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeInitDestroyErrorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeInitDestroyErrorTestCase.java?view=diff&rev=517914&r1=517913&r2=517914
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeInitDestroyErrorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/CompositeScopeInitDestroyErrorTestCase.java Tue Mar 13 15:30:27 2007
@@ -49,7 +49,7 @@
EasyMock.expect(component.createInstanceWrapper()).andThrow(new ObjectCreationException(""));
EasyMock.expect(component.getInitLevel()).andReturn(1);
EasyMock.replay(component);
- scope.register(component);
+ scope.register(null, component);
scope.onEvent(new ComponentStart(this, null));
EasyMock.verify(monitor);
}
@@ -72,7 +72,7 @@
EasyMock.expect(component.createInstanceWrapper()).andReturn(wrapper);
EasyMock.expect(component.getInitLevel()).andReturn(1);
EasyMock.replay(component);
- scope.register(component);
+ scope.register(null, component);
scope.onEvent(new ComponentStart(this, null));
scope.onEvent(new ComponentStop(this, null));
EasyMock.verify(monitor);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerPersistenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerPersistenceTestCase.java?view=diff&rev=517914&r1=517913&r2=517914
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerPersistenceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerPersistenceTestCase.java Tue Mar 13 15:30:27 2007
@@ -54,7 +54,7 @@
EasyMock.expect(component.getMaxAge()).andReturn(600000L).atLeastOnce();
EasyMock.replay(component);
- container.register(component);
+ container.register(null, component);
assertSame(wrapper, container.getWrapper(component));
EasyMock.verify(component);
EasyMock.verify(wrapper);
@@ -68,7 +68,7 @@
component.addListener(EasyMock.eq(container));
EasyMock.expect(component.getMaxIdleTime()).andReturn(-1L).atLeastOnce();
EasyMock.replay(component);
- container.register(component);
+ container.register(null, component);
InstanceWrapper fooWrapper = EasyMock.createMock(InstanceWrapper.class);
InstanceWrapper fooWrapper2 = EasyMock.createMock(InstanceWrapper.class);
container.persistNew(component, id, fooWrapper, System.currentTimeMillis() + 100000);
@@ -86,7 +86,7 @@
component.addListener(EasyMock.eq(container));
EasyMock.expect(component.getMaxIdleTime()).andReturn(-1L).atLeastOnce();
EasyMock.replay(component);
- container.register(component);
+ container.register(null, component);
InstanceWrapper fooWrapper = EasyMock.createMock(InstanceWrapper.class);
container.persistNew(component, id, fooWrapper, System.currentTimeMillis() + 100000);
assertEquals(fooWrapper, container.getWrapper(component));
@@ -103,7 +103,7 @@
EasyMock.expect(component.getMaxIdleTime()).andReturn(-1L).atLeastOnce();
EasyMock.expect(component.getUri()).andReturn(URI.create("foo")).atLeastOnce();
EasyMock.replay(component);
- container.register(component);
+ container.register(null, component);
InstanceWrapper fooWrapper = EasyMock.createMock(InstanceWrapper.class);
container.persistNew(component, id, fooWrapper, System.currentTimeMillis() + 100000);
assertEquals(fooWrapper, container.getWrapper(component));
@@ -131,7 +131,7 @@
EasyMock.expect(component.createInstanceWrapper()).andReturn(wrapper);
EasyMock.replay(component);
- container.register(component);
+ container.register(null, component);
InstanceWrapper fooWrapper = EasyMock.createMock(InstanceWrapper.class);
container.persistNew(component, id, fooWrapper, System.currentTimeMillis() + 100000);
assertEquals(fooWrapper, container.getWrapper(component));
@@ -149,7 +149,7 @@
EasyMock.expect(component.getMaxIdleTime()).andReturn(-1L).atLeastOnce();
component.addListener(EasyMock.eq(container));
EasyMock.replay(component);
- container.register(component);
+ container.register(null, component);
InstanceWrapper fooWrapper = EasyMock.createMock(InstanceWrapper.class);
container.persistNew(component, id, fooWrapper, System.currentTimeMillis() + 100000);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/PojoAtomicComponentTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/PojoAtomicComponentTestCase.java?view=diff&rev=517914&r1=517913&r2=517914
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/PojoAtomicComponentTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/PojoAtomicComponentTestCase.java Tue Mar 13 15:30:27 2007
@@ -45,7 +45,7 @@
public void testNoCallbackWires() throws Exception {
ScopeContainer container = EasyMock.createMock(ScopeContainer.class);
EasyMock.expect(container.getScope()).andReturn(Scope.CONVERSATION);
- container.register(EasyMock.isA(AtomicComponent.class));
+ container.register(EasyMock.isNull(), EasyMock.isA(AtomicComponent.class));
EasyMock.replay(container);
config.addCallbackSite("callback", Foo.class.getMethod("setCallback", Object.class));
AtomicComponent component = new TestAtomicComponent(config);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/PojoComponentTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/PojoComponentTestCase.java?view=diff&rev=517914&r1=517913&r2=517914
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/PojoComponentTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/PojoComponentTestCase.java Tue Mar 13 15:30:27 2007
@@ -67,7 +67,7 @@
public void testLifecycleAndWrapperCreation() {
// test start method creates the factory
expect(provider.createFactory()).andReturn(instanceFactory);
- scopeContainer.register(component);
+ scopeContainer.register(null, component);
replay(provider, instanceFactory, wrapper, scopeContainer);
component.start();
verify(provider, instanceFactory, wrapper, scopeContainer);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderMetadataTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderMetadataTestCase.java?view=diff&rev=517914&r1=517913&r2=517914
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderMetadataTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderMetadataTestCase.java Tue Mar 13 15:30:27 2007
@@ -103,7 +103,7 @@
scopeContainer = EasyMock.createMock(ScopeContainer.class);
scopeContainer.start();
scopeContainer.stop();
- scopeContainer.register(EasyMock.isA(AtomicComponent.class));
+ scopeContainer.register(EasyMock.isNull(), EasyMock.isA(AtomicComponent.class));
EasyMock.expectLastCall().atLeastOnce();
EasyMock.expect(scopeContainer.getScope()).andReturn(Scope.COMPOSITE).atLeastOnce();
EasyMock.replay(scopeContainer);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java?view=diff&rev=517914&r1=517913&r2=517914
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java Tue Mar 13 15:30:27 2007
@@ -106,7 +106,7 @@
private void createDeploymentContext() throws Exception {
scopeContainer = EasyMock.createMock(ScopeContainer.class);
scopeContainer.start();
- scopeContainer.register(EasyMock.isA(AtomicComponent.class));
+ scopeContainer.register(EasyMock.isNull(), EasyMock.isA(AtomicComponent.class));
EasyMock.expectLastCall().atLeastOnce();
EasyMock.expect(scopeContainer.getScope()).andReturn(Scope.COMPOSITE).atLeastOnce();
scopeContainer.getWrapper(EasyMock.isA(AtomicComponent.class));
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java?view=diff&rev=517914&r1=517913&r2=517914
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java Tue Mar 13 15:30:27 2007
@@ -91,7 +91,7 @@
ScopeContainer scope = EasyMock.createMock(ScopeContainer.class);
scope.start();
scope.stop();
- scope.register(EasyMock.isA(AtomicComponent.class));
+ scope.register(EasyMock.isNull(), EasyMock.isA(AtomicComponent.class));
EasyMock.expectLastCall().atLeastOnce();
EasyMock.expect(scope.getScope()).andReturn(Scope.COMPOSITE).atLeastOnce();
scope.getWrapper(EasyMock.isA(AtomicComponent.class));
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java?view=diff&rev=517914&r1=517913&r2=517914
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java Tue Mar 13 15:30:27 2007
@@ -82,12 +82,12 @@
ComponentDefinition<JavaImplementation> targetDefinition = createTarget();
JavaAtomicComponent targetComponent = (JavaAtomicComponent) builder.build(targetDefinition, context);
targetComponent.setScopeContainer(container);
- container.register(targetComponent);
+ container.register(null, targetComponent);
componentManager.register(targetComponent);
ComponentDefinition<JavaImplementation> sourceDefinition = createSource(URI.create("fooClient"));
JavaAtomicComponent clientComponent = (JavaAtomicComponent) builder.build(sourceDefinition, context);
clientComponent.setScopeContainer(container);
- container.register(clientComponent);
+ container.register(null, clientComponent);
componentManager.register(clientComponent);
connector.connect(sourceDefinition);
targetComponent.start();
@@ -115,18 +115,18 @@
JavaAtomicComponent targetComponent =
(JavaAtomicComponent) builder.build(targetDefinition, context);
targetComponent.setScopeContainer(container);
- container.register(targetComponent);
+ container.register(null, targetComponent);
componentManager.register(targetComponent);
ComponentDefinition<JavaImplementation> sourceDefinition1 = createSource(URI.create("client1"));
ComponentDefinition<JavaImplementation> sourceDefinition2 = createSource(URI.create("client2"));
JavaAtomicComponent clientComponent1 = (JavaAtomicComponent) builder.build(sourceDefinition1, context);
clientComponent1.setScopeContainer(container);
- container.register(clientComponent1);
+ container.register(null, clientComponent1);
componentManager.register(clientComponent1);
JavaAtomicComponent clientComponent2 = (JavaAtomicComponent) builder.build(sourceDefinition2, context);
clientComponent2.setScopeContainer(container);
- container.register(clientComponent2);
+ container.register(null, clientComponent2);
componentManager.register(clientComponent2);
connector.connect(sourceDefinition1);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java?view=diff&rev=517914&r1=517913&r2=517914
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java Tue Mar 13 15:30:27 2007
@@ -111,8 +111,8 @@
chain.setTargetInvoker(targetComponent.createTargetInvoker(targetName, chain.getOperation()));
}
sourceComponent.attachWire(wire);
- targetScope.register(targetComponent);
- sourceScope.register(sourceComponent);
+ targetScope.register(null, targetComponent);
+ sourceScope.register(null, sourceComponent);
Map<String, AtomicComponent> components = new HashMap<String, AtomicComponent>();
components.put(sourceName, sourceComponent);
components.put(targetName, targetComponent);
@@ -153,8 +153,8 @@
List<Wire> wires = new ArrayList<Wire>();
wires.add(wire);
sourceComponent.attachWires(wires);
- targetScope.register(targetComponent);
- sourceScope.register(sourceComponent);
+ targetScope.register(null, targetComponent);
+ sourceScope.register(null, sourceComponent);
Map<String, AtomicComponent> components = new HashMap<String, AtomicComponent>();
components.put(sourceName, sourceComponent);
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ScopeContainer.java?view=diff&rev=517914&r1=517913&r2=517914
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ScopeContainer.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ScopeContainer.java Tue Mar 13 15:30:27 2007
@@ -72,9 +72,10 @@
/**
* Registers a component with the scope.
*
+ * @param groupId the id for the group that this component is associated with
* @param component the component to register
*/
- void register(AtomicComponent component);
+ void register(GROUP groupId, AtomicComponent component);
/**
* Unregisters a component with the scope.
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java?view=diff&rev=517914&r1=517913&r2=517914
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java Tue Mar 13 15:30:27 2007
@@ -88,7 +88,7 @@
public void start() throws CoreRuntimeException {
super.start();
- scopeContainer.register(this);
+ scopeContainer.register(null, this);
}
public void stop() {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org