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 02:45:07 UTC
svn commit: r519506 - in /incubator/tuscany/java/sca/kernel:
core/src/main/java/org/apache/tuscany/core/component/
core/src/test/java/org/apache/tuscany/core/component/scope/
spi/src/main/java/org/apache/tuscany/spi/component/
Author: jboynes
Date: Sat Mar 17 18:45:06 2007
New Revision: 519506
URL: http://svn.apache.org/viewvc?view=rev&rev=519506
Log:
remove get/setRemoteComponent as it is not used
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/WorkContextImpl.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/WorkContextTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/WorkContext.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/WorkContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/WorkContextImpl.java?view=diff&rev=519506&r1=519505&r2=519506
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/WorkContextImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/WorkContextImpl.java Sat Mar 17 18:45:06 2007
@@ -26,7 +26,6 @@
import java.util.Map;
import org.apache.tuscany.spi.component.AtomicComponent;
-import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.wire.Wire;
@@ -37,7 +36,6 @@
* @version $Rev$ $Date$
*/
public class WorkContextImpl implements WorkContext {
- private static final Object REMOTE_CONTEXT = new Object();
private static final Object CORRELATION_ID = new Object();
private static final Object CALLBACK_URIS = new Object();
private static final Object CURRENT_ATOMIC = new Object();
@@ -109,19 +107,6 @@
map.put(CALLBACK_WIRES, wires);
}
- public Component getRemoteComponent() {
- Map<Object, Object> map = workContext.get();
- if (map == null) {
- return null;
- }
- return (Component) map.get(REMOTE_CONTEXT);
- }
-
-
- public void setRemoteComponent(Component component) {
- Map<Object, Object> map = getWorkContextMap();
- map.put(REMOTE_CONTEXT, component);
- }
public Object getIdentifier(Object type) {
Map<Object, Object> map = inheritableContext.get();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/WorkContextTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/WorkContextTestCase.java?view=diff&rev=519506&r1=519505&r2=519506
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/WorkContextTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/WorkContextTestCase.java Sat Mar 17 18:45:06 2007
@@ -31,21 +31,6 @@
*/
public class WorkContextTestCase extends TestCase {
- public void testRemoteComponent() throws Exception {
- WorkContext ctx = new WorkContextImpl();
- Component component = EasyMock.createNiceMock(Component.class);
- Component component2 = EasyMock.createNiceMock(Component.class);
- ctx.setRemoteComponent(component);
- assertEquals(component, ctx.getRemoteComponent());
- ctx.setRemoteComponent(component2);
- assertEquals(component2, ctx.getRemoteComponent());
- }
-
- public void testNonSetRemoteComponent() throws Exception {
- WorkContext ctx = new WorkContextImpl();
- assertNull(ctx.getRemoteComponent());
- }
-
public void testSetCurrentAtomicComponent() throws Exception {
WorkContext ctx = new WorkContextImpl();
AtomicComponent component = EasyMock.createNiceMock(AtomicComponent.class);
@@ -138,18 +123,6 @@
assertNull(context.getCurrentAtomicComponent());
}
- public void testCurrentRemoteComponentDoesNotPropagateToChildThread() throws InterruptedException {
- // NOTE should behaviour be to propagate?
- WorkContext context = new WorkContextImpl();
- context.setRemoteComponent(EasyMock.createNiceMock(Component.class));
- TestCurrentRemoteComponentChildThread t = new TestCurrentRemoteComponentChildThread(context);
- t.start();
- t.join();
- assertTrue(t.passed);
- context.setRemoteComponent(null);
- assertNull(context.getRemoteComponent());
- }
-
private static final class ChildThread extends Thread {
private WorkContext context;
private boolean passed = true;
@@ -182,25 +155,6 @@
public void run() {
try {
assertNull(context.getCurrentAtomicComponent());
- } catch (AssertionError e) {
- passed = false;
- }
- }
-
- }
-
- private static final class TestCurrentRemoteComponentChildThread extends Thread {
- private WorkContext context;
- private boolean passed = true;
-
- private TestCurrentRemoteComponentChildThread(WorkContext context) {
- this.context = context;
- }
-
- @Override
- public void run() {
- try {
- assertNull(context.getRemoteComponent());
} catch (AssertionError e) {
passed = false;
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/WorkContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/WorkContext.java?view=diff&rev=519506&r1=519505&r2=519506
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/WorkContext.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/WorkContext.java Sat Mar 17 18:45:06 2007
@@ -97,16 +97,6 @@
void setCorrelationId(Object id);
/**
- * Returns the composite where a remote request came in
- */
- Component getRemoteComponent();
-
- /**
- * Sets the composite where a remote request came in
- */
- void setRemoteComponent(Component component);
-
- /**
* Returns the current atomic component as a request is processed or null if it is not being tracked. Note that the
* current atomic component is typically only tracked during persistence operations involving implementation
* instances
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org