You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2006/12/18 10:27:37 UTC
svn commit: r488173 [1/2] - in /incubator/tuscany/java/sca:
kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/
kernel/core/src/main/java/org/apache/tuscany/core/component/scope/
kernel/core/src/main/java/org/apache/tuscany/core/deployer/ kern...
Author: jmarino
Date: Mon Dec 18 01:27:32 2006
New Revision: 488173
URL: http://svn.apache.org/viewvc?view=rev&rev=488173
Log:
cleanup scope container constructors; pass in scope monitor
Added:
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ScopeContainerMonitor.java (with props)
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java
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/ConversationalScopeContainer.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ConversationalScopeObjectFactory.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/HttpSessionScopeObjectFactory.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeContainer.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactory.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/component/scope/RequestScopeObjectFactory.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ScopeRegistryImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeContainer.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeObjectFactory.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.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/BasicConversationalScopeTestCase.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/BasicModuleScopeTestCase.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/ConversationalScopeContainerMaxAgeTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerMaxIdleTimeTestCase.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/component/scope/ConversationalScopeInstanceLifecycleTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeRestartTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/DependencyLifecycleTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeInstanceLifecycleTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeRestartTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeInstanceLifecycleTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactoryTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeRestartTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeInstanceLifecycleTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeRestartTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ScopeRegistryTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/StatelessScopeContainerTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/StatelessScopeObjectFactoryTestCase.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/OutboundWireToJavaTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/AbstractConversationTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderWireTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/scope/ScopeReferenceTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ScopeContainer.java
incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObjectLoaderTestCase.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java?view=diff&rev=488173&r1=488172&r2=488173
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java Mon Dec 18 01:27:32 2006
@@ -20,6 +20,23 @@
import javax.xml.stream.XMLInputFactory;
+import org.apache.tuscany.spi.bootstrap.ComponentNames;
+import org.apache.tuscany.spi.bootstrap.RuntimeComponent;
+import org.apache.tuscany.spi.builder.Builder;
+import org.apache.tuscany.spi.builder.BuilderRegistry;
+import org.apache.tuscany.spi.builder.Connector;
+import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.ScopeContainerMonitor;
+import org.apache.tuscany.spi.component.ScopeRegistry;
+import org.apache.tuscany.spi.component.WorkContext;
+import org.apache.tuscany.spi.deployer.Deployer;
+import org.apache.tuscany.spi.extension.LoaderExtension;
+import org.apache.tuscany.spi.idl.java.JavaInterfaceProcessorRegistry;
+import org.apache.tuscany.spi.implementation.java.ImplementationProcessorService;
+import org.apache.tuscany.spi.implementation.java.Introspector;
+import org.apache.tuscany.spi.loader.LoaderRegistry;
+import org.apache.tuscany.spi.loader.PropertyObjectFactory;
+
import org.apache.tuscany.core.builder.BuilderRegistryImpl;
import org.apache.tuscany.core.builder.ConnectorImpl;
import org.apache.tuscany.core.component.WorkContextImpl;
@@ -39,9 +56,9 @@
import org.apache.tuscany.core.implementation.processor.MonitorProcessor;
import org.apache.tuscany.core.implementation.processor.PropertyProcessor;
import org.apache.tuscany.core.implementation.processor.ReferenceProcessor;
+import org.apache.tuscany.core.implementation.processor.ResourceProcessor;
import org.apache.tuscany.core.implementation.processor.ScopeProcessor;
import org.apache.tuscany.core.implementation.processor.ServiceProcessor;
-import org.apache.tuscany.core.implementation.processor.ResourceProcessor;
import org.apache.tuscany.core.implementation.system.builder.SystemBindingBuilder;
import org.apache.tuscany.core.implementation.system.builder.SystemComponentBuilder;
import org.apache.tuscany.core.implementation.system.builder.SystemCompositeBuilder;
@@ -61,21 +78,6 @@
import org.apache.tuscany.core.loader.ServiceLoader;
import org.apache.tuscany.core.property.PropertyObjectFactoryImpl;
import org.apache.tuscany.host.MonitorFactory;
-import org.apache.tuscany.spi.bootstrap.ComponentNames;
-import org.apache.tuscany.spi.bootstrap.RuntimeComponent;
-import org.apache.tuscany.spi.builder.Builder;
-import org.apache.tuscany.spi.builder.BuilderRegistry;
-import org.apache.tuscany.spi.builder.Connector;
-import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.component.ScopeRegistry;
-import org.apache.tuscany.spi.component.WorkContext;
-import org.apache.tuscany.spi.deployer.Deployer;
-import org.apache.tuscany.spi.extension.LoaderExtension;
-import org.apache.tuscany.spi.idl.java.JavaInterfaceProcessorRegistry;
-import org.apache.tuscany.spi.implementation.java.ImplementationProcessorService;
-import org.apache.tuscany.spi.implementation.java.Introspector;
-import org.apache.tuscany.spi.loader.LoaderRegistry;
-import org.apache.tuscany.spi.loader.PropertyObjectFactory;
/**
* A default implementation of a Bootstrapper. Please see the documentation on the individual methods for how the
@@ -146,8 +148,8 @@
* @return a new ScopeRegistry
*/
public ScopeRegistry createScopeRegistry(WorkContext workContext) {
- ScopeRegistry scopeRegistry = new ScopeRegistryImpl(workContext);
- new ModuleScopeObjectFactory(scopeRegistry); // self-registers
+ ScopeRegistry scopeRegistry = new ScopeRegistryImpl();
+ new ModuleScopeObjectFactory(scopeRegistry, monitorFactory.getMonitor(ScopeContainerMonitor.class));
return scopeRegistry;
}
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=488173&r1=488172&r2=488173
==============================================================================
--- 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 Dec 18 01:27:32 2006
@@ -28,6 +28,7 @@
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.PersistenceException;
import org.apache.tuscany.spi.component.ScopeContainer;
+import org.apache.tuscany.spi.component.ScopeContainerMonitor;
import org.apache.tuscany.spi.component.TargetNotFoundException;
import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.spi.component.WorkContext;
@@ -44,22 +45,13 @@
public abstract class AbstractScopeContainer extends AbstractLifecycle implements ScopeContainer {
private static final EventFilter TRUE_FILTER = new TrueFilter();
- // The event context the scope container is associated with
protected WorkContext workContext;
- private final String name;
+ protected ScopeContainerMonitor monitor;
private Map<EventFilter, List<RuntimeEventListener>> listeners;
- public AbstractScopeContainer(String name, WorkContext workContext) {
- this.name = name;
- this.workContext = workContext;
- }
-
- public String getName() {
- return name;
- }
-
- public void setWorkContext(WorkContext workContext) {
+ public AbstractScopeContainer(WorkContext workContext, ScopeContainerMonitor monitor) {
this.workContext = workContext;
+ this.monitor = monitor;
}
public void addListener(RuntimeEventListener listener) {
@@ -67,7 +59,7 @@
}
public void removeListener(RuntimeEventListener listener) {
- assert listener != null : "Listener cannot be null";
+ assert listener != null;
synchronized (getListeners()) {
for (List<RuntimeEventListener> currentList : getListeners().values()) {
for (RuntimeEventListener current : currentList) {
@@ -81,7 +73,7 @@
}
public void addListener(EventFilter filter, RuntimeEventListener listener) {
- assert listener != null : "Listener cannot be null";
+ assert listener != null;
synchronized (getListeners()) {
List<RuntimeEventListener> list = getListeners().get(filter);
if (list == null) {
@@ -93,7 +85,7 @@
}
public void publish(Event event) {
- assert event != null : "Event object was null";
+ assert event != null;
for (Map.Entry<EventFilter, List<RuntimeEventListener>> entry : getListeners().entrySet()) {
if (entry.getKey().match(event)) {
for (RuntimeEventListener listener : entry.getValue()) {
@@ -149,7 +141,7 @@
protected void checkInit() {
if (getLifecycleState() != RUNNING) {
- throw new IllegalStateException("Scope not running [" + getLifecycleState() + "]");
+ throw new IllegalStateException("Scope container not running [" + getLifecycleState() + "]");
}
}
@@ -158,7 +150,7 @@
}
public String toString() {
- return "ScopeContainer [" + name + "] in state [" + super.toString() + ']';
+ return "In state [" + super.toString() + ']';
}
protected abstract InstanceWrapper getInstanceWrapper(AtomicComponent component, boolean create)
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=488173&r1=488172&r2=488173
==============================================================================
--- 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 Mon Dec 18 01:27:32 2006
@@ -21,10 +21,10 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.PersistenceException;
import org.apache.tuscany.spi.component.ScopeContainer;
+import org.apache.tuscany.spi.component.ScopeContainerMonitor;
import org.apache.tuscany.spi.component.TargetNotFoundException;
import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.spi.component.WorkContext;
@@ -43,8 +43,8 @@
private Store nonDurableStore;
private Map<AtomicComponent, AtomicComponent> components;
- public ConversationalScopeContainer(@Autowire Store store, @Autowire WorkContext workContext) {
- super("Conversational Scope", workContext);
+ public ConversationalScopeContainer(Store store, WorkContext workContext, ScopeContainerMonitor monitor) {
+ super(workContext, monitor);
this.nonDurableStore = store;
components = new ConcurrentHashMap<AtomicComponent, AtomicComponent>();
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ConversationalScopeObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ConversationalScopeObjectFactory.java?view=diff&rev=488173&r1=488172&r2=488173
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ConversationalScopeObjectFactory.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ConversationalScopeObjectFactory.java Mon Dec 18 01:27:32 2006
@@ -18,13 +18,18 @@
*/
package org.apache.tuscany.core.component.scope;
+import org.osoa.sca.annotations.Init;
+
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.spi.annotation.Autowire;
+import org.apache.tuscany.spi.component.ScopeContainerMonitor;
import org.apache.tuscany.spi.component.ScopeRegistry;
+import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.services.store.Store;
-import org.osoa.sca.annotations.Init;
+
+import org.apache.tuscany.api.annotation.Monitor;
/**
* Creates a new Session Scope context
@@ -32,12 +37,18 @@
* @version $$Rev: 450456 $$ $$Date: 2006-09-27 10:28:36 -0400 (Wed, 27 Sep 2006) $$
*/
public class ConversationalScopeObjectFactory implements ObjectFactory<ConversationalScopeContainer> {
-
+ private WorkContext context;
private Store store;
-
- public ConversationalScopeObjectFactory(@Autowire ScopeRegistry registry, @Autowire Store store) {
+ private ScopeContainerMonitor monitor;
+
+ public ConversationalScopeObjectFactory(@Autowire ScopeRegistry registry,
+ @Autowire WorkContext context,
+ @Autowire Store store,
+ @Monitor ScopeContainerMonitor monitor) {
registry.registerFactory(Scope.CONVERSATION, this);
+ this.context = context;
this.store = store;
+ this.monitor = monitor;
}
@Init(eager = true)
@@ -46,6 +57,6 @@
public ConversationalScopeContainer getInstance() throws ObjectCreationException {
- return new ConversationalScopeContainer(store, null);
+ return new ConversationalScopeContainer(store, context, monitor);
}
}
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=488173&r1=488172&r2=488173
==============================================================================
--- 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 Mon Dec 18 01:27:32 2006
@@ -29,6 +29,7 @@
import org.apache.tuscany.spi.component.TargetDestructionException;
import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.spi.component.WorkContext;
+import org.apache.tuscany.spi.component.ScopeContainerMonitor;
import org.apache.tuscany.spi.event.Event;
import org.apache.tuscany.spi.model.Scope;
@@ -44,12 +45,8 @@
private final Map<AtomicComponent, Map<Object, InstanceWrapper>> contexts;
private final Map<Object, List<InstanceWrapper>> destroyQueues;
- public HttpSessionScopeContainer() {
- this(null);
- }
-
- public HttpSessionScopeContainer(WorkContext workContext) {
- super("Session Scope", workContext);
+ public HttpSessionScopeContainer(WorkContext workContext, ScopeContainerMonitor monitor) {
+ super(workContext, monitor);
contexts = new ConcurrentHashMap<AtomicComponent, Map<Object, InstanceWrapper>>();
destroyQueues = new ConcurrentHashMap<Object, List<InstanceWrapper>>();
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeObjectFactory.java?view=diff&rev=488173&r1=488172&r2=488173
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeObjectFactory.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeObjectFactory.java Mon Dec 18 01:27:32 2006
@@ -18,12 +18,17 @@
*/
package org.apache.tuscany.core.component.scope;
+import org.osoa.sca.annotations.Init;
+
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.spi.annotation.Autowire;
+import org.apache.tuscany.spi.component.ScopeContainerMonitor;
import org.apache.tuscany.spi.component.ScopeRegistry;
+import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.model.Scope;
-import org.osoa.sca.annotations.Init;
+
+import org.apache.tuscany.api.annotation.Monitor;
/**
* Creates a new HTTP session scope context
@@ -31,9 +36,15 @@
* @version $$Rev$$ $$Date$$
*/
public class HttpSessionScopeObjectFactory implements ObjectFactory<HttpSessionScopeContainer> {
-
- public HttpSessionScopeObjectFactory(@Autowire ScopeRegistry registry) {
+ private WorkContext context;
+ private ScopeContainerMonitor monitor;
+
+ public HttpSessionScopeObjectFactory(@Autowire ScopeRegistry registry,
+ @Autowire WorkContext context,
+ @Monitor ScopeContainerMonitor monitor) {
registry.registerFactory(Scope.SESSION, this);
+ this.context = context;
+ this.monitor = monitor;
}
@Init(eager = true)
@@ -42,6 +53,6 @@
public HttpSessionScopeContainer getInstance() throws ObjectCreationException {
- return new HttpSessionScopeContainer();
+ return new HttpSessionScopeContainer(context, monitor);
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeContainer.java?view=diff&rev=488173&r1=488172&r2=488173
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeContainer.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeContainer.java Mon Dec 18 01:27:32 2006
@@ -28,10 +28,10 @@
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.component.AtomicComponent;
+import org.apache.tuscany.spi.component.ScopeContainerMonitor;
import org.apache.tuscany.spi.component.TargetDestructionException;
import org.apache.tuscany.spi.component.TargetInitializationException;
import org.apache.tuscany.spi.component.TargetResolutionException;
-import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.event.Event;
import org.apache.tuscany.spi.model.Scope;
@@ -44,21 +44,15 @@
* @version $Rev$ $Date$
*/
public class ModuleScopeContainer extends AbstractScopeContainer {
-
private static final InstanceWrapper EMPTY = new EmptyWrapper();
private static final ComponentInitComparator COMPARATOR = new ComponentInitComparator();
private final Map<AtomicComponent, InstanceWrapper> instanceWrappers;
-
// the queue of instanceWrappers to destroy, in the order that their instances were created
private final List<InstanceWrapper> destroyQueue;
- public ModuleScopeContainer() {
- this(null);
- }
-
- public ModuleScopeContainer(WorkContext workContext) {
- super("Module Scope", workContext);
+ public ModuleScopeContainer(ScopeContainerMonitor monitor) {
+ super(null, monitor);
instanceWrappers = new ConcurrentHashMap<AtomicComponent, InstanceWrapper>();
destroyQueue = new ArrayList<InstanceWrapper>();
}
@@ -72,6 +66,9 @@
if (event instanceof CompositeStart) {
try {
eagerInitComponents();
+ } catch (ObjectCreationException e) {
+ // JFM
+ e.printStackTrace();
} catch (TargetResolutionException e) {
// JFM FIXME
e.printStackTrace();
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactory.java?view=diff&rev=488173&r1=488172&r2=488173
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactory.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactory.java Mon Dec 18 01:27:32 2006
@@ -18,12 +18,16 @@
*/
package org.apache.tuscany.core.component.scope;
+import org.osoa.sca.annotations.Init;
+
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.ObjectFactory;
-import org.apache.tuscany.spi.model.Scope;
-import org.apache.tuscany.spi.component.ScopeRegistry;
import org.apache.tuscany.spi.annotation.Autowire;
-import org.osoa.sca.annotations.Init;
+import org.apache.tuscany.spi.component.ScopeContainerMonitor;
+import org.apache.tuscany.spi.component.ScopeRegistry;
+import org.apache.tuscany.spi.model.Scope;
+
+import org.apache.tuscany.api.annotation.Monitor;
/**
* Creates a new module scope context
@@ -31,9 +35,12 @@
* @version $$Rev$$ $$Date$$
*/
public class ModuleScopeObjectFactory implements ObjectFactory<ModuleScopeContainer> {
+ private ScopeContainerMonitor monitor;
- public ModuleScopeObjectFactory(@Autowire ScopeRegistry registry) {
+ public ModuleScopeObjectFactory(@Autowire ScopeRegistry registry,
+ @Monitor ScopeContainerMonitor monitor) {
registry.registerFactory(Scope.MODULE, this);
+ this.monitor = monitor;
}
@Init(eager = true)
@@ -41,6 +48,6 @@
}
public ModuleScopeContainer getInstance() throws ObjectCreationException {
- return new ModuleScopeContainer();
+ return new ModuleScopeContainer(monitor);
}
}
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=488173&r1=488172&r2=488173
==============================================================================
--- 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 Mon Dec 18 01:27:32 2006
@@ -28,6 +28,7 @@
import org.apache.tuscany.spi.component.TargetDestructionException;
import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.spi.component.WorkContext;
+import org.apache.tuscany.spi.component.ScopeContainerMonitor;
import org.apache.tuscany.spi.event.Event;
import org.apache.tuscany.spi.model.Scope;
@@ -40,16 +41,11 @@
* @version $Rev$ $Date$
*/
public class RequestScopeContainer extends AbstractScopeContainer {
-
private final Map<AtomicComponent, Map<Thread, InstanceWrapper>> contexts;
private final Map<Thread, List<InstanceWrapper>> destroyQueues;
- public RequestScopeContainer() {
- this(null);
- }
-
- public RequestScopeContainer(WorkContext workContext) {
- super("Request Scope", workContext);
+ public RequestScopeContainer(WorkContext workContext, ScopeContainerMonitor monitor) {
+ super(workContext, monitor);
contexts = new ConcurrentHashMap<AtomicComponent, Map<Thread, InstanceWrapper>>();
destroyQueues = new ConcurrentHashMap<Thread, List<InstanceWrapper>>();
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeObjectFactory.java?view=diff&rev=488173&r1=488172&r2=488173
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeObjectFactory.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeObjectFactory.java Mon Dec 18 01:27:32 2006
@@ -20,6 +20,11 @@
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.spi.annotation.Autowire;
+import org.apache.tuscany.spi.component.ScopeContainerMonitor;
+import org.apache.tuscany.spi.component.WorkContext;
+
+import org.apache.tuscany.api.annotation.Monitor;
/**
* Creates a new request scope context
@@ -27,8 +32,16 @@
* @version $$Rev$$ $$Date$$
*/
public class RequestScopeObjectFactory implements ObjectFactory<RequestScopeContainer> {
+ private WorkContext context;
+ private ScopeContainerMonitor monitor;
+
+
+ public RequestScopeObjectFactory(@Autowire WorkContext context, @Monitor ScopeContainerMonitor monitor) {
+ this.context = context;
+ this.monitor = monitor;
+ }
public RequestScopeContainer getInstance() throws ObjectCreationException {
- return new RequestScopeContainer();
+ return new RequestScopeContainer(context, monitor);
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ScopeRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ScopeRegistryImpl.java?view=diff&rev=488173&r1=488172&r2=488173
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ScopeRegistryImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ScopeRegistryImpl.java Mon Dec 18 01:27:32 2006
@@ -22,10 +22,8 @@
import java.util.concurrent.ConcurrentHashMap;
import org.apache.tuscany.spi.ObjectFactory;
-import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.component.ScopeRegistry;
-import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.model.Scope;
/**
@@ -34,35 +32,18 @@
* @version $Rev$ $Date$
*/
public class ScopeRegistryImpl implements ScopeRegistry {
-
private final Map<Scope, ScopeContainer> scopeCache =
new ConcurrentHashMap<Scope, ScopeContainer>();
private final Map<Scope, ObjectFactory<? extends ScopeContainer>> factoryCache =
new ConcurrentHashMap<Scope, ObjectFactory<? extends ScopeContainer>>();
- private WorkContext workContext;
-
- public ScopeRegistryImpl(WorkContext workContext) {
- assert workContext != null;
- this.workContext = workContext;
- }
-
- // TODO remove and replace with CDI
- public ScopeRegistryImpl() {
- }
-
- @Autowire
- public void setWorkContext(WorkContext workContext) {
- this.workContext = workContext;
- }
public ScopeContainer getScopeContainer(Scope scope) {
- assert Scope.MODULE != scope : "Cannot get MODULE scope from the registry";
+ assert Scope.MODULE != scope;
ScopeContainer container = scopeCache.get(scope);
if (container == null) {
ObjectFactory<? extends ScopeContainer> factory = factoryCache.get(scope);
if (factory != null) {
container = factory.getInstance();
- container.setWorkContext(workContext);
container.start();
scopeCache.put(scope, container);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeContainer.java?view=diff&rev=488173&r1=488172&r2=488173
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeContainer.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeContainer.java Mon Dec 18 01:27:32 2006
@@ -19,6 +19,7 @@
package org.apache.tuscany.core.component.scope;
import org.apache.tuscany.spi.component.AtomicComponent;
+import org.apache.tuscany.spi.component.ScopeContainerMonitor;
import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.event.Event;
@@ -31,12 +32,8 @@
*/
public class StatelessScopeContainer extends AbstractScopeContainer {
- public StatelessScopeContainer() {
- this(null);
- }
-
- public StatelessScopeContainer(WorkContext workContext) {
- super("Stateless scope", workContext);
+ public StatelessScopeContainer(WorkContext workContext, ScopeContainerMonitor monitor) {
+ super(workContext, monitor);
}
public Scope getScope() {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeObjectFactory.java?view=diff&rev=488173&r1=488172&r2=488173
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeObjectFactory.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeObjectFactory.java Mon Dec 18 01:27:32 2006
@@ -18,12 +18,17 @@
*/
package org.apache.tuscany.core.component.scope;
+import org.osoa.sca.annotations.Init;
+
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.ObjectFactory;
-import org.apache.tuscany.spi.model.Scope;
-import org.apache.tuscany.spi.component.ScopeRegistry;
import org.apache.tuscany.spi.annotation.Autowire;
-import org.osoa.sca.annotations.Init;
+import org.apache.tuscany.spi.component.ScopeContainerMonitor;
+import org.apache.tuscany.spi.component.ScopeRegistry;
+import org.apache.tuscany.spi.component.WorkContext;
+import org.apache.tuscany.spi.model.Scope;
+
+import org.apache.tuscany.api.annotation.Monitor;
/**
* Creates a new stateless scope context
@@ -31,9 +36,15 @@
* @version $$Rev$$ $$Date$$
*/
public class StatelessScopeObjectFactory implements ObjectFactory<StatelessScopeContainer> {
+ private WorkContext context;
+ private ScopeContainerMonitor monitor;
- public StatelessScopeObjectFactory(@Autowire ScopeRegistry registry) {
+ public StatelessScopeObjectFactory(@Autowire ScopeRegistry registry,
+ @Autowire WorkContext context,
+ @Monitor ScopeContainerMonitor monitor) {
registry.registerFactory(Scope.STATELESS, this);
+ this.context = context;
+ this.monitor = monitor;
}
@Init(eager = true)
@@ -41,6 +52,6 @@
}
public StatelessScopeContainer getInstance() throws ObjectCreationException {
- return new StatelessScopeContainer();
+ return new StatelessScopeContainer(context, monitor);
}
}
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=488173&r1=488172&r2=488173
==============================================================================
--- 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 Dec 18 01:27:32 2006
@@ -30,6 +30,7 @@
import org.apache.tuscany.spi.component.PrepareException;
import org.apache.tuscany.spi.component.SCAObject;
import org.apache.tuscany.spi.component.ScopeContainer;
+import org.apache.tuscany.spi.component.ScopeContainerMonitor;
import org.apache.tuscany.spi.deployer.Deployer;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.loader.Loader;
@@ -40,6 +41,7 @@
import org.apache.tuscany.spi.builder.BuilderInstantiationException;
import org.apache.tuscany.core.component.scope.ModuleScopeContainer;
+import org.apache.tuscany.api.annotation.Monitor;
/**
* Default implementation of Deployer.
@@ -50,6 +52,7 @@
private XMLInputFactory xmlFactory;
private Loader loader;
private Builder builder;
+ private ScopeContainerMonitor monitor;
public DeployerImpl(XMLInputFactory xmlFactory, Loader loader, Builder builder) {
this.xmlFactory = xmlFactory;
@@ -71,10 +74,15 @@
this.builder = builder;
}
+ @Monitor
+ public void setMonitor(ScopeContainerMonitor monitor) {
+ this.monitor = monitor;
+ }
+
public <I extends Implementation<?>> Component deploy(CompositeComponent parent,
ComponentDefinition<I> componentDefinition)
throws LoaderException, BuilderException, PrepareException {
- ScopeContainer moduleScope = new ModuleScopeContainer();
+ ScopeContainer moduleScope = new ModuleScopeContainer(monitor);
DeploymentContext deploymentContext = new RootDeploymentContext(null, xmlFactory, moduleScope, null);
try {
load(parent, componentDefinition, deploymentContext);
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=488173&r1=488172&r2=488173
==============================================================================
--- 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 Dec 18 01:27:32 2006
@@ -27,7 +27,6 @@
import org.apache.tuscany.spi.model.Scope;
import junit.framework.TestCase;
-import org.apache.tuscany.core.component.WorkContextImpl;
import org.easymock.EasyMock;
/**
@@ -35,14 +34,6 @@
*/
public class AbstractScopeContainerTestCase extends TestCase {
- public void testSetWorkContext() {
- TestContainer container = new TestContainer("foo");
- WorkContext ctx = new WorkContextImpl();
- container.setWorkContext(ctx);
- assertEquals(ctx, container.getWorkContext());
-
- }
-
public void testFireListener() {
TestContainer container = new TestContainer("foo");
RuntimeEventListener listener = EasyMock.createMock(RuntimeEventListener.class);
@@ -91,16 +82,10 @@
assertNotNull(container.toString());
}
- public void testGetName() {
- TestContainer container = new TestContainer("foo");
- assertEquals("foo", container.getName());
- }
-
-
private class TestContainer extends AbstractScopeContainer {
public TestContainer(String name) {
- super(name, null);
+ super(null, null);
}
protected InstanceWrapper getInstanceWrapper(AtomicComponent component, boolean create) {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicConversationalScopeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicConversationalScopeTestCase.java?view=diff&rev=488173&r1=488172&r2=488173
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicConversationalScopeTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicConversationalScopeTestCase.java Mon Dec 18 01:27:32 2006
@@ -51,7 +51,7 @@
monitor.stop(EasyMock.isA(String.class));
MemoryStore store = new MemoryStore(monitor);
WorkContext workContext = new WorkContextImpl();
- ConversationalScopeContainer scopeContext = new ConversationalScopeContainer(store, workContext);
+ ConversationalScopeContainer scopeContext = new ConversationalScopeContainer(store, workContext, null);
scopeContext.start();
SystemAtomicComponent atomicContext = createContext(scopeContext);
// start the request
@@ -75,7 +75,7 @@
monitor.stop(EasyMock.isA(String.class));
MemoryStore store = new MemoryStore(monitor);
WorkContext workContext = new WorkContextImpl();
- ConversationalScopeContainer scopeContext = new ConversationalScopeContainer(store, workContext);
+ ConversationalScopeContainer scopeContext = new ConversationalScopeContainer(store, workContext, null);
scopeContext.start();
SystemAtomicComponent atomicContext = createContext(scopeContext);
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=488173&r1=488172&r2=488173
==============================================================================
--- 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 Mon Dec 18 01:27:32 2006
@@ -44,7 +44,7 @@
public void testLifecycleManagement() throws Exception {
WorkContext workContext = new WorkContextImpl();
- HttpSessionScopeContainer scopeContext = new HttpSessionScopeContainer(workContext);
+ HttpSessionScopeContainer scopeContext = new HttpSessionScopeContainer(workContext, null);
scopeContext.start();
SystemAtomicComponent component = createComponent(scopeContext);
// start the request
@@ -64,7 +64,7 @@
public void testGetAssociatedInstance() throws Exception {
WorkContext workContext = new WorkContextImpl();
- HttpSessionScopeContainer scopeContext = new HttpSessionScopeContainer(workContext);
+ HttpSessionScopeContainer scopeContext = new HttpSessionScopeContainer(workContext, null);
scopeContext.start();
SystemAtomicComponent component = createComponent(scopeContext);
// start the request
@@ -76,7 +76,7 @@
public void testGetAssociatedInstanceNonExistent() throws Exception {
WorkContext workContext = new WorkContextImpl();
- HttpSessionScopeContainer scopeContext = new HttpSessionScopeContainer(workContext);
+ HttpSessionScopeContainer scopeContext = new HttpSessionScopeContainer(workContext, null);
scopeContext.start();
SystemAtomicComponent component = createComponent(scopeContext);
// start the request
@@ -92,7 +92,7 @@
public void testSessionIsolation() throws Exception {
WorkContext workContext = new WorkContextImpl();
- HttpSessionScopeContainer scopeContext = new HttpSessionScopeContainer(workContext);
+ HttpSessionScopeContainer scopeContext = new HttpSessionScopeContainer(workContext, null);
scopeContext.start();
SystemAtomicComponent component = createComponent(scopeContext);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicModuleScopeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicModuleScopeTestCase.java?view=diff&rev=488173&r1=488172&r2=488173
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicModuleScopeTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/BasicModuleScopeTestCase.java Mon Dec 18 01:27:32 2006
@@ -44,7 +44,7 @@
public void testLifecycleManagement() throws Exception {
WorkContext workContext = new WorkContextImpl();
- ModuleScopeContainer scopeContext = new ModuleScopeContainer(workContext);
+ ModuleScopeContainer scopeContext = new ModuleScopeContainer(null);
scopeContext.start();
SystemAtomicComponent component = createComponent(scopeContext);
// start the request
@@ -63,7 +63,7 @@
public void testGetAssociatedInstance() throws Exception {
WorkContext workContext = new WorkContextImpl();
- ModuleScopeContainer scopeContext = new ModuleScopeContainer(workContext);
+ ModuleScopeContainer scopeContext = new ModuleScopeContainer(null);
scopeContext.start();
SystemAtomicComponent component = createComponent(scopeContext);
// start the request
@@ -73,7 +73,7 @@
public void testGetAssociatedInstanceNonExistent() throws Exception {
WorkContext workContext = new WorkContextImpl();
- ModuleScopeContainer scopeContext = new ModuleScopeContainer(workContext);
+ ModuleScopeContainer scopeContext = new ModuleScopeContainer(null);
scopeContext.start();
SystemAtomicComponent component = createComponent(scopeContext);
// start the request
@@ -87,7 +87,7 @@
public void testModuleIsolation() throws Exception {
WorkContext workContext = new WorkContextImpl();
- ModuleScopeContainer scopeContext = new ModuleScopeContainer(workContext);
+ ModuleScopeContainer scopeContext = new ModuleScopeContainer(null);
scopeContext.start();
SystemAtomicComponent component = createComponent(scopeContext);
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=488173&r1=488172&r2=488173
==============================================================================
--- 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 Mon Dec 18 01:27:32 2006
@@ -40,7 +40,7 @@
private PojoObjectFactory<?> factory;
public void testLifecycleManagement() throws Exception {
- RequestScopeContainer scopeContext = new RequestScopeContainer(null);
+ RequestScopeContainer scopeContext = new RequestScopeContainer(null, null);
scopeContext.start();
SystemAtomicComponent component = createComponent(scopeContext);
// start the request
@@ -57,7 +57,7 @@
}
public void testGetAssociatedInstance() throws Exception {
- RequestScopeContainer scopeContext = new RequestScopeContainer(null);
+ RequestScopeContainer scopeContext = new RequestScopeContainer(null, null);
scopeContext.start();
SystemAtomicComponent component = createComponent(scopeContext);
// start the request
@@ -67,7 +67,7 @@
}
public void testGetAssociatedInstanceNonExistent() throws Exception {
- RequestScopeContainer scopeContext = new RequestScopeContainer(null);
+ RequestScopeContainer scopeContext = new RequestScopeContainer(null, null);
scopeContext.start();
SystemAtomicComponent component = createComponent(scopeContext);
// start the request
@@ -81,7 +81,7 @@
}
public void testRequestIsolation() throws Exception {
- RequestScopeContainer scopeContext = new RequestScopeContainer(null);
+ RequestScopeContainer scopeContext = new RequestScopeContainer(null, null);
scopeContext.start();
SystemAtomicComponent component = createComponent(scopeContext);
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=488173&r1=488172&r2=488173
==============================================================================
--- 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 Mon Dec 18 01:27:32 2006
@@ -46,7 +46,7 @@
*/
public void testInstanceManagement() throws Exception {
WorkContext ctx = new WorkContextImpl();
- StatelessScopeContainer scope = new StatelessScopeContainer(ctx);
+ StatelessScopeContainer scope = new StatelessScopeContainer(ctx, null);
scope.start();
SystemAtomicComponent component1 = createComponent(scope);
scope.register(component1);
@@ -62,7 +62,7 @@
public void testGetAssociatedInstance() throws Exception {
WorkContext ctx = new WorkContextImpl();
- StatelessScopeContainer scope = new StatelessScopeContainer(ctx);
+ StatelessScopeContainer scope = new StatelessScopeContainer(ctx, null);
scope.start();
SystemAtomicComponent component1 = createComponent(scope);
scope.register(component1);
@@ -78,7 +78,7 @@
public void testRegisterContextAfterRequest() throws Exception {
WorkContext ctx = new WorkContextImpl();
- StatelessScopeContainer scope = new StatelessScopeContainer(ctx);
+ StatelessScopeContainer scope = new StatelessScopeContainer(ctx, null);
scope.start();
SystemAtomicComponent component1 = createComponent(scope);
@@ -98,7 +98,7 @@
*/
public void testSetNullComponents() throws Exception {
WorkContext ctx = new WorkContextImpl();
- StatelessScopeContainer scope = new StatelessScopeContainer(ctx);
+ StatelessScopeContainer scope = new StatelessScopeContainer(ctx, null);
scope.start();
scope.stop();
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerMaxAgeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerMaxAgeTestCase.java?view=diff&rev=488173&r1=488172&r2=488173
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerMaxAgeTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerMaxAgeTestCase.java Mon Dec 18 01:27:32 2006
@@ -57,7 +57,7 @@
store = EasyMock.createMock(Store.class);
EasyMock.expect(store.readRecord(EasyMock.isA(SCAObject.class), EasyMock.isA(String.class))).andReturn(foo);
EasyMock.replay(store);
- container = new ConversationalScopeContainer(store, context);
+ container = new ConversationalScopeContainer(store, context, null);
container.start();
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerMaxIdleTimeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerMaxIdleTimeTestCase.java?view=diff&rev=488173&r1=488172&r2=488173
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerMaxIdleTimeTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerMaxIdleTimeTestCase.java Mon Dec 18 01:27:32 2006
@@ -60,7 +60,7 @@
EasyMock.eq(foo),
EasyMock.anyLong());
EasyMock.replay(store);
- container = new ConversationalScopeContainer(store, context);
+ container = new ConversationalScopeContainer(store, context, null);
container.start();
}
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=488173&r1=488172&r2=488173
==============================================================================
--- 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 Mon Dec 18 01:27:32 2006
@@ -163,7 +163,7 @@
StoreMonitor mock = EasyMock.createNiceMock(StoreMonitor.class);
EasyMock.replay(mock);
Store store = new MemoryStore(mock);
- container = new ConversationalScopeContainer(store, context);
+ container = new ConversationalScopeContainer(store, context, null);
container.start();
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeInstanceLifecycleTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeInstanceLifecycleTestCase.java?view=diff&rev=488173&r1=488172&r2=488173
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeInstanceLifecycleTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeInstanceLifecycleTestCase.java Mon Dec 18 01:27:32 2006
@@ -52,7 +52,7 @@
monitor.stop(EasyMock.isA(String.class));
MemoryStore store = new MemoryStore(monitor);
WorkContext ctx = new WorkContextImpl();
- ConversationalScopeContainer scope = new ConversationalScopeContainer(store, ctx);
+ ConversationalScopeContainer scope = new ConversationalScopeContainer(store, ctx, null);
scope.start();
Foo comp = new Foo();
@@ -82,7 +82,7 @@
monitor.stop(EasyMock.isA(String.class));
MemoryStore store = new MemoryStore(monitor);
WorkContext ctx = new WorkContextImpl();
- ConversationalScopeContainer scope = new ConversationalScopeContainer(store, ctx);
+ ConversationalScopeContainer scope = new ConversationalScopeContainer(store, ctx, null);
scope.start();
SystemAtomicComponent oneComponent = createComponent(false);
@@ -124,7 +124,7 @@
monitor.stop(EasyMock.isA(String.class));
MemoryStore store = new MemoryStore(monitor);
WorkContext ctx = new WorkContextImpl();
- ConversationalScopeContainer scope = new ConversationalScopeContainer(store, ctx);
+ ConversationalScopeContainer scope = new ConversationalScopeContainer(store, ctx, null);
scope.start();
SystemAtomicComponent oneComponent = createComponent(true);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeRestartTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeRestartTestCase.java?view=diff&rev=488173&r1=488172&r2=488173
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeRestartTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeRestartTestCase.java Mon Dec 18 01:27:32 2006
@@ -49,7 +49,7 @@
monitor.stop(EasyMock.isA(String.class));
MemoryStore store = new MemoryStore(monitor);
WorkContext ctx = new WorkContextImpl();
- ConversationalScopeContainer scope = new ConversationalScopeContainer(store, ctx);
+ ConversationalScopeContainer scope = new ConversationalScopeContainer(store, ctx, null);
scope.start();
MethodEventInvoker<Object> initInvoker = new MethodEventInvoker<Object>(
ConversationalScopeRestartTestCase.InitDestroyOnce.class.getMethod("init"));
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/DependencyLifecycleTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/DependencyLifecycleTestCase.java?view=diff&rev=488173&r1=488172&r2=488173
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/DependencyLifecycleTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/DependencyLifecycleTestCase.java Mon Dec 18 01:27:32 2006
@@ -45,7 +45,7 @@
public void testInitDestroyOrderModuleScope() throws Exception {
WorkContext ctx = new WorkContextImpl();
- ModuleScopeContainer scopeCtx = new ModuleScopeContainer(ctx);
+ ModuleScopeContainer scopeCtx = new ModuleScopeContainer(null);
scopeCtx.start();
Map<String, AtomicComponent> contexts = MockFactory.createWiredComponents("source",
OrderedDependentPojoImpl.class,
@@ -73,7 +73,7 @@
public void testInitDestroyOrderAfterStartModuleScope() throws Exception {
WorkContext ctx = new WorkContextImpl();
- ModuleScopeContainer scopeCtx = new ModuleScopeContainer(ctx);
+ ModuleScopeContainer scopeCtx = new ModuleScopeContainer(null);
scopeCtx.start();
Map<String, AtomicComponent> contexts = MockFactory.createWiredComponents("source",
OrderedDependentPojoImpl.class,
@@ -99,7 +99,7 @@
public void testInitDestroyOrderSessionScope() throws Exception {
WorkContext ctx = new WorkContextImpl();
- HttpSessionScopeContainer scopeCtx = new HttpSessionScopeContainer(ctx);
+ HttpSessionScopeContainer scopeCtx = new HttpSessionScopeContainer(ctx, null);
scopeCtx.start();
Object session = new Object();
Map<String, AtomicComponent> contexts = MockFactory.createWiredComponents("source",
@@ -124,7 +124,7 @@
public void testInitDestroyOrderAfterStartSessionScope() throws Exception {
WorkContext ctx = new WorkContextImpl();
- HttpSessionScopeContainer scopeCtx = new HttpSessionScopeContainer(ctx);
+ HttpSessionScopeContainer scopeCtx = new HttpSessionScopeContainer(ctx, null);
scopeCtx.start();
Object session = new Object();
Map<String, AtomicComponent> contexts = MockFactory.createWiredComponents("source",
@@ -148,7 +148,7 @@
public void testInitDestroyOrderRequestScope() throws Exception {
WorkContext ctx = new WorkContextImpl();
- RequestScopeContainer scopeCtx = new RequestScopeContainer(ctx);
+ RequestScopeContainer scopeCtx = new RequestScopeContainer(ctx, null);
scopeCtx.start();
scopeCtx.onEvent(new RequestStart(this));
Map<String, AtomicComponent> contexts = MockFactory.createWiredComponents("source",
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeInstanceLifecycleTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeInstanceLifecycleTestCase.java?view=diff&rev=488173&r1=488172&r2=488173
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeInstanceLifecycleTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeInstanceLifecycleTestCase.java Mon Dec 18 01:27:32 2006
@@ -42,7 +42,7 @@
public void testInitDestroy() throws Exception {
WorkContext ctx = new WorkContextImpl();
- HttpSessionScopeContainer scope = new HttpSessionScopeContainer(ctx);
+ HttpSessionScopeContainer scope = new HttpSessionScopeContainer(ctx, null);
scope.start();
Foo comp = new Foo();
SystemAtomicComponent component = EasyMock.createMock(SystemAtomicComponent.class);
@@ -66,7 +66,7 @@
public void testDestroyOrder() throws Exception {
WorkContext ctx = new WorkContextImpl();
- HttpSessionScopeContainer scope = new HttpSessionScopeContainer(ctx);
+ HttpSessionScopeContainer scope = new HttpSessionScopeContainer(ctx, null);
scope.start();
SystemAtomicComponent oneComponent = createComponent(false);
@@ -104,7 +104,7 @@
public void testEagerInitDestroyOrder() throws Exception {
WorkContext ctx = new WorkContextImpl();
- HttpSessionScopeContainer scope = new HttpSessionScopeContainer(ctx);
+ HttpSessionScopeContainer scope = new HttpSessionScopeContainer(ctx, null);
scope.start();
SystemAtomicComponent oneComponent = createComponent(true);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeRestartTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeRestartTestCase.java?view=diff&rev=488173&r1=488172&r2=488173
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeRestartTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeRestartTestCase.java Mon Dec 18 01:27:32 2006
@@ -43,7 +43,7 @@
public void testRestart() throws Exception {
WorkContext ctx = new WorkContextImpl();
- HttpSessionScopeContainer scope = new HttpSessionScopeContainer(ctx);
+ HttpSessionScopeContainer scope = new HttpSessionScopeContainer(ctx, null);
scope.start();
MethodEventInvoker<Object> initInvoker = new MethodEventInvoker<Object>(
HttpSessionScopeRestartTestCase.InitDestroyOnce.class.getMethod("init"));
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeInstanceLifecycleTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeInstanceLifecycleTestCase.java?view=diff&rev=488173&r1=488172&r2=488173
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeInstanceLifecycleTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeInstanceLifecycleTestCase.java Mon Dec 18 01:27:32 2006
@@ -46,7 +46,7 @@
*/
public void testInitDestroy() throws Exception {
WorkContext ctx = new WorkContextImpl();
- ModuleScopeContainer scope = new ModuleScopeContainer(ctx);
+ ModuleScopeContainer scope = new ModuleScopeContainer(null);
scope.start();
Foo comp = new Foo();
SystemAtomicComponent component = EasyMock.createMock(SystemAtomicComponent.class);
@@ -71,7 +71,7 @@
*/
public void testEagerInitDestroy() throws Exception {
WorkContext ctx = new WorkContextImpl();
- ModuleScopeContainer scope = new ModuleScopeContainer(ctx);
+ ModuleScopeContainer scope = new ModuleScopeContainer(null);
scope.start();
Foo comp = new Foo();
SystemAtomicComponent initDestroyComponent = EasyMock.createMock(SystemAtomicComponent.class);
@@ -91,7 +91,7 @@
public void testDestroyOrder() throws Exception {
WorkContext ctx = new WorkContextImpl();
- ModuleScopeContainer scope = new ModuleScopeContainer(ctx);
+ ModuleScopeContainer scope = new ModuleScopeContainer(null);
scope.start();
SystemAtomicComponent oneComponent = createComponent(0);
@@ -128,7 +128,7 @@
public void testEagerInitDestroyOrder() throws Exception {
WorkContext ctx = new WorkContextImpl();
- ModuleScopeContainer scope = new ModuleScopeContainer(ctx);
+ ModuleScopeContainer scope = new ModuleScopeContainer(null);
scope.start();
SystemAtomicComponent oneComponent = createComponent(1);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactoryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactoryTestCase.java?view=diff&rev=488173&r1=488172&r2=488173
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactoryTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactoryTestCase.java Mon Dec 18 01:27:32 2006
@@ -33,6 +33,6 @@
ScopeRegistry registry = EasyMock.createMock(ScopeRegistry.class);
registry.registerFactory(EasyMock.isA(Scope.class), EasyMock.isA(ModuleScopeObjectFactory.class));
- assertNotNull(new ModuleScopeObjectFactory(registry).getInstance());
+ assertNotNull(new ModuleScopeObjectFactory(registry, null).getInstance());
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeRestartTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeRestartTestCase.java?view=diff&rev=488173&r1=488172&r2=488173
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeRestartTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeRestartTestCase.java Mon Dec 18 01:27:32 2006
@@ -41,7 +41,7 @@
public void testRestart() throws Exception {
WorkContext ctx = new WorkContextImpl();
- ModuleScopeContainer scope = new ModuleScopeContainer(ctx);
+ ModuleScopeContainer scope = new ModuleScopeContainer(null);
scope.start();
MethodEventInvoker<Object> initInvoker =
new MethodEventInvoker<Object>(InitDestroyOnce.class.getMethod("init"));
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeInstanceLifecycleTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeInstanceLifecycleTestCase.java?view=diff&rev=488173&r1=488172&r2=488173
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeInstanceLifecycleTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeInstanceLifecycleTestCase.java Mon Dec 18 01:27:32 2006
@@ -40,7 +40,7 @@
public void testInitDestroy() throws Exception {
WorkContext ctx = new WorkContextImpl();
- RequestScopeContainer scope = new RequestScopeContainer(ctx);
+ RequestScopeContainer scope = new RequestScopeContainer(ctx, null);
scope.start();
Foo comp = new Foo();
SystemAtomicComponent component = EasyMock.createMock(SystemAtomicComponent.class);
@@ -61,7 +61,7 @@
public void testDestroyOrder() throws Exception {
WorkContext ctx = new WorkContextImpl();
- RequestScopeContainer scope = new RequestScopeContainer(ctx);
+ RequestScopeContainer scope = new RequestScopeContainer(ctx, null);
scope.start();
SystemAtomicComponent oneComponent = createComponent(false);
@@ -97,7 +97,7 @@
public void testEagerInitDestroyOrder() throws Exception {
WorkContext ctx = new WorkContextImpl();
- RequestScopeContainer scope = new RequestScopeContainer(ctx);
+ RequestScopeContainer scope = new RequestScopeContainer(ctx, null);
scope.start();
SystemAtomicComponent oneComponent = createComponent(true);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeRestartTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeRestartTestCase.java?view=diff&rev=488173&r1=488172&r2=488173
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeRestartTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeRestartTestCase.java Mon Dec 18 01:27:32 2006
@@ -40,7 +40,7 @@
public void testRestart() throws Exception {
WorkContext ctx = new WorkContextImpl();
- RequestScopeContainer scope = new RequestScopeContainer(ctx);
+ RequestScopeContainer scope = new RequestScopeContainer(ctx, null);
scope.start();
MethodEventInvoker<Object> initInvoker =
new MethodEventInvoker<Object>(InitDestroyOnce.class.getMethod("init"));
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ScopeRegistryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ScopeRegistryTestCase.java?view=diff&rev=488173&r1=488172&r2=488173
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ScopeRegistryTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ScopeRegistryTestCase.java Mon Dec 18 01:27:32 2006
@@ -33,11 +33,13 @@
*/
public class ScopeRegistryTestCase extends TestCase {
public void testScopeContextCreation() throws Exception {
- WorkContext workContext = new WorkContextImpl();
- ScopeRegistry scopeRegistry = new ScopeRegistryImpl(workContext);
- scopeRegistry.registerFactory(Scope.REQUEST, new RequestScopeObjectFactory());
- scopeRegistry.registerFactory(Scope.SESSION, new HttpSessionScopeObjectFactory(scopeRegistry));
- scopeRegistry.registerFactory(Scope.CONVERSATION, new ConversationalScopeObjectFactory(scopeRegistry, null));
+ WorkContext context = new WorkContextImpl();
+ ScopeRegistry scopeRegistry = new ScopeRegistryImpl();
+ scopeRegistry.registerFactory(Scope.REQUEST, new RequestScopeObjectFactory(context, null));
+ HttpSessionScopeObjectFactory sessionFactory = new HttpSessionScopeObjectFactory(scopeRegistry, context, null);
+ scopeRegistry.registerFactory(Scope.SESSION, sessionFactory);
+ scopeRegistry.registerFactory(Scope.CONVERSATION,
+ new ConversationalScopeObjectFactory(scopeRegistry, context, null, null));
ScopeContainer request = scopeRegistry.getScopeContainer(Scope.REQUEST);
assertTrue(request instanceof RequestScopeContainer);
assertSame(request, scopeRegistry.getScopeContainer(Scope.REQUEST));
@@ -52,13 +54,14 @@
}
public void testDeregisterFactory() throws Exception {
- WorkContext workContext = new WorkContextImpl();
- ScopeRegistry scopeRegistry = new ScopeRegistryImpl(workContext);
- RequestScopeObjectFactory factory = new RequestScopeObjectFactory();
+ WorkContext context = new WorkContextImpl();
+ ScopeRegistry scopeRegistry = new ScopeRegistryImpl();
+ RequestScopeObjectFactory factory = new RequestScopeObjectFactory(context, null);
scopeRegistry.registerFactory(Scope.REQUEST, factory);
scopeRegistry.deregisterFactory(Scope.REQUEST);
assertNull(scopeRegistry.getScopeContainer(Scope.REQUEST));
- ConversationalScopeObjectFactory convFactory = new ConversationalScopeObjectFactory(scopeRegistry, null);
+ ConversationalScopeObjectFactory convFactory =
+ new ConversationalScopeObjectFactory(scopeRegistry, context, null, null);
scopeRegistry.registerFactory(Scope.CONVERSATION, convFactory);
scopeRegistry.deregisterFactory(Scope.CONVERSATION);
assertNull(scopeRegistry.getScopeContainer(Scope.CONVERSATION));
@@ -66,7 +69,7 @@
public void testScopeNotRegistered() throws Exception {
WorkContext workContext = new WorkContextImpl();
- ScopeRegistry scopeRegistry = new ScopeRegistryImpl(workContext);
+ ScopeRegistry scopeRegistry = new ScopeRegistryImpl();
assertNull(scopeRegistry.getScopeContainer(Scope.REQUEST));
assertNull(scopeRegistry.getScopeContainer(Scope.SESSION));
assertNull(scopeRegistry.getScopeContainer(Scope.CONVERSATION));
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/StatelessScopeContainerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/StatelessScopeContainerTestCase.java?view=diff&rev=488173&r1=488172&r2=488173
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/StatelessScopeContainerTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/StatelessScopeContainerTestCase.java Mon Dec 18 01:27:32 2006
@@ -26,7 +26,7 @@
public class StatelessScopeContainerTestCase extends TestCase {
public void testBadStopWithoutStart() throws Exception {
- StatelessScopeContainer container = new StatelessScopeContainer();
+ StatelessScopeContainer container = new StatelessScopeContainer(null, null);
try {
container.stop();
fail();
@@ -36,7 +36,7 @@
}
public void testBadDoubleStart() throws Exception {
- StatelessScopeContainer container = new StatelessScopeContainer();
+ StatelessScopeContainer container = new StatelessScopeContainer(null, null);
try {
container.start();
container.start();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/StatelessScopeObjectFactoryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/StatelessScopeObjectFactoryTestCase.java?view=diff&rev=488173&r1=488172&r2=488173
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/StatelessScopeObjectFactoryTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/StatelessScopeObjectFactoryTestCase.java Mon Dec 18 01:27:32 2006
@@ -32,6 +32,6 @@
public void testCreation() {
ScopeRegistry registry = EasyMock.createMock(ScopeRegistry.class);
registry.registerFactory(EasyMock.isA(Scope.class), EasyMock.isA(StatelessScopeObjectFactory.class));
- assertNotNull(new StatelessScopeObjectFactory(registry).getInstance());
+ assertNotNull(new StatelessScopeObjectFactory(registry, null, null).getInstance());
}
}
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=488173&r1=488172&r2=488173
==============================================================================
--- 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 Dec 18 01:27:32 2006
@@ -356,7 +356,7 @@
protected void setUp() throws Exception {
super.setUp();
wireService = new JDKWireService();
- container = new ModuleScopeContainer();
+ container = new ModuleScopeContainer(null);
container.start();
context = createMock(DeploymentContext.class);
context.getModuleScope();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/OutboundWireToJavaTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/OutboundWireToJavaTestCase.java?view=diff&rev=488173&r1=488172&r2=488173
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/OutboundWireToJavaTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/OutboundWireToJavaTestCase.java Mon Dec 18 01:27:32 2006
@@ -76,7 +76,7 @@
private WireService wireService = new JDKWireService(new WorkContextImpl(), null);
public void testToStatelessScope() throws Exception {
- StatelessScopeContainer scope = new StatelessScopeContainer(workContext);
+ StatelessScopeContainer scope = new StatelessScopeContainer(workContext, null);
scope.start();
final OutboundWire wire = getWire(scope);
Target service = (Target) wireService.createProxy(wire);
@@ -87,7 +87,7 @@
}
public void testToRequestScope() throws Exception {
- final RequestScopeContainer scope = new RequestScopeContainer(workContext);
+ final RequestScopeContainer scope = new RequestScopeContainer(workContext, null);
scope.start();
scope.onEvent(new RequestStart(this));
@@ -120,7 +120,7 @@
}
public void testToSessionScope() throws Exception {
- HttpSessionScopeContainer scope = new HttpSessionScopeContainer(workContext);
+ HttpSessionScopeContainer scope = new HttpSessionScopeContainer(workContext, null);
scope.start();
Object session1 = new Object();
workContext.setIdentifier(Scope.SESSION, session1);
@@ -161,7 +161,7 @@
}
public void testToModuleScope() throws Exception {
- ModuleScopeContainer scope = new ModuleScopeContainer(workContext);
+ ModuleScopeContainer scope = new ModuleScopeContainer(null);
scope.start();
scope.onEvent(new CompositeStart(this, null));
final OutboundWire wire = getWire(scope);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderTestCase.java?view=diff&rev=488173&r1=488172&r2=488173
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderTestCase.java Mon Dec 18 01:27:32 2006
@@ -233,7 +233,7 @@
protected void setUp() throws Exception {
super.setUp();
parent = EasyMock.createNiceMock(CompositeComponent.class);
- container = new ModuleScopeContainer();
+ container = new ModuleScopeContainer(null);
container.start();
deploymentContext = EasyMock.createMock(DeploymentContext.class);
EasyMock.expect(deploymentContext.getModuleScope()).andReturn(container).atLeastOnce();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/AbstractConversationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/AbstractConversationTestCase.java?view=diff&rev=488173&r1=488172&r2=488173
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/AbstractConversationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/AbstractConversationTestCase.java Mon Dec 18 01:27:32 2006
@@ -50,7 +50,7 @@
WirePostProcessorRegistry processorRegistry = new WirePostProcessorRegistryImpl();
connector = new ConnectorImpl(null, processorRegistry, null, workContext);
store = new MemoryStore(EasyMock.createNiceMock(StoreMonitor.class));
- container = new ConversationalScopeContainer(store, workContext);
+ container = new ConversationalScopeContainer(store, workContext, null);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderWireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderWireTestCase.java?view=diff&rev=488173&r1=488172&r2=488173
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderWireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderWireTestCase.java Mon Dec 18 01:27:32 2006
@@ -58,7 +58,7 @@
*/
public void testAtomicWireBuild() throws Exception {
WorkContext work = new WorkContextImpl();
- ScopeContainer scope = new ModuleScopeContainer(work);
+ ScopeContainer scope = new ModuleScopeContainer(null);
scope.start();
Connector connector = new ConnectorImpl();
@@ -93,7 +93,7 @@
*/
public void testAtomicToReferenceWireBuild() throws Exception {
WorkContext work = new WorkContextImpl();
- ScopeContainer scope = new ModuleScopeContainer(work);
+ ScopeContainer scope = new ModuleScopeContainer(null);
scope.start();
Connector connector = new ConnectorImpl();
@@ -138,7 +138,7 @@
*/
public void testServiceToAtomicWireBuild() throws Exception {
WorkContext work = new WorkContextImpl();
- ScopeContainer scope = new ModuleScopeContainer(work);
+ ScopeContainer scope = new ModuleScopeContainer(null);
scope.start();
ConnectorImpl connector = new ConnectorImpl();
@@ -174,7 +174,7 @@
protected void setUp() throws Exception {
super.setUp();
- ModuleScopeContainer moduleScope = new ModuleScopeContainer();
+ ModuleScopeContainer moduleScope = new ModuleScopeContainer(null);
moduleScope.start();
deploymentContext = new RootDeploymentContext(null, null, moduleScope, null);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org