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/11/23 06:30:52 UTC
svn commit: r478470 - in /incubator/tuscany/java/sca:
kernel/core/src/main/java/org/apache/tuscany/core/component/scope/
kernel/core/src/main/java/org/apache/tuscany/core/wire/
kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/
kernel/core/src...
Author: jmarino
Date: Wed Nov 22 21:30:51 2006
New Revision: 478470
URL: http://svn.apache.org/viewvc?view=rev&rev=478470
Log:
use Scope interned strings instead of HTTP session and Conversational identifiers defined on scope containers as it coupled the scope container implementations to classes throughout the runtime
Modified:
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/wire/NonBlockingBridgingInterceptor.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandler.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/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/implementation/java/integration/component/OutboundWireToJavaTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/component/ScopeReferenceTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/NonBlockingBridgingInterceptorTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerTestCase.java
incubator/tuscany/java/sca/runtime/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/ServletHostImpl.java
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=478470&r1=478469&r2=478470
==============================================================================
--- 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 Wed Nov 22 21:30:51 2006
@@ -43,9 +43,7 @@
* @version $Rev: 452655 $ $Date: 2006-10-03 18:09:02 -0400 (Tue, 03 Oct 2006) $
*/
public class ConversationalScopeContainer extends AbstractScopeContainer {
-
- public static final Object CONVERSATIONAL_IDENTIFIER = new Object();
- public static final long CONVERSATION_MAX_AGE = 10 * 1000;
+ private static final long CONVERSATION_MAX_AGE = 10 * 1000;
private final Map<AtomicComponent, Map<Object, InstanceWrapper>> contexts;
private final Map<Object, List<InstanceWrapper>> destroyQueues;
@@ -71,7 +69,7 @@
checkInit();
if (event instanceof ConversationStart) {
Object key = ((ConversationStart) event).getId();
- workContext.setIdentifier(CONVERSATIONAL_IDENTIFIER, key);
+ workContext.setIdentifier(Scope.CONVERSATIONAL, key);
for (Map.Entry<AtomicComponent, Map<Object, InstanceWrapper>> entry : contexts.entrySet()) {
if (entry.getKey().isEagerInit()) {
getInstance(entry.getKey(), key);
@@ -105,7 +103,7 @@
}
protected InstanceWrapper getInstanceWrapper(AtomicComponent component) throws TargetException {
- Object key = workContext.getIdentifier(CONVERSATIONAL_IDENTIFIER);
+ Object key = workContext.getIdentifier(Scope.CONVERSATIONAL);
assert key != null : "Conversational session id not bound in work component";
InstanceWrapper wrapper = getInstance(component, key);
if (wrapper instanceof TimedoutInstanceWrapper) {
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=478470&r1=478469&r2=478470
==============================================================================
--- 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 Wed Nov 22 21:30:51 2006
@@ -39,9 +39,6 @@
* @version $Rev$ $Date$
*/
public class HttpSessionScopeContainer extends AbstractScopeContainer {
-
- public static final Object HTTP_IDENTIFIER = new Object();
-
private final Map<AtomicComponent, Map<Object, InstanceWrapper>> contexts;
private final Map<Object, List<InstanceWrapper>> destroyQueues;
@@ -63,7 +60,7 @@
checkInit();
if (event instanceof HttpSessionStart) {
Object key = ((HttpSessionStart) event).getId();
- workContext.setIdentifier(HTTP_IDENTIFIER, key);
+ workContext.setIdentifier(Scope.SESSION, key);
for (Map.Entry<AtomicComponent, Map<Object, InstanceWrapper>> entry : contexts.entrySet()) {
if (entry.getKey().isEagerInit()) {
@@ -99,7 +96,7 @@
}
protected InstanceWrapper getInstanceWrapper(AtomicComponent component) throws TargetException {
- Object key = workContext.getIdentifier(HTTP_IDENTIFIER);
+ Object key = workContext.getIdentifier(Scope.SESSION);
assert key != null : "HTTP session key not bound in work component";
return getInstance(component, key);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/NonBlockingBridgingInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/NonBlockingBridgingInterceptor.java?view=diff&rev=478470&r1=478469&r2=478470
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/NonBlockingBridgingInterceptor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/NonBlockingBridgingInterceptor.java Wed Nov 22 21:30:51 2006
@@ -30,8 +30,7 @@
import org.apache.tuscany.spi.wire.Interceptor;
import org.apache.tuscany.spi.wire.Message;
import org.apache.tuscany.spi.wire.TargetInvoker;
-
-import static org.apache.tuscany.core.component.scope.ConversationalScopeContainer.CONVERSATIONAL_IDENTIFIER;
+import org.apache.tuscany.spi.model.Scope;
/**
* Bridges interceptors in a non-blocking fashion between an {@link org.apache.tuscany.spi.wire.InboundInvocationChain}
@@ -64,7 +63,7 @@
final CompositeContext currentContext = CurrentCompositeContext.getContext();
// Retrieve conversation id to transfer to new thread
// Notice that we cannot clear the conversation id from the current thread
- final Object conversationID = workContext.getIdentifier(CONVERSATIONAL_IDENTIFIER);
+ final Object conversationID = workContext.getIdentifier(Scope.CONVERSATIONAL);
// Schedule the invocation of the next interceptor in a new Work instance
try {
workScheduler.scheduleWork(new Runnable() {
@@ -73,7 +72,7 @@
workContext.setCurrentCorrelationId(null);
// if we got a conversation id, transfer it to new thread
if (conversationID != null) {
- workContext.setIdentifier(CONVERSATIONAL_IDENTIFIER, conversationID);
+ workContext.setIdentifier(Scope.CONVERSATIONAL, conversationID);
}
CompositeContext oldContext = CurrentCompositeContext.getContext();
try {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandler.java?view=diff&rev=478470&r1=478469&r2=478470
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandler.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandler.java Wed Nov 22 21:30:51 2006
@@ -28,14 +28,13 @@
import static org.apache.tuscany.spi.idl.java.JavaIDLUtils.findMethod;
import org.apache.tuscany.spi.model.InteractionScope;
import org.apache.tuscany.spi.model.Operation;
+import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.wire.AbstractOutboundInvocationHandler;
import org.apache.tuscany.spi.wire.OutboundInvocationChain;
import org.apache.tuscany.spi.wire.OutboundWire;
import org.apache.tuscany.spi.wire.TargetInvoker;
import org.apache.tuscany.spi.wire.WireInvocationHandler;
-import static org.apache.tuscany.core.component.scope.ConversationalScopeContainer.CONVERSATIONAL_IDENTIFIER;
-
/**
* Receives a request from a proxy and performs an invocation on an {@link org.apache.tuscany.spi.wire.OutboundWire} via
@@ -133,16 +132,16 @@
if (contractIsConversational) {
assert workContext != null : "Work context cannot be null for conversational invocation";
// Check for a conv id on thread and remember it
- convIdFromThread = workContext.getIdentifier(CONVERSATIONAL_IDENTIFIER);
+ convIdFromThread = workContext.getIdentifier(Scope.CONVERSATIONAL);
if (contractIsRemotable) {
if (convIdForRemotableTarget == null) {
convIdForRemotableTarget = new org.apache.tuscany.spi.wire.MessageId();
}
// Always use the conv id for this target
- workContext.setIdentifier(CONVERSATIONAL_IDENTIFIER, convIdForRemotableTarget);
+ workContext.setIdentifier(Scope.CONVERSATIONAL, convIdForRemotableTarget);
} else if (convIdFromThread == null) {
Object newConvId = new org.apache.tuscany.spi.wire.MessageId();
- workContext.setIdentifier(CONVERSATIONAL_IDENTIFIER, newConvId);
+ workContext.setIdentifier(Scope.CONVERSATIONAL, newConvId);
}
}
@@ -150,7 +149,7 @@
if (contractIsConversational && contractIsRemotable) {
// Make sure we restore the remembered conv id to continue propagating
- workContext.setIdentifier(CONVERSATIONAL_IDENTIFIER, convIdFromThread);
+ workContext.setIdentifier(Scope.CONVERSATIONAL, convIdFromThread);
}
return result;
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=478470&r1=478469&r2=478470
==============================================================================
--- 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 Wed Nov 22 21:30:51 2006
@@ -29,6 +29,7 @@
import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.component.SystemAtomicComponent;
import org.apache.tuscany.spi.component.WorkContext;
+import org.apache.tuscany.spi.model.Scope;
import junit.framework.TestCase;
@@ -48,7 +49,7 @@
SystemAtomicComponent atomicContext = createContext(scopeContext);
// start the request
Object conversation = new Object();
- workContext.setIdentifier(ConversationalScopeContainer.CONVERSATIONAL_IDENTIFIER, conversation);
+ workContext.setIdentifier(Scope.CONVERSATIONAL, conversation);
ConversationalScopeInitDestroyComponent o1 =
(ConversationalScopeInitDestroyComponent) scopeContext.getInstance(atomicContext);
assertTrue(o1.isInitialized());
@@ -69,14 +70,14 @@
SystemAtomicComponent atomicContext = createContext(scopeContext);
Object conversation1 = new Object();
- workContext.setIdentifier(ConversationalScopeContainer.CONVERSATIONAL_IDENTIFIER, conversation1);
+ workContext.setIdentifier(Scope.CONVERSATIONAL, conversation1);
ConversationalScopeInitDestroyComponent o1 =
(ConversationalScopeInitDestroyComponent) scopeContext.getInstance(atomicContext);
assertTrue(o1.isInitialized());
assertFalse(o1.isDestroyed());
Object conversation2 = new Object();
- workContext.setIdentifier(ConversationalScopeContainer.CONVERSATIONAL_IDENTIFIER, conversation2);
+ workContext.setIdentifier(Scope.CONVERSATIONAL, conversation2);
ConversationalScopeInitDestroyComponent o2 =
(ConversationalScopeInitDestroyComponent) scopeContext.getInstance(atomicContext);
assertNotSame(o1, o2);
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=478470&r1=478469&r2=478470
==============================================================================
--- 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 Wed Nov 22 21:30:51 2006
@@ -26,6 +26,8 @@
import org.apache.tuscany.core.component.event.HttpSessionEnd;
import org.apache.tuscany.core.implementation.PojoConfiguration;
import org.apache.tuscany.spi.component.SystemAtomicComponent;
+import org.apache.tuscany.spi.model.Scope;
+
import org.apache.tuscany.core.implementation.system.component.SystemAtomicComponentImpl;
import org.apache.tuscany.core.injection.EventInvoker;
import org.apache.tuscany.core.injection.MethodEventInvoker;
@@ -48,7 +50,7 @@
SystemAtomicComponent atomicContext = createContext(scopeContext);
// start the request
Object session = new Object();
- workContext.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session);
+ workContext.setIdentifier(Scope.SESSION, session);
SessionScopeInitDestroyComponent o1 =
(SessionScopeInitDestroyComponent) scopeContext.getInstance(atomicContext);
assertTrue(o1.isInitialized());
@@ -69,13 +71,13 @@
SystemAtomicComponent atomicContext = createContext(scopeContext);
Object session1 = new Object();
- workContext.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session1);
+ workContext.setIdentifier(Scope.SESSION, session1);
SessionScopeInitDestroyComponent o1 =
(SessionScopeInitDestroyComponent) scopeContext.getInstance(atomicContext);
assertTrue(o1.isInitialized());
Object session2 = new Object();
- workContext.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session2);
+ workContext.setIdentifier(Scope.SESSION, session2);
SessionScopeInitDestroyComponent o2 =
(SessionScopeInitDestroyComponent) scopeContext.getInstance(atomicContext);
assertNotSame(o1, o2);
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=478470&r1=478469&r2=478470
==============================================================================
--- 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 Wed Nov 22 21:30:51 2006
@@ -30,6 +30,7 @@
import org.apache.tuscany.core.mock.factories.MockFactory;
import org.apache.tuscany.spi.component.SystemAtomicComponent;
import org.apache.tuscany.spi.component.WorkContext;
+import org.apache.tuscany.spi.model.Scope;
import junit.framework.Assert;
import junit.framework.TestCase;
@@ -62,7 +63,7 @@
destroyOnlyContext.start();
Object conversation = new Object();
- ctx.setIdentifier(ConversationalScopeContainer.CONVERSATIONAL_IDENTIFIER, conversation);
+ ctx.setIdentifier(Scope.CONVERSATIONAL, conversation);
scope.onEvent(new ConversationStart(this, conversation));
ConversationalScopeInitDestroyComponent initDestroy =
(ConversationalScopeInitDestroyComponent) scope.getInstance(initDestroyContext);
@@ -106,7 +107,7 @@
scope.register(threeCtx);
Object conversation = new Object();
- ctx.setIdentifier(ConversationalScopeContainer.CONVERSATIONAL_IDENTIFIER, conversation);
+ ctx.setIdentifier(Scope.CONVERSATIONAL, conversation);
scope.onEvent(new ConversationStart(this, conversation));
OrderedInitPojo one = (OrderedInitPojo) scope.getInstance(oneCtx);
Assert.assertNotNull(one);
@@ -145,7 +146,7 @@
scope.register(threeCtx);
Object conversation = new Object();
- ctx.setIdentifier(ConversationalScopeContainer.CONVERSATIONAL_IDENTIFIER, conversation);
+ ctx.setIdentifier(Scope.CONVERSATIONAL, conversation);
scope.onEvent(new ConversationStart(this, conversation));
OrderedEagerInitPojo one = (OrderedEagerInitPojo) scope.getInstance(oneCtx);
Assert.assertNotNull(one);
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=478470&r1=478469&r2=478470
==============================================================================
--- 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 Wed Nov 22 21:30:51 2006
@@ -29,6 +29,7 @@
import org.apache.tuscany.core.injection.PojoObjectFactory;
import org.apache.tuscany.spi.component.SystemAtomicComponent;
import org.apache.tuscany.spi.component.WorkContext;
+import org.apache.tuscany.spi.model.Scope;
import junit.framework.TestCase;
@@ -59,7 +60,7 @@
context.start();
Object conversation = new Object();
- ctx.setIdentifier(ConversationalScopeContainer.CONVERSATIONAL_IDENTIFIER, conversation);
+ ctx.setIdentifier(Scope.CONVERSATIONAL, conversation);
scope.onEvent(new ConversationStart(this, conversation));
Object instance = context.getServiceInstance();
assertSame(instance, context.getServiceInstance());
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=478470&r1=478469&r2=478470
==============================================================================
--- 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 Wed Nov 22 21:30:51 2006
@@ -22,6 +22,7 @@
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.WorkContext;
+import org.apache.tuscany.spi.model.Scope;
import junit.framework.TestCase;
import org.apache.tuscany.core.component.WorkContextImpl;
@@ -112,7 +113,7 @@
AtomicComponent targetComponent = contexts.get("target");
scopeCtx.register(sourceComponent);
scopeCtx.register(targetComponent);
- ctx.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session);
+ ctx.setIdentifier(Scope.SESSION, session);
OrderedDependentPojo source = (OrderedDependentPojo) scopeCtx.getInstance(sourceComponent);
assertNotNull(source.getPojo());
assertEquals(2, source.getNumberInstantiated());
@@ -135,7 +136,7 @@
scopeCtx);
AtomicComponent sourceComponent = contexts.get("source");
AtomicComponent targetComponent = contexts.get("target");
- ctx.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session);
+ ctx.setIdentifier(Scope.SESSION, session);
scopeCtx.register(sourceComponent);
scopeCtx.register(targetComponent);
OrderedDependentPojo source = (OrderedDependentPojo) scopeCtx.getInstance(sourceComponent);
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=478470&r1=478469&r2=478470
==============================================================================
--- 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 Wed Nov 22 21:30:51 2006
@@ -20,6 +20,7 @@
import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.component.SystemAtomicComponent;
+import org.apache.tuscany.spi.model.Scope;
import junit.framework.Assert;
import junit.framework.TestCase;
@@ -62,7 +63,7 @@
destroyOnlyContext.start();
Object session = new Object();
- ctx.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session);
+ ctx.setIdentifier(Scope.SESSION, session);
scope.onEvent(new HttpSessionStart(this, session));
RequestScopeInitDestroyComponent initDestroy =
(RequestScopeInitDestroyComponent) scope.getInstance(initDestroyContext);
@@ -106,7 +107,7 @@
scope.register(threeCtx);
Object session = new Object();
- ctx.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session);
+ ctx.setIdentifier(Scope.SESSION, session);
scope.onEvent(new HttpSessionStart(this, session));
OrderedInitPojo one = (OrderedInitPojo) scope.getInstance(oneCtx);
Assert.assertNotNull(one);
@@ -145,7 +146,7 @@
scope.register(threeCtx);
Object session = new Object();
- ctx.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session);
+ ctx.setIdentifier(Scope.SESSION, session);
scope.onEvent(new HttpSessionStart(this, session));
OrderedEagerInitPojo one = (OrderedEagerInitPojo) scope.getInstance(oneCtx);
Assert.assertNotNull(one);
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=478470&r1=478469&r2=478470
==============================================================================
--- 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 Wed Nov 22 21:30:51 2006
@@ -28,6 +28,8 @@
import org.apache.tuscany.core.component.event.HttpSessionStart;
import org.apache.tuscany.core.implementation.PojoConfiguration;
import org.apache.tuscany.spi.component.SystemAtomicComponent;
+import org.apache.tuscany.spi.model.Scope;
+
import org.apache.tuscany.core.implementation.system.component.SystemAtomicComponentImpl;
import org.apache.tuscany.core.injection.MethodEventInvoker;
import org.apache.tuscany.core.injection.PojoObjectFactory;
@@ -59,7 +61,7 @@
context.start();
Object session = new Object();
- ctx.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session);
+ ctx.setIdentifier(Scope.SESSION, session);
scope.onEvent(new HttpSessionStart(this, session));
Object instance = context.getServiceInstance();
assertSame(instance, context.getServiceInstance());
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/component/OutboundWireToJavaTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/component/OutboundWireToJavaTestCase.java?view=diff&rev=478470&r1=478469&r2=478470
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/component/OutboundWireToJavaTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/component/OutboundWireToJavaTestCase.java Wed Nov 22 21:30:51 2006
@@ -34,6 +34,7 @@
import org.apache.tuscany.spi.model.InteractionScope;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.ServiceContract;
+import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.wire.InboundWire;
import org.apache.tuscany.spi.wire.OutboundInvocationChain;
import org.apache.tuscany.spi.wire.OutboundWire;
@@ -121,7 +122,7 @@
HttpSessionScopeContainer scope = new HttpSessionScopeContainer(workContext);
scope.start();
Object session1 = new Object();
- workContext.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session1);
+ workContext.setIdentifier(Scope.SESSION, session1);
scope.onEvent(new HttpSessionStart(this, session1));
final OutboundWire wire = getWire(scope);
@@ -132,11 +133,11 @@
assertEquals("foo", service.getString());
assertEquals("foo", target.getString());
- workContext.clearIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER);
+ workContext.clearIdentifier(Scope.SESSION);
//second session
Object session2 = new Object();
- workContext.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session2);
+ workContext.setIdentifier(Scope.SESSION, session2);
scope.onEvent(new HttpSessionStart(this, session2));
Target service2 = (Target) wireService.createProxy(wire);
@@ -148,9 +149,9 @@
assertEquals("bar", target2.getString());
scope.onEvent(new HttpSessionEnd(this, session2));
- workContext.clearIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER);
+ workContext.clearIdentifier(Scope.SESSION);
- workContext.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session1);
+ workContext.setIdentifier(Scope.SESSION, session1);
assertEquals("foo", service.getString());
scope.onEvent(new HttpSessionEnd(this, session1));
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/component/ScopeReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/component/ScopeReferenceTestCase.java?view=diff&rev=478470&r1=478469&r2=478470
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/component/ScopeReferenceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/component/ScopeReferenceTestCase.java Wed Nov 22 21:30:51 2006
@@ -30,6 +30,7 @@
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.component.WorkContext;
+import org.apache.tuscany.spi.model.Scope;
import junit.framework.TestCase;
import org.apache.tuscany.core.component.WorkContextImpl;
@@ -96,7 +97,7 @@
moduleScope, members, "target", Target.class, TargetImpl.class, sessionScope);
moduleScope.onEvent(new CompositeStart(this, null));
Object session1 = new Object();
- ctx.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session1);
+ ctx.setIdentifier(Scope.SESSION, session1);
sessionScope.onEvent(new HttpSessionStart(this, session1));
AtomicComponent sourceComponent = contexts.get("source");
AtomicComponent targetComponent = contexts.get("target");
@@ -107,12 +108,12 @@
target.setString("foo");
assertTrue(Proxy.isProxyClass(source.getTarget().getClass()));
assertEquals("foo", source.getTarget().getString());
- ctx.clearIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER);
+ ctx.clearIdentifier(Scope.SESSION);
sessionScope.onEvent(new HttpSessionEnd(this, session1));
//second session
Object session2 = new Object();
- ctx.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session2);
+ ctx.setIdentifier(Scope.SESSION, session2);
sessionScope.onEvent(new HttpSessionStart(this, session2));
Target target2 = (Target) targetComponent.getServiceInstance();
@@ -124,7 +125,7 @@
assertEquals("bar", source.getTarget().getString());
sessionScope.onEvent(new HttpSessionEnd(this, session2));
- ctx.clearIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER);
+ ctx.clearIdentifier(Scope.SESSION);
moduleScope.onEvent(new CompositeStop(this, null));
sessionScope.stop();
moduleScope.stop();
@@ -223,7 +224,7 @@
sessionScope, members, "target", Target.class, TargetImpl.class, sessionScope);
Object session1 = new Object();
- ctx.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session1);
+ ctx.setIdentifier(Scope.SESSION, session1);
sessionScope.onEvent(new HttpSessionStart(this, session1));
AtomicComponent sourceComponent = contexts.get("source");
AtomicComponent targetComponent = contexts.get("target");
@@ -233,12 +234,12 @@
source.getTarget().setString("foo");
assertEquals("foo", target.getString());
- ctx.clearIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER);
+ ctx.clearIdentifier(Scope.SESSION);
sessionScope.onEvent(new HttpSessionEnd(this, session1));
//second session
Object session2 = new Object();
- ctx.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session2);
+ ctx.setIdentifier(Scope.SESSION, session2);
sessionScope.onEvent(new HttpSessionStart(this, session2));
Source source2 = (Source) sourceComponent.getServiceInstance();
@@ -251,7 +252,7 @@
source2.getTarget().setString("baz");
assertEquals("baz", source2.getTarget().getString());
assertEquals("baz", target2.getString());
- ctx.clearIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER);
+ ctx.clearIdentifier(Scope.SESSION);
sessionScope.onEvent(new HttpSessionEnd(this, session2));
sessionScope.stop();
}
@@ -271,7 +272,7 @@
sessionScope, members, "target", Target.class, TargetImpl.class, moduleScope);
moduleScope.onEvent(new CompositeStart(this, null));
Object session1 = new Object();
- ctx.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session1);
+ ctx.setIdentifier(Scope.SESSION, session1);
sessionScope.onEvent(new HttpSessionStart(this, session1));
AtomicComponent sourceComponent = contexts.get("source");
AtomicComponent targetComponent = contexts.get("target");
@@ -282,12 +283,12 @@
target.setString("foo");
assertTrue(Proxy.isProxyClass(source.getTarget().getClass()));
assertEquals("foo", source.getTarget().getString());
- ctx.clearIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER);
+ ctx.clearIdentifier(Scope.SESSION);
sessionScope.onEvent(new HttpSessionEnd(this, session1));
//second session
Object session2 = new Object();
- ctx.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session2);
+ ctx.setIdentifier(Scope.SESSION, session2);
sessionScope.onEvent(new HttpSessionStart(this, session2));
Target target2 = (Target) targetComponent.getServiceInstance();
@@ -298,7 +299,7 @@
assertEquals("baz", source2.getTarget().getString());
assertEquals("baz", target2.getString());
assertEquals("baz", target.getString());
- ctx.clearIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER);
+ ctx.clearIdentifier(Scope.SESSION);
sessionScope.onEvent(new HttpSessionEnd(this, session2));
moduleScope.stop();
sessionScope.stop();
@@ -317,7 +318,7 @@
Map<String, AtomicComponent> contexts = MockFactory.createWiredComponents("source", SourceImpl.class,
sessionScope, members, "target", Target.class, TargetImpl.class, requestScope);
Object session1 = new Object();
- ctx.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session1);
+ ctx.setIdentifier(Scope.SESSION, session1);
sessionScope.onEvent(new HttpSessionStart(this, session1));
requestScope.onEvent(new RequestStart(this));
AtomicComponent sourceComponent = contexts.get("source");
@@ -348,7 +349,7 @@
future.get();
assertEquals("foo", source.getTarget().getString());
requestScope.onEvent(new RequestEnd(this));
- ctx.clearIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER);
+ ctx.clearIdentifier(Scope.SESSION);
sessionScope.onEvent(new HttpSessionEnd(this, session1));
requestScope.stop();
sessionScope.stop();
@@ -369,7 +370,7 @@
sessionScope, members, "target", Target.class, TargetImpl.class, statelessScope);
Object session1 = new Object();
- ctx.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session1);
+ ctx.setIdentifier(Scope.SESSION, session1);
sessionScope.onEvent(new HttpSessionStart(this, session1));
AtomicComponent sourceComponent = contexts.get("source");
@@ -386,7 +387,7 @@
source.getTarget().setString("bar");
assertFalse("bar".equals(source.getTarget().getString()));
- ctx.clearIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER);
+ ctx.clearIdentifier(Scope.SESSION);
sessionScope.onEvent(new HttpSessionEnd(this, session1));
sessionScope.stop();
statelessScope.stop();
@@ -496,7 +497,7 @@
sessionScope.start();
Object session1 = new Object();
- ctx.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session1);
+ ctx.setIdentifier(Scope.SESSION, session1);
sessionScope.onEvent(new HttpSessionStart(this, session1));
Map<String, AtomicComponent> contexts = MockFactory.createWiredComponents("source", SourceImpl.class,
requestScope, members, "target", Target.class, TargetImpl.class, sessionScope);
@@ -533,7 +534,7 @@
requestScope.onEvent(new RequestEnd(this));
requestScope.stop();
- ctx.clearIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER);
+ ctx.clearIdentifier(Scope.SESSION);
sessionScope.onEvent(new HttpSessionEnd(this, session1));
sessionScope.stop();
}
@@ -655,7 +656,7 @@
Map<String, AtomicComponent> contexts = MockFactory.createWiredComponents("source", SourceImpl.class,
statelessScope, members, "target", Target.class, TargetImpl.class, sessionScope);
Object session1 = new Object();
- ctx.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session1);
+ ctx.setIdentifier(Scope.SESSION, session1);
sessionScope.onEvent(new HttpSessionStart(this, session1));
AtomicComponent sourceComponent = contexts.get("source");
AtomicComponent targetComponent = contexts.get("target");
@@ -666,12 +667,12 @@
target.setString("foo");
assertTrue(Proxy.isProxyClass(source.getTarget().getClass()));
assertEquals("foo", source.getTarget().getString());
- ctx.clearIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER);
+ ctx.clearIdentifier(Scope.SESSION);
sessionScope.onEvent(new HttpSessionEnd(this, session1));
//second session
Object session2 = new Object();
- ctx.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session2);
+ ctx.setIdentifier(Scope.SESSION, session2);
sessionScope.onEvent(new HttpSessionStart(this, session2));
Target target2 = (Target) targetComponent.getServiceInstance();
@@ -683,7 +684,7 @@
assertEquals("bar", source.getTarget().getString());
sessionScope.onEvent(new HttpSessionEnd(this, session2));
- ctx.clearIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER);
+ ctx.clearIdentifier(Scope.SESSION);
sessionScope.stop();
statelessScope.stop();
}
@@ -714,7 +715,7 @@
//second session
Object session2 = new Object();
- ctx.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session2);
+ ctx.setIdentifier(Scope.SESSION, session2);
moduleScope.onEvent(new HttpSessionStart(this, session2));
Target target2 = (Target) targetComponent.getServiceInstance();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/NonBlockingBridgingInterceptorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/NonBlockingBridgingInterceptorTestCase.java?view=diff&rev=478470&r1=478469&r2=478470
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/NonBlockingBridgingInterceptorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/NonBlockingBridgingInterceptorTestCase.java Wed Nov 22 21:30:51 2006
@@ -23,9 +23,9 @@
import org.apache.tuscany.spi.wire.Interceptor;
import org.apache.tuscany.spi.wire.Message;
import org.apache.tuscany.spi.wire.MessageImpl;
+import org.apache.tuscany.spi.model.Scope;
import junit.framework.TestCase;
-import static org.apache.tuscany.core.component.scope.ConversationalScopeContainer.CONVERSATIONAL_IDENTIFIER;
import org.easymock.EasyMock;
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expectLastCall;
@@ -53,10 +53,10 @@
replay(scheduler);
WorkContext context = createMock(WorkContext.class);
String convID = "convID";
- EasyMock.expect(context.getIdentifier(CONVERSATIONAL_IDENTIFIER)).andReturn(convID);
+ EasyMock.expect(context.getIdentifier(Scope.CONVERSATIONAL)).andReturn(convID);
context.setCurrentMessageId(null);
context.setCurrentCorrelationId(null);
- context.setIdentifier(CONVERSATIONAL_IDENTIFIER, convID);
+ context.setIdentifier(Scope.CONVERSATIONAL, convID);
EasyMock.replay(context);
Message msg = new MessageImpl();
Interceptor next = EasyMock.createMock(Interceptor.class);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerTestCase.java?view=diff&rev=478470&r1=478469&r2=478470
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerTestCase.java Wed Nov 22 21:30:51 2006
@@ -18,10 +18,6 @@
*/
package org.apache.tuscany.core.wire.jdk;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-
import java.lang.reflect.Array;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Proxy;
@@ -36,6 +32,7 @@
import org.apache.tuscany.spi.model.DataType;
import org.apache.tuscany.spi.model.InteractionScope;
import org.apache.tuscany.spi.model.Operation;
+import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.model.ServiceContract;
import org.apache.tuscany.spi.wire.InvocationRuntimeException;
import org.apache.tuscany.spi.wire.Message;
@@ -44,10 +41,11 @@
import org.apache.tuscany.spi.wire.TargetInvoker;
import junit.framework.TestCase;
-
import org.apache.tuscany.core.component.WorkContextImpl;
-import org.apache.tuscany.core.component.scope.ConversationalScopeContainer;
import org.apache.tuscany.core.wire.OutboundWireImpl;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
/**
* @version $Rev$ $Date$
@@ -73,7 +71,7 @@
Foo foo = (Foo) Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{Foo.class}, handler);
assertNotNull(foo.hashCode());
}
-
+
public void testConversational() throws Throwable {
OutboundWire outboundWire = createMock(OutboundWire.class);
Map<Operation<?>, OutboundInvocationChain> outboundChains =
@@ -101,49 +99,49 @@
replay(outboundWire);
Object convID = new Object();
- wc.setIdentifier(ConversationalScopeContainer.CONVERSATIONAL_IDENTIFIER, convID);
+ wc.setIdentifier(Scope.CONVERSATIONAL, convID);
invoker.setCurrentConversationID(convID);
-
+
outboundContract.setRemotable(true);
invoker.setRemotableTest(true);
JDKOutboundInvocationHandler handler = new JDKOutboundInvocationHandler(outboundWire, wc);
- handler.invoke(Foo.class.getMethod("test", new Class[] {String.class}), new Object[] {"bar"});
- Object currentConvID = wc.getIdentifier(ConversationalScopeContainer.CONVERSATIONAL_IDENTIFIER);
+ handler.invoke(Foo.class.getMethod("test", new Class[]{String.class}), new Object[]{"bar"});
+ Object currentConvID = wc.getIdentifier(Scope.CONVERSATIONAL);
assertSame(convID, currentConvID);
-
+
outboundContract.setRemotable(false);
invoker.setRemotableTest(false);
JDKOutboundInvocationHandler handler2 = new JDKOutboundInvocationHandler(outboundWire, wc);
- handler2.invoke(Foo.class.getMethod("test", new Class[] {String.class}), new Object[] {"bar"});
- currentConvID = wc.getIdentifier(ConversationalScopeContainer.CONVERSATIONAL_IDENTIFIER);
+ handler2.invoke(Foo.class.getMethod("test", new Class[]{String.class}), new Object[]{"bar"});
+ currentConvID = wc.getIdentifier(Scope.CONVERSATIONAL);
assertSame(convID, currentConvID);
}
private interface Foo {
String test(String s);
}
-
+
private class MockInvoker implements TargetInvoker {
-
+
private WorkContext wc;
private Object currentConversationID;
private boolean remotableTest;
-
+
public MockInvoker(WorkContext wc) {
this.wc = wc;
}
-
+
public void setCurrentConversationID(Object id) {
currentConversationID = id;
}
-
+
public void setRemotableTest(boolean remotableTest) {
this.remotableTest = remotableTest;
}
public Object invokeTarget(final Object payload) throws InvocationTargetException {
assertEquals("bar", Array.get(payload, 0));
- Object convID = wc.getIdentifier(ConversationalScopeContainer.CONVERSATIONAL_IDENTIFIER);
+ Object convID = wc.getIdentifier(Scope.CONVERSATIONAL);
if (remotableTest) {
assertNotSame(convID, currentConversationID);
} else {
Modified: incubator/tuscany/java/sca/runtime/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/ServletHostImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/ServletHostImpl.java?view=diff&rev=478470&r1=478469&r2=478470
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/ServletHostImpl.java (original)
+++ incubator/tuscany/java/sca/runtime/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/ServletHostImpl.java Wed Nov 22 21:30:51 2006
@@ -18,8 +18,6 @@
*/
package org.apache.tuscany.runtime.webapp;
-import static org.apache.tuscany.core.component.scope.HttpSessionScopeContainer.HTTP_IDENTIFIER;
-
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
@@ -126,12 +124,12 @@
if (event instanceof HttpRequestStart) {
Object key = ((HttpRequestStart) event).getId();
if (null != key) {
- workContext.setIdentifier(HTTP_IDENTIFIER, ((HttpRequestStart) event).getId());
+ workContext.setIdentifier(Scope.SESSION, ((HttpRequestStart) event).getId());
} else { // new request with no session.
- workContext.clearIdentifier(HTTP_IDENTIFIER);
+ workContext.clearIdentifier(Scope.SESSION);
}
} else if (event instanceof HttpRequestEnded) {
- workContext.clearIdentifier(HTTP_IDENTIFIER);
+ workContext.clearIdentifier(Scope.SESSION);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org