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/20 03:47:34 UTC
svn commit: r520238 - in /incubator/tuscany/java/sca/kernel:
core/src/main/java/org/apache/tuscany/core/component/scope/
core/src/main/java/org/apache/tuscany/core/deployer/
core/src/main/java/org/apache/tuscany/core/runtime/
core/src/main/java/org/apa...
Author: jboynes
Date: Mon Mar 19 19:47:33 2007
New Revision: 520238
URL: http://svn.apache.org/viewvc?view=rev&rev=520238
Log:
lazily create the eager init queue for scopes
this avoids the need to create the group, so removed that from the ScopeContainer API
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/deployer/DeployerImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/AssemblyServiceImpl.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/AbstractScopeContainerTestCase.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/CompositeScopeInitDestroyErrorTestCase.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/implementation/java/integration/WireToScopedJavaTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentWireInvocationTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/java/PhysicalBuilderTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/PhysicalBuilderTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/scope/ScopeReferenceTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/wire/ReferenceInjectionTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ScopeContainer.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=520238&r1=520237&r2=520238
==============================================================================
--- 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 Mon Mar 19 19:47:33 2007
@@ -23,15 +23,14 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
-import java.util.HashSet;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Destroy;
+import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.Reference;
import org.apache.tuscany.spi.AbstractLifecycle;
import org.apache.tuscany.spi.component.AtomicComponent;
@@ -63,8 +62,6 @@
private final Scope scope;
protected final ScopeContainerMonitor monitor;
- protected final Map<URI, Set<AtomicComponent<?>>> groups =
- new ConcurrentHashMap<URI, Set<AtomicComponent<?>>>();
protected final Map<AtomicComponent<?>, URI> componentGroups =
new ConcurrentHashMap<AtomicComponent<?>, URI>();
@@ -72,7 +69,7 @@
// the queue of components to eagerly initialize in each group
protected final Map<URI, List<AtomicComponent<?>>> initQueues =
- new ConcurrentHashMap<URI, List<AtomicComponent<?>>>();
+ new HashMap<URI, List<AtomicComponent<?>>>();
// the queue of instanceWrappers to destroy, in the order that their instances were created
protected final Map<KEY, List<InstanceWrapper<?>>> destroyQueues =
@@ -108,10 +105,11 @@
throw new IllegalStateException("Scope in wrong state [" + lifecycleState + "]");
}
setLifecycleState(STOPPED);
- groups.clear();
componentGroups.clear();
contextGroups.clear();
- initQueues.clear();
+ synchronized (initQueues) {
+ initQueues.clear();
+ }
destroyQueues.clear();
}
@@ -126,46 +124,50 @@
public <T> void register(AtomicComponent<T> component, URI groupId) {
checkInit();
- assert groups.containsKey(groupId);
- Set<AtomicComponent<?>> components = groups.get(groupId);
- components.add(component);
componentGroups.put(component, groupId);
if (component.isEagerInit()) {
- List<AtomicComponent<?>> initQueue = initQueues.get(groupId);
- // FIXME it would be more efficient to binary search and then insert
- initQueue.add(component);
- Collections.sort(initQueue, COMPARATOR);
+ synchronized (initQueues) {
+ List<AtomicComponent<?>> initQueue = initQueues.get(groupId);
+ if (initQueue == null) {
+ initQueue = new ArrayList<AtomicComponent<?>>();
+ initQueues.put(groupId, initQueue);
+ }
+ // FIXME it would be more efficient to binary search and then insert
+ initQueue.add(component);
+ Collections.sort(initQueue, COMPARATOR);
+ }
}
}
public <T> void unregister(AtomicComponent<T> component) {
URI groupId = componentGroups.remove(component);
- assert groupId != null;
- Set<AtomicComponent<?>> components = groups.get(groupId);
- components.remove(component);
- }
-
- public void createGroup(URI groupId) {
- assert !groups.containsKey(groupId);
- groups.put(groupId, new HashSet<AtomicComponent<?>>());
- initQueues.put(groupId, new ArrayList<AtomicComponent<?>>());
- }
-
- protected Set<AtomicComponent<?>> getGroupMembers(URI groupId) {
- return groups.get(groupId);
- }
-
- public void removeGroup(URI groupId) {
- assert groups.containsKey(groupId);
- groups.remove(groupId);
- initQueues.remove(groupId);
+ if (component.isEagerInit()) {
+ synchronized (initQueues) {
+ List<AtomicComponent<?>> initQueue = initQueues.get(groupId);
+ initQueue.remove(component);
+ if (initQueue.isEmpty()) {
+ initQueues.remove(groupId);
+ }
+ }
+ }
}
public void startContext(KEY contextId, URI groupId) throws GroupInitializationException {
assert !contextGroups.containsKey(contextId);
contextGroups.put(contextId, groupId);
destroyQueues.put(contextId, new ArrayList<InstanceWrapper<?>>());
- initializeComponents(contextId, initQueues.get(groupId));
+
+ // get and clone initialization queue
+ List<AtomicComponent<?>> initQueue;
+ synchronized (initQueues) {
+ initQueue = initQueues.get(groupId);
+ if (initQueue != null) {
+ initQueue = new ArrayList<AtomicComponent<?>>(initQueue);
+ }
+ }
+ if (initQueue != null) {
+ initializeComponents(contextId, initQueue);
+ }
}
protected URI getContextGroup(KEY contextId) {
@@ -214,7 +216,7 @@
* The list is traversed in order and the getWrapper() method called for each to
* associate an instance with the supplied context.
*
- * @param contextId the contextId to associated with the component instances
+ * @param contextId the contextId to associated with the component instances
* @param components the components to be initialized
* @throws GroupInitializationException if one or more components threw an exception during initialization
*/
@@ -247,11 +249,11 @@
protected void shutdownComponents(List<InstanceWrapper<?>> instances) {
while (true) {
InstanceWrapper<?> toDestroy;
- synchronized(instances) {
+ synchronized (instances) {
if (instances.size() == 0) {
return;
}
- toDestroy = instances.remove(instances.size()-1);
+ toDestroy = instances.remove(instances.size() - 1);
}
try {
toDestroy.stop();
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java?view=diff&rev=520238&r1=520237&r2=520238
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java Mon Mar 19 19:47:33 2007
@@ -122,7 +122,6 @@
@SuppressWarnings("unchecked")
ScopeContainer<URI> scopeContainer = scopeRegistry.getScopeContainer(Scope.COMPOSITE);
URI groupId = componentDefinition.getUri();
- scopeContainer.createGroup(groupId);
DeploymentContext deploymentContext =
new RootDeploymentContext(null, null, groupId, xmlFactory, scopeContainer, false);
// load the model
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java?view=diff&rev=520238&r1=520237&r2=520238
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java Mon Mar 19 19:47:33 2007
@@ -89,7 +89,7 @@
private static final URI RUNTIME_INFO_URI = TUSCANY_SYSTEM_ROOT.resolve("RuntimeInfo");
- private static final URI CLASSLOADER_REGISTRY_URI = TUSCANY_SYSTEM_ROOT.resolve("ClassLoaderRegsitry");
+ private static final URI CLASSLOADER_REGISTRY_URI = TUSCANY_SYSTEM_ROOT.resolve("ClassLoaderRegistry");
private static final URI HOST_CLASSLOADER_ID = URI.create("sca://./hostClassLoader");
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/AssemblyServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/AssemblyServiceImpl.java?view=diff&rev=520238&r1=520237&r2=520238
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/AssemblyServiceImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/AssemblyServiceImpl.java Mon Mar 19 19:47:33 2007
@@ -158,7 +158,6 @@
ScopeContainer<URI> scopeContainer = scopeRegistry.getScopeContainer(Scope.COMPOSITE);
URI groupId = domain.getUri();
- scopeContainer.createGroup(groupId);
// FIXME this needs to be done properly
ClassLoader cl = getClass().getClassLoader();
DeploymentContext deploymentContext =
@@ -216,7 +215,7 @@
serviceDefinition = targetType.getServices().get(serviceName);
} else if (targetType.getServices().size() == 1) {
// default service
- serviceDefinition = targetType.getServices().values().iterator().next();
+ serviceDefinition = targetType.getServices().get(0);
}
assert serviceDefinition != null;
generatorRegistry.generateWire(child,
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/AbstractScopeContainerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/AbstractScopeContainerTestCase.java?view=diff&rev=520238&r1=520237&r2=520238
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/AbstractScopeContainerTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/AbstractScopeContainerTestCase.java Mon Mar 19 19:47:33 2007
@@ -50,7 +50,6 @@
protected void preRegisterComponent() throws Exception {
scopeContainer.start();
- scopeContainer.createGroup(groupId);
scopeContainer.register(component, groupId);
EasyMock.expect(component.isEagerInit()).andStubReturn(false);
}
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=520238&r1=520237&r2=520238
==============================================================================
--- 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 Mon Mar 19 19:47:33 2007
@@ -138,7 +138,6 @@
scopeContainer = new CompositeScopeContainer<URI>(null);
scopeContainer.start();
- scopeContainer.createGroup(groupId);
scopeContainer.startContext(contextId, groupId);
}
}
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=520238&r1=520237&r2=520238
==============================================================================
--- 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 Mon Mar 19 19:47:33 2007
@@ -42,7 +42,6 @@
public void testInitializeError() throws Exception {
CompositeScopeContainer scope = new CompositeScopeContainer(null);
scope.start();
- scope.createGroup(groupId);
ObjectCreationException ex = new ObjectCreationException("");
AtomicComponent component = EasyMock.createMock(AtomicComponent.class);
@@ -72,7 +71,6 @@
EasyMock.replay(monitor);
CompositeScopeContainer scope = new CompositeScopeContainer(monitor);
scope.start();
- scope.createGroup(groupId);
AtomicComponent component = EasyMock.createMock(AtomicComponent.class);
EasyMock.expect(component.createInstanceWrapper()).andReturn(wrapper);
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=520238&r1=520237&r2=520238
==============================================================================
--- 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 Mon Mar 19 19:47:33 2007
@@ -337,7 +337,6 @@
connector = new ConnectorImpl(null, null, null, componentManager, scheduler, workContext);
container = new CompositeScopeContainer(null);
container.start();
- container.createGroup(groupId);
container.startContext(groupId, groupId);
context = createMock(DeploymentContext.class);
expect(context.getCompositeScope()).andStubReturn(container);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/WireToScopedJavaTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/WireToScopedJavaTestCase.java?view=diff&rev=520238&r1=520237&r2=520238
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/WireToScopedJavaTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/WireToScopedJavaTestCase.java Mon Mar 19 19:47:33 2007
@@ -19,9 +19,6 @@
package org.apache.tuscany.core.implementation.java.integration;
import java.net.URI;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
-import java.util.concurrent.FutureTask;
import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.component.WorkContext;
@@ -38,15 +35,7 @@
import junit.framework.TestCase;
import org.apache.tuscany.core.component.WorkContextImpl;
-import org.apache.tuscany.core.component.event.ComponentStart;
-import org.apache.tuscany.core.component.event.ComponentStop;
-import org.apache.tuscany.core.component.event.HttpSessionEnd;
-import org.apache.tuscany.core.component.event.HttpSessionStart;
-import org.apache.tuscany.core.component.event.RequestEnd;
-import org.apache.tuscany.core.component.event.RequestStart;
import org.apache.tuscany.core.component.scope.CompositeScopeContainer;
-import org.apache.tuscany.core.component.scope.HttpSessionScopeContainer;
-import org.apache.tuscany.core.component.scope.RequestScopeContainer;
import org.apache.tuscany.core.component.scope.StatelessScopeContainer;
import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
import org.apache.tuscany.core.implementation.PojoConfiguration;
@@ -71,7 +60,6 @@
public void testToStatelessScope() throws Exception {
StatelessScopeContainer scope = new StatelessScopeContainer(null);
scope.start();
- scope.createGroup(URI.create("composite"));
final Wire wire = getWire(scope);
Target service = proxyService.createProxy(Target.class, wire);
assertNotNull(service);
@@ -170,7 +158,6 @@
Object contextId = new Object();
CompositeScopeContainer scope = new CompositeScopeContainer(null);
scope.start();
- scope.createGroup(groupId);
scope.startContext(contextId, groupId);
workContext.setIdentifier(Scope.COMPOSITE, contextId);
final Wire wire = getWire(scope);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentWireInvocationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentWireInvocationTestCase.java?view=diff&rev=520238&r1=520237&r2=520238
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentWireInvocationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentWireInvocationTestCase.java Mon Mar 19 19:47:33 2007
@@ -45,7 +45,6 @@
groupId = URI.create("composite");
CompositeScopeContainer scope = new CompositeScopeContainer(null);
scope.start();
- scope.createGroup(groupId);
scope.startContext(groupId, groupId);
Target target = new TargetImpl();
PojoConfiguration configuration = new PojoConfiguration();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/java/PhysicalBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/java/PhysicalBuilderTestCase.java?view=diff&rev=520238&r1=520237&r2=520238
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/java/PhysicalBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/java/PhysicalBuilderTestCase.java Mon Mar 19 19:47:33 2007
@@ -147,7 +147,6 @@
scopeContainer = new CompositeScopeContainer<URI>(null);
scopeContainer.start();
- scopeContainer.createGroup(groupId);
scopeContainer.startContext(groupId, groupId);
scopeRegistry = EasyMock.createMock(ScopeRegistry.class);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/PhysicalBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/PhysicalBuilderTestCase.java?view=diff&rev=520238&r1=520237&r2=520238
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/PhysicalBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/PhysicalBuilderTestCase.java Mon Mar 19 19:47:33 2007
@@ -146,7 +146,6 @@
scopeContainer = new CompositeScopeContainer<URI>(null);
scopeContainer.start();
- scopeContainer.createGroup(groupId);
scopeContainer.startContext(groupId, groupId);
scopeRegistry = EasyMock.createMock(ScopeRegistry.class);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/scope/ScopeReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/scope/ScopeReferenceTestCase.java?view=diff&rev=520238&r1=520237&r2=520238
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/scope/ScopeReferenceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/scope/ScopeReferenceTestCase.java Mon Mar 19 19:47:33 2007
@@ -23,28 +23,16 @@
import java.lang.reflect.Proxy;
import java.util.HashMap;
import java.util.Map;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
-import java.util.concurrent.FutureTask;
import java.net.URI;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.ScopeContainer;
-import org.apache.tuscany.spi.component.TargetException;
import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.model.Scope;
import junit.framework.TestCase;
-import org.apache.tuscany.core.component.WorkContextImpl;
-import org.apache.tuscany.core.component.event.ComponentStart;
-import org.apache.tuscany.core.component.event.ComponentStop;
-import org.apache.tuscany.core.component.event.HttpSessionEnd;
-import org.apache.tuscany.core.component.event.HttpSessionStart;
-import org.apache.tuscany.core.component.event.RequestEnd;
-import org.apache.tuscany.core.component.event.RequestStart;
+
import org.apache.tuscany.core.component.scope.CompositeScopeContainer;
-import org.apache.tuscany.core.component.scope.HttpSessionScopeContainer;
-import org.apache.tuscany.core.component.scope.RequestScopeContainer;
import org.apache.tuscany.core.component.scope.StatelessScopeContainer;
import org.apache.tuscany.core.integration.mock.MockFactory;
import org.apache.tuscany.core.mock.component.Source;
@@ -791,10 +779,8 @@
statelessScope = new StatelessScopeContainer(null);
statelessScope.start();
- statelessScope.createGroup(groupId);
compositeScope = new CompositeScopeContainer(null);
compositeScope.start();
- compositeScope.createGroup(groupId);
compositeScope.startContext(groupId, groupId);
workContext = EasyMock.createMock(WorkContext.class);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/wire/ReferenceInjectionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/wire/ReferenceInjectionTestCase.java?view=diff&rev=520238&r1=520237&r2=520238
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/wire/ReferenceInjectionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/wire/ReferenceInjectionTestCase.java Mon Mar 19 19:47:33 2007
@@ -46,7 +46,6 @@
ScopeContainer scope = new CompositeScopeContainer(null);
scope.start();
URI groupId = URI.create("composite");
- scope.createGroup(groupId);
scope.startContext(groupId, groupId);
Map<String, AtomicComponent> components = MockFactory.createWiredComponents("source",
SourceImpl.class,
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=520238&r1=520237&r2=520238
==============================================================================
--- 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 Mon Mar 19 19:47:33 2007
@@ -44,20 +44,6 @@
Scope getScope();
/**
- * Create a group for associating components together.
- *
- * @param groupId an identifier for the group
- */
- void createGroup(URI groupId);
-
- /**
- * Remove a group that associates components together.
- *
- * @param groupId an identifier for the group
- */
- void removeGroup(URI groupId);
-
- /**
* Registers a component with the scope.
*
* @param component the component to register
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org