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/14 06:01:23 UTC
svn commit: r518016 -
/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/
Author: jboynes
Date: Tue Mar 13 22:01:22 2007
New Revision: 518016
URL: http://svn.apache.org/viewvc?view=rev&rev=518016
Log:
refactor scope as a instance field
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContainer.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeContainer.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainer.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeContainer.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeContainer.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeContainer.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=518016&r1=518015&r2=518016
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContainer.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContainer.java Tue Mar 13 22:01:22 2007
@@ -20,6 +20,7 @@
import org.apache.tuscany.spi.AbstractLifecycle;
+import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.InstanceWrapper;
import org.apache.tuscany.spi.component.PersistenceException;
@@ -37,12 +38,19 @@
*/
public abstract class AbstractScopeContainer<GROUP, KEY> extends AbstractLifecycle
implements ScopeContainer<GROUP, KEY> {
+ private final Scope scope;
+
protected WorkContext workContext;
protected ScopeContainerMonitor monitor;
- public AbstractScopeContainer(WorkContext workContext, ScopeContainerMonitor monitor) {
+ public AbstractScopeContainer(Scope scope, WorkContext workContext, ScopeContainerMonitor monitor) {
+ this.scope = scope;
this.workContext = workContext;
this.monitor = monitor;
+ }
+
+ public Scope getScope() {
+ return scope;
}
public void register(GROUP groupId, AtomicComponent component) {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeContainer.java?view=diff&rev=518016&r1=518015&r2=518016
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeContainer.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeContainer.java Tue Mar 13 22:01:22 2007
@@ -53,13 +53,9 @@
private final List<InstanceWrapper> destroyQueue;
public CompositeScopeContainer(ScopeContainerMonitor monitor) {
- super(null, monitor);
+ super(Scope.COMPOSITE, null, monitor);
instanceWrappers = new ConcurrentHashMap<AtomicComponent, InstanceWrapper>();
destroyQueue = new ArrayList<InstanceWrapper>();
- }
-
- public Scope getScope() {
- return Scope.COMPOSITE;
}
public void onEvent(Event event) {
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=518016&r1=518015&r2=518016
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainer.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainer.java Tue Mar 13 22:01:22 2007
@@ -43,15 +43,11 @@
private Store nonDurableStore;
public ConversationalScopeContainer(Store store, WorkContext workContext, final ScopeContainerMonitor monitor) {
- super(workContext, monitor);
+ super(Scope.CONVERSATION, workContext, monitor);
this.nonDurableStore = store;
if (store != null) {
store.addListener(new ExpirationListener(monitor));
}
- }
-
- public Scope getScope() {
- return Scope.CONVERSATION;
}
public void onEvent(Event event) {
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=518016&r1=518015&r2=518016
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeContainer.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeContainer.java Tue Mar 13 22:01:22 2007
@@ -45,13 +45,9 @@
private final Map<Object, List<InstanceWrapper>> destroyQueues;
public HttpSessionScopeContainer(WorkContext workContext, ScopeContainerMonitor monitor) {
- super(workContext, monitor);
+ super(Scope.SESSION, workContext, monitor);
contexts = new ConcurrentHashMap<AtomicComponent, Map<Object, InstanceWrapper>>();
destroyQueues = new ConcurrentHashMap<Object, List<InstanceWrapper>>();
- }
-
- public Scope getScope() {
- return Scope.SESSION;
}
public void onEvent(Event event) {
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=518016&r1=518015&r2=518016
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeContainer.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeContainer.java Tue Mar 13 22:01:22 2007
@@ -45,13 +45,9 @@
private final Map<Thread, List<InstanceWrapper>> destroyQueues;
public RequestScopeContainer(WorkContext workContext, ScopeContainerMonitor monitor) {
- super(workContext, monitor);
+ super(Scope.REQUEST, workContext, monitor);
contexts = new ConcurrentHashMap<AtomicComponent, Map<Thread, InstanceWrapper>>();
destroyQueues = new ConcurrentHashMap<Thread, List<InstanceWrapper>>();
- }
-
- public Scope getScope() {
- return Scope.REQUEST;
}
public void onEvent(Event event) {
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=518016&r1=518015&r2=518016
==============================================================================
--- 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 Tue Mar 13 22:01:22 2007
@@ -35,11 +35,7 @@
public class StatelessScopeContainer<GROUP, KEY> extends AbstractScopeContainer<GROUP, KEY> {
public StatelessScopeContainer(WorkContext workContext, ScopeContainerMonitor monitor) {
- super(workContext, monitor);
- }
-
- public Scope getScope() {
- return Scope.STATELESS;
+ super(Scope.STATELESS, workContext, monitor);
}
public synchronized void start() {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org