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/18 06:17:55 UTC
svn commit: r519559 - in /incubator/tuscany/java/sca/kernel/core/src:
main/java/org/apache/tuscany/core/component/scope/
test/java/org/apache/tuscany/core/component/scope/
Author: jboynes
Date: Sat Mar 17 22:17:54 2007
New Revision: 519559
URL: http://svn.apache.org/viewvc?view=rev&rev=519559
Log:
remove work context instance variable from composite and statless scope containers
push down into HttpSession and Conversational implementations
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContainer.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainer.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeContainer.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeContainer.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeObjectFactory.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/RequestScopeRestartTestCase.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=519559&r1=519558&r2=519559
==============================================================================
--- 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 Sat Mar 17 22:17:54 2007
@@ -42,7 +42,6 @@
import org.apache.tuscany.spi.component.ScopeRegistry;
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.event.Event;
import org.apache.tuscany.spi.model.Scope;
@@ -78,16 +77,6 @@
protected final Map<KEY, List<InstanceWrapper<?>>> destroyQueues =
new ConcurrentHashMap<KEY, List<InstanceWrapper<?>>>();
-
- protected WorkContext workContext;
-
- @Deprecated
- public AbstractScopeContainer(Scope scope, WorkContext workContext, ScopeContainerMonitor monitor) {
- this.scope = scope;
- this.workContext = workContext;
- this.monitor = monitor;
- }
-
public AbstractScopeContainer(Scope scope, ScopeContainerMonitor monitor) {
this.scope = scope;
this.monitor = monitor;
@@ -217,10 +206,6 @@
public <T> void remove(AtomicComponent<T> component) throws PersistenceException {
throw new UnsupportedOperationException("Scope does not support persistence");
- }
-
- protected WorkContext getWorkContext() {
- return workContext;
}
/**
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=519559&r1=519558&r2=519559
==============================================================================
--- 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 Sat Mar 17 22:17:54 2007
@@ -40,10 +40,12 @@
* @version $Rev: 452655 $ $Date: 2006-10-03 18:09:02 -0400 (Tue, 03 Oct 2006) $
*/
public class ConversationalScopeContainer extends AbstractScopeContainer implements ScopeContainer {
- private Store nonDurableStore;
+ private final WorkContext workContext;
+ private final Store nonDurableStore;
public ConversationalScopeContainer(Store store, WorkContext workContext, final ScopeContainerMonitor monitor) {
- super(Scope.CONVERSATION, workContext, monitor);
+ super(Scope.CONVERSATION, monitor);
+ this.workContext = workContext;
this.nonDurableStore = store;
if (store != null) {
store.addListener(new ExpirationListener(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=519559&r1=519558&r2=519559
==============================================================================
--- 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 Sat Mar 17 22:17:54 2007
@@ -41,11 +41,13 @@
* @version $Rev$ $Date$
*/
public class HttpSessionScopeContainer extends AbstractScopeContainer {
+ private final WorkContext workContext;
private final Map<AtomicComponent, Map<Object, InstanceWrapper>> contexts;
private final Map<Object, List<InstanceWrapper>> destroyQueues;
public HttpSessionScopeContainer(WorkContext workContext, ScopeContainerMonitor monitor) {
- super(Scope.SESSION, workContext, monitor);
+ super(Scope.SESSION, monitor);
+ this.workContext = workContext;
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/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=519559&r1=519558&r2=519559
==============================================================================
--- 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 Sat Mar 17 22:17:54 2007
@@ -28,7 +28,6 @@
import org.apache.tuscany.spi.component.ScopeContainerMonitor;
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.InstanceWrapper;
import org.apache.tuscany.spi.event.Event;
import org.apache.tuscany.spi.model.Scope;
@@ -44,8 +43,8 @@
private final Map<AtomicComponent, Map<Thread, InstanceWrapper>> contexts;
private final Map<Thread, List<InstanceWrapper>> destroyQueues;
- public RequestScopeContainer(WorkContext workContext, ScopeContainerMonitor monitor) {
- super(Scope.REQUEST, workContext, monitor);
+ public RequestScopeContainer(ScopeContainerMonitor monitor) {
+ super(Scope.REQUEST, 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=519559&r1=519558&r2=519559
==============================================================================
--- 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 Sat Mar 17 22:17:54 2007
@@ -43,6 +43,6 @@
}
public RequestScopeContainer getInstance() throws ObjectCreationException {
- return new RequestScopeContainer(context, monitor);
+ return new RequestScopeContainer(monitor);
}
}
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=519559&r1=519558&r2=519559
==============================================================================
--- 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 Sat Mar 17 22:17:54 2007
@@ -151,7 +151,7 @@
component = EasyMock.createStrictMock(AtomicComponent.class);
wrapper = EasyMock.createStrictMock(InstanceWrapper.class);
monitor = EasyMock.createStrictMock(ScopeContainerMonitor.class);
- scopeContainer = new RequestScopeContainer(null, monitor);
+ scopeContainer = new RequestScopeContainer(monitor);
scopeContainer.start();
component.addListener(scopeContainer);
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=519559&r1=519558&r2=519559
==============================================================================
--- 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 Sat Mar 17 22:17:54 2007
@@ -41,7 +41,7 @@
public void testRestart() throws Exception {
WorkContext ctx = new WorkContextImpl();
- RequestScopeContainer scope = new RequestScopeContainer(ctx, null);
+ RequestScopeContainer scope = new RequestScopeContainer(null);
scope.start();
MethodEventInvoker<Object> initInvoker =
new MethodEventInvoker<Object>(InitDestroyOnce.class.getMethod("init"));
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org