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 2007/02/13 17:47:59 UTC
svn commit: r507084 [2/2] - in /incubator/tuscany/java/sca/kernel:
core/src/main/java/org/apache/tuscany/core/builder/
core/src/main/java/org/apache/tuscany/core/databinding/impl/
core/src/main/java/org/apache/tuscany/core/implementation/composite/ cor...
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationIdleExpireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationIdleExpireTestCase.java?view=diff&rev=507084&r1=507083&r2=507084
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationIdleExpireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationIdleExpireTestCase.java Tue Feb 13 08:47:56 2007
@@ -89,11 +89,9 @@
EasyMock.replay(source);
owire = MockFactory.createOutboundWire("foo", Foo.class);
- owire.setContainer(source);
owire.setTargetUri(URI.create("foo#bar"));
InboundWire iwire = MockFactory.createInboundWire("foo", Foo.class);
- iwire.setContainer(target);
- connector.connect(owire, iwire, false);
+ connector.connect(source, owire, target, iwire, false);
handler = new JDKOutboundInvocationHandler(Foo.class, owire, workContext);
operation1 = Foo.class.getMethod("operation1");
operation2 = Foo.class.getMethod("operation2");
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationMaxAgeExpireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationMaxAgeExpireTestCase.java?view=diff&rev=507084&r1=507083&r2=507084
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationMaxAgeExpireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationMaxAgeExpireTestCase.java Tue Feb 13 08:47:56 2007
@@ -89,11 +89,9 @@
EasyMock.replay(source);
owire = MockFactory.createOutboundWire("foo", Foo.class);
- owire.setContainer(source);
owire.setTargetUri(URI.create("foo#bar"));
InboundWire iwire = MockFactory.createInboundWire("foo", Foo.class);
- iwire.setContainer(target);
- connector.connect(owire, iwire, false);
+ connector.connect(source, owire, target, iwire, false);
handler = new JDKOutboundInvocationHandler(Foo.class, owire, workContext);
operation1 = Foo.class.getMethod("operation1");
operation2 = Foo.class.getMethod("operation2");
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationStartStopEndTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationStartStopEndTestCase.java?view=diff&rev=507084&r1=507083&r2=507084
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationStartStopEndTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationStartStopEndTestCase.java Tue Feb 13 08:47:56 2007
@@ -89,11 +89,9 @@
EasyMock.replay(source);
owire = MockFactory.createOutboundWire("foo", Foo.class);
- owire.setContainer(source);
owire.setTargetUri(URI.create("foo#bar"));
InboundWire iwire = MockFactory.createInboundWire("foo", Foo.class);
- iwire.setContainer(target);
- connector.connect(owire, iwire, false);
+ connector.connect(source, owire, target, iwire, false);
handler = new JDKOutboundInvocationHandler(Foo.class, owire, workContext);
operation1 = Foo.class.getMethod("operation1");
operation2 = Foo.class.getMethod("operation2");
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java?view=diff&rev=507084&r1=507083&r2=507084
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java Tue Feb 13 08:47:56 2007
@@ -117,7 +117,6 @@
String serviceName = targetService.getName().substring(targetService.getName().lastIndexOf('.') + 1);
InboundWire inboundWire = createInboundWire(serviceName, targetService, targetHeadInterceptor);
targetComponent.addInboundWire(inboundWire);
- inboundWire.setContainer(targetComponent);
PojoConfiguration configuration = new PojoConfiguration();
configuration.setInstanceFactory(new PojoObjectFactory(sourceClass.getConstructor()));
configuration.setWireService(WIRE_SERVICE);
@@ -130,11 +129,10 @@
sourceComponent.setScopeContainer(sourceScope);
OutboundWire outboundWire = createOutboundWire(targetName, sourceReferenceClass, sourceHeadInterceptor);
sourceComponent.addOutboundWire(outboundWire);
- outboundWire.setContainer(sourceComponent);
outboundWire.setTargetUri(URI.create(targetName + "#" + serviceName));
targetScope.register(targetComponent);
sourceScope.register(sourceComponent);
- CONNECTOR.connect(outboundWire, inboundWire, false);
+ CONNECTOR.connect(sourceComponent, outboundWire, targetComponent, inboundWire, false);
Map<String, AtomicComponent> contexts = new HashMap<String, AtomicComponent>();
contexts.put(sourceName, sourceComponent);
contexts.put(targetName, targetComponent);
@@ -170,7 +168,6 @@
String serviceName = targetService.getName().substring(targetService.getName().lastIndexOf('.') + 1);
InboundWire inboundWire = createInboundWire(serviceName, targetService, null);
targetComponent.addInboundWire(inboundWire);
- inboundWire.setContainer(targetComponent);
PojoConfiguration configuration = new PojoConfiguration();
configuration.setInstanceFactory(new PojoObjectFactory(sourceClass.getConstructor()));
configuration.setWireService(WIRE_SERVICE);
@@ -183,14 +180,13 @@
JavaAtomicComponent sourceComponent = new JavaAtomicComponent(configuration);
sourceComponent.setScopeContainer(sourceScope);
OutboundWire outboundWire = createOutboundWire(targetName, sourceReferenceClass, null);
- outboundWire.setContainer(sourceComponent);
outboundWire.setTargetUri(URI.create(targetName + "#" + serviceName));
List<OutboundWire> factories = new ArrayList<OutboundWire>();
factories.add(outboundWire);
sourceComponent.addOutboundWires(factories);
targetScope.register(targetComponent);
sourceScope.register(sourceComponent);
- CONNECTOR.connect(outboundWire, inboundWire, false);
+ CONNECTOR.connect(sourceComponent, outboundWire, targetComponent, inboundWire, false);
Map<String, AtomicComponent> components = new HashMap<String, AtomicComponent>();
components.put(sourceName, sourceComponent);
components.put(targetName, targetComponent);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireOptimizationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireOptimizationTestCase.java?view=diff&rev=507084&r1=507083&r2=507084
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireOptimizationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireOptimizationTestCase.java Tue Feb 13 08:47:56 2007
@@ -49,7 +49,6 @@
AtomicComponent component = EasyMock.createNiceMock(AtomicComponent.class);
EasyMock.replay(component);
OutboundWire wire = new OutboundWireImpl();
- wire.setContainer(component);
OutboundInvocationChain chain = new OutboundInvocationChainImpl(operation);
chain.addInterceptor(new OptimizableInterceptor());
wire.addInvocationChain(operation, chain);
@@ -60,7 +59,6 @@
AtomicComponent component = EasyMock.createNiceMock(AtomicComponent.class);
EasyMock.replay(component);
OutboundWire wire = new OutboundWireImpl();
- wire.setContainer(component);
OutboundInvocationChain chain = new OutboundInvocationChainImpl(operation);
chain.addInterceptor(new NonOptimizableInterceptor());
wire.addInvocationChain(operation, chain);
@@ -72,11 +70,10 @@
EasyMock.expect(component.isOptimizable()).andReturn(true);
EasyMock.replay(component);
InboundWire wire = new InboundWireImpl();
- wire.setContainer(component);
InboundInvocationChain chain = new InboundInvocationChainImpl(operation);
chain.addInterceptor(new OptimizableInterceptor());
wire.addInvocationChain(operation, chain);
- assertTrue(WireUtils.isOptimizable(wire));
+ assertTrue(WireUtils.isOptimizable(component, wire));
}
@@ -85,22 +82,20 @@
EasyMock.expect(component.isOptimizable()).andReturn(true);
EasyMock.replay(component);
InboundWire wire = new InboundWireImpl();
- wire.setContainer(component);
InboundInvocationChain chain = new InboundInvocationChainImpl(operation);
chain.addInterceptor(new OptimizableInterceptor());
wire.addInvocationChain(operation, chain);
- assertTrue(WireUtils.isOptimizable(wire));
+ assertTrue(WireUtils.isOptimizable(component, wire));
}
public void testTargetWireNonInterceptorOptimization() throws Exception {
AtomicComponent component = EasyMock.createNiceMock(AtomicComponent.class);
EasyMock.replay(component);
InboundWire wire = new InboundWireImpl();
- wire.setContainer(component);
InboundInvocationChain chain = new InboundInvocationChainImpl(operation);
chain.addInterceptor(new NonOptimizableInterceptor());
wire.addInvocationChain(operation, chain);
- assertFalse(WireUtils.isOptimizable(wire));
+ assertFalse(WireUtils.isOptimizable(component, wire));
}
protected void tearDown() throws Exception {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireServiceExtensionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireServiceExtensionTestCase.java?view=diff&rev=507084&r1=507083&r2=507084
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireServiceExtensionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireServiceExtensionTestCase.java Tue Feb 13 08:47:56 2007
@@ -190,12 +190,10 @@
assertEquals(1, inboundWire.getInvocationChains().size());
assertEquals(contract, inboundWire.getServiceContract());
assertEquals(uri, inboundWire.getUri());
- assertEquals(binding, inboundWire.getContainer());
OutboundWire outboundWire = binding.getOutboundWire();
assertEquals(1, outboundWire.getInvocationChains().size());
assertEquals(contract, outboundWire.getServiceContract());
- assertEquals(binding, outboundWire.getContainer());
assertEquals(uri, outboundWire.getUri());
}
@@ -207,12 +205,10 @@
InboundWire inboundWire = binding.getInboundWire();
assertEquals(1, inboundWire.getInvocationChains().size());
assertEquals(contract, inboundWire.getServiceContract());
- assertEquals(binding, inboundWire.getContainer());
assertEquals(uri, inboundWire.getUri());
OutboundWire outboundWire = binding.getOutboundWire();
assertEquals(1, outboundWire.getInvocationChains().size());
assertEquals(contract, outboundWire.getServiceContract());
- assertEquals(binding, outboundWire.getContainer());
assertEquals(uri, outboundWire.getUri());
assertEquals(1, outboundWire.getTargetCallbackInvocationChains().size());
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerSerializationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerSerializationTestCase.java?view=diff&rev=507084&r1=507083&r2=507084
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerSerializationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerSerializationTestCase.java Tue Feb 13 08:47:56 2007
@@ -91,7 +91,6 @@
contract.setInteractionScope(InteractionScope.NONCONVERSATIONAL);
operation.setServiceContract(opContract);
map.put(operation, createChain(operation));
- EasyMock.expect(wire.getContainer()).andReturn(container).atLeastOnce();
EasyMock.expect(wire.getServiceContract()).andReturn(contract).atLeastOnce();
URI uri = URI.create("#foo");
EasyMock.expect(wire.getUri()).andReturn(uri).atLeastOnce();
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=507084&r1=507083&r2=507084
==============================================================================
--- 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 Tue Feb 13 08:47:56 2007
@@ -100,7 +100,6 @@
expect(outboundWire.getInvocationChains()).andReturn(outboundChains).anyTimes();
URI uri = URI.create("fooRef");
expect(outboundWire.getUri()).andReturn(uri).atLeastOnce();
- expect(outboundWire.getContainer()).andReturn(null).anyTimes();
expect(outboundWire.getServiceContract()).andReturn(outboundContract).anyTimes();
replay(outboundWire);
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/Connector.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/Connector.java?view=diff&rev=507084&r1=507083&r2=507084
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/Connector.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/Connector.java Tue Feb 13 08:47:56 2007
@@ -41,12 +41,12 @@
/**
* Bridges the invocation chains associated with an inbound and outbound wire.
*
+ * @param source the inbound wire source
* @param inbound the wire to bridge from
* @param outbound the target wire
- * @param optimizable if the bridge may be optimized
- * @throws WiringException
+ * @param optimizable if the bridge may be optimized @throws WiringException
*/
- void connect(InboundWire inbound, OutboundWire outbound, boolean optimizable)
+ void connect(SCAObject source, InboundWire inbound, SCAObject target, OutboundWire outbound, boolean optimizable)
throws WiringException;
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/InboundWire.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/InboundWire.java?view=diff&rev=507084&r1=507083&r2=507084
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/InboundWire.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/InboundWire.java Tue Feb 13 08:47:56 2007
@@ -22,6 +22,7 @@
import java.net.URI;
import org.apache.tuscany.spi.model.Operation;
+import org.apache.tuscany.spi.component.AtomicComponent;
/**
* Implementations are responsible for managing the inbound side of a wire, including the invocation chains associated
@@ -76,4 +77,9 @@
* Set when a wire can be optimized; that is when no handlers or interceptors exist on either end
*/
void setTargetWire(OutboundWire wire);
+
+ /**
+ * @deprecated
+ */
+ public void setComponent(AtomicComponent container);
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/Wire.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/Wire.java?view=diff&rev=507084&r1=507083&r2=507084
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/Wire.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/Wire.java Tue Feb 13 08:47:56 2007
@@ -21,7 +21,6 @@
import java.net.URI;
import javax.xml.namespace.QName;
-import org.apache.tuscany.spi.component.SCAObject;
import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.spi.model.ServiceContract;
@@ -85,15 +84,4 @@
*/
void setOptimizable(boolean optimizable);
- /**
- * Returns the SCAObject that contains this wire
- * @deprecated
- */
- SCAObject getContainer();
-
- /**
- * Sets the name of the SCAObject that contains this wire
- * @deprecated
- */
- void setContainer(SCAObject container);
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/WirePostProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/WirePostProcessor.java?view=diff&rev=507084&r1=507083&r2=507084
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/WirePostProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/WirePostProcessor.java Tue Feb 13 08:47:56 2007
@@ -18,6 +18,8 @@
*/
package org.apache.tuscany.spi.wire;
+import org.apache.tuscany.spi.component.SCAObject;
+
/**
* Implementations are called after inbound and outbound wires are decorated with policy and before they are connected.
*
@@ -29,12 +31,12 @@
* @param source
* @param target
*/
- void process(OutboundWire source, InboundWire target);
+ void process(SCAObject source, OutboundWire sourceWire, SCAObject target, InboundWire targetWire);
/**
* @param source
* @param target
*/
- void process(InboundWire source, OutboundWire target);
+ void process(SCAObject source, InboundWire sourceWire, SCAObject target, OutboundWire targetWire);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org