You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/05/05 07:38:52 UTC
svn commit: r535449 - in /incubator/tuscany/java/sca/modules:
binding-rmi/src/main/java/org/apache/tuscany/binding/rmi/
binding-ws-axis2/src/main/java/org/apache/tuscany/binding/axis2/
core-spi/src/main/java/org/apache/tuscany/spi/component/ core/src/m...
Author: rfeng
Date: Fri May 4 22:38:51 2007
New Revision: 535449
URL: http://svn.apache.org/viewvc?view=rev&rev=535449
Log:
Clean up the WorkContext
Removed:
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/component/SimpleWorkContext.java
Modified:
incubator/tuscany/java/sca/modules/binding-rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingProvider.java
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceServlet.java
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/WorkContext.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/component/WorkContextImpl.java
incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/component/scope/WorkContextTestCase.java
Modified: incubator/tuscany/java/sca/modules/binding-rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingProvider.java?view=diff&rev=535449&r1=535448&r2=535449
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingProvider.java (original)
+++ incubator/tuscany/java/sca/modules/binding-rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingProvider.java Fri May 4 22:38:51 2007
@@ -39,7 +39,7 @@
import org.apache.tuscany.core.RuntimeWire;
import org.apache.tuscany.core.ServiceBindingActivator;
import org.apache.tuscany.core.ServiceBindingProvider;
-import org.apache.tuscany.core.component.SimpleWorkContext;
+import org.apache.tuscany.core.component.WorkContextImpl;
import org.apache.tuscany.interfacedef.Interface;
import org.apache.tuscany.interfacedef.InterfaceContract;
import org.apache.tuscany.interfacedef.Operation;
@@ -215,7 +215,7 @@
Interceptor headInterceptor = chain.getHeadInterceptor();
WorkContext workContext = WorkContextTunnel.getThreadWorkContext();
if (workContext == null) {
- workContext = new SimpleWorkContext();
+ workContext = new WorkContextImpl();
workContext.setIdentifier(Scope.COMPOSITE, ComponentNames.TUSCANY_APPLICATION_ROOT.resolve("default"));
WorkContextTunnel.setThreadWorkContext(workContext);
}
Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceServlet.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceServlet.java?view=diff&rev=535449&r1=535448&r2=535449
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceServlet.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceServlet.java Fri May 4 22:38:51 2007
@@ -42,7 +42,7 @@
import org.apache.axis2.transport.http.AxisServlet;
import org.apache.axis2.transport.http.ListingAgent;
import org.apache.axis2.transport.http.server.HttpUtils;
-import org.apache.tuscany.core.component.SimpleWorkContext;
+import org.apache.tuscany.core.component.WorkContextImpl;
import org.apache.tuscany.scope.Scope;
import org.apache.tuscany.spi.bootstrap.ComponentNames;
import org.apache.tuscany.spi.component.WorkContext;
@@ -237,7 +237,7 @@
}
// Create a work context TODO: where should this get done?
- WorkContext workContext = new SimpleWorkContext();
+ WorkContext workContext = new WorkContextImpl();
workContext.setIdentifier(Scope.COMPOSITE, ComponentNames.TUSCANY_APPLICATION_ROOT.resolve("default"));
WorkContextTunnel.setThreadWorkContext(workContext);
Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/WorkContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/WorkContext.java?view=diff&rev=535449&r1=535448&r2=535449
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/WorkContext.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/WorkContext.java Fri May 4 22:38:51 2007
@@ -22,7 +22,6 @@
import java.util.LinkedList;
import org.apache.tuscany.core.RuntimeComponent;
-import org.apache.tuscany.core.RuntimeWire;
/**
* Implementations track information associated with a request as it is processed by the runtime
@@ -69,20 +68,6 @@
void setCallbackUris(LinkedList<URI> uris);
/**
- * Returns an ordered list of callback wures for the current context. Ordering is based on the sequence of service
- * invocations for collocated components
- *
- * @return the current list of callback wires
- */
- LinkedList<RuntimeWire> getCallbackWires();
-
- /**
- * Sets an ordered list of callback wires for the current context. Ordering is based on the sequence of service
- * invocations for collocated components
- */
- void setCallbackWires(LinkedList<RuntimeWire> wires);
-
- /**
* Returns the correlation id for the current invocation or null if not available. Transports may use correlation
* ids for message routing.
*
@@ -104,7 +89,7 @@
*
* @return the current atomic component as a request is processed or null
*/
- RuntimeComponent getCurrentAtomicComponent();
+ RuntimeComponent getCurrentComponent();
/**
* Sets the current atomic component that is handling processing of a request. Note that in most cases it will not
@@ -112,14 +97,7 @@
*
* @param component the current atomic component
*/
- void setCurrentAtomicComponent(RuntimeComponent component);
-
- /**
- * Removes and returns the name of the last remotable service to handle the current request
- *
- * @return the name of the last remotable service to handle the current request or null
- */
- String popServiceName();
+ void setCurrentComponent(RuntimeComponent component);
/**
* Returns the name of the last remotable service to handle the current request
@@ -127,13 +105,6 @@
* @return the name of the last remotable service to handle the current request or null
*/
String getCurrentServiceName();
-
- /**
- * Adds the name of the last remotable service to handle the current request
- *
- * @param name the name of the last remotable service to handle the current request or null
- */
- void pushServiceName(String name);
/**
* Clears the stack of current service names
Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/component/WorkContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/component/WorkContextImpl.java?view=diff&rev=535449&r1=535448&r2=535449
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/component/WorkContextImpl.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/component/WorkContextImpl.java Fri May 4 22:38:51 2007
@@ -67,7 +67,7 @@
map.put(CORRELATION_ID, id);
}
- public RuntimeComponent getCurrentAtomicComponent() {
+ public RuntimeComponent getCurrentComponent() {
Map<Object, Object> map = workContext.get();
if (map == null) {
return null;
@@ -75,7 +75,7 @@
return (RuntimeComponent)map.get(CURRENT_ATOMIC);
}
- public void setCurrentAtomicComponent(RuntimeComponent component) {
+ public void setCurrentComponent(RuntimeComponent component) {
Map<Object, Object> map = getWorkContextMap();
map.put(CURRENT_ATOMIC, component);
}
Modified: incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/component/scope/WorkContextTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/component/scope/WorkContextTestCase.java?view=diff&rev=535449&r1=535448&r2=535449
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/component/scope/WorkContextTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/component/scope/WorkContextTestCase.java Fri May 4 22:38:51 2007
@@ -35,15 +35,15 @@
WorkContext ctx = new WorkContextImpl();
RuntimeComponent component = EasyMock.createNiceMock(RuntimeComponent.class);
RuntimeComponent component2 = EasyMock.createNiceMock(RuntimeComponent.class);
- ctx.setCurrentAtomicComponent(component);
- assertEquals(component, ctx.getCurrentAtomicComponent());
- ctx.setCurrentAtomicComponent(component2);
- assertEquals(component2, ctx.getCurrentAtomicComponent());
+ ctx.setCurrentComponent(component);
+ assertEquals(component, ctx.getCurrentComponent());
+ ctx.setCurrentComponent(component2);
+ assertEquals(component2, ctx.getCurrentComponent());
}
public void testNonSetCurrentAtomicComponent() throws Exception {
WorkContext ctx = new WorkContextImpl();
- assertNull(ctx.getCurrentAtomicComponent());
+ assertNull(ctx.getCurrentComponent());
}
public void testIndentifier() throws Exception {
@@ -114,13 +114,13 @@
public void testCurrentAtomicComponentDoesNotPropagateToChildThread() throws InterruptedException {
// NOTE should behaviour be to propagate?
WorkContext context = new WorkContextImpl();
- context.setCurrentAtomicComponent(EasyMock.createNiceMock(RuntimeComponent.class));
+ context.setCurrentComponent(EasyMock.createNiceMock(RuntimeComponent.class));
TestCurrentAtomicComponentChildThread t = new TestCurrentAtomicComponentChildThread(context);
t.start();
t.join();
assertTrue(t.passed);
- context.setCurrentAtomicComponent(null);
- assertNull(context.getCurrentAtomicComponent());
+ context.setCurrentComponent(null);
+ assertNull(context.getCurrentComponent());
}
private static final class ChildThread extends Thread {
@@ -154,7 +154,7 @@
@Override
public void run() {
try {
- assertNull(context.getCurrentAtomicComponent());
+ assertNull(context.getCurrentComponent());
} catch (AssertionFailedError e) {
passed = false;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org