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/17 09:35:25 UTC
svn commit: r508732 [8/8] - in /incubator/tuscany/java/sca:
kernel/core/src/main/java/org/apache/tuscany/core/binding/local/
kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/
kernel/core/src/main/java/org/apache/tuscany/core/builder/ kernel/...
Modified: incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/CompositeComponentExtensionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/CompositeComponentExtensionTestCase.java?view=diff&rev=508732&r1=508731&r2=508732
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/CompositeComponentExtensionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/CompositeComponentExtensionTestCase.java Sat Feb 17 00:35:19 2007
@@ -19,23 +19,15 @@
package org.apache.tuscany.spi.extension;
import java.net.URI;
-import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
-import java.util.Map;
-import javax.xml.namespace.QName;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.Reference;
-import org.apache.tuscany.spi.component.ReferenceBinding;
import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.component.Service;
-import org.apache.tuscany.spi.component.ServiceBinding;
import org.apache.tuscany.spi.component.TargetInvokerCreationException;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.ServiceContract;
-import org.apache.tuscany.spi.wire.InboundWire;
-import org.apache.tuscany.spi.wire.OutboundWire;
import org.apache.tuscany.spi.wire.TargetInvoker;
import org.apache.tuscany.spi.wire.Wire;
@@ -49,190 +41,36 @@
private CompositeComponent composite;
private ServiceContract<?> contract;
- public void testDefaultInboundWire() throws Exception {
- InboundWire wire = EasyMock.createMock(InboundWire.class);
- EasyMock.expect(wire.getServiceContract()).andReturn(contract).atLeastOnce();
- EasyMock.expect(wire.getBindingType()).andReturn(Wire.LOCAL_BINDING).atLeastOnce();
- EasyMock.replay(wire);
- ServiceBinding binding = EasyMock.createMock(ServiceBinding.class);
- EasyMock.expect(binding.getInboundWire()).andReturn(wire).atLeastOnce();
- EasyMock.replay(binding);
+ public void testGetService() throws Exception {
Service service = EasyMock.createMock(Service.class);
EasyMock.expect(service.getUri()).andReturn(URI.create("composite#service")).atLeastOnce();
- service.getServiceBindings();
- List<ServiceBinding> bindings = new ArrayList<ServiceBinding>();
- bindings.add(binding);
- EasyMock.expectLastCall().andReturn(bindings).atLeastOnce();
EasyMock.replay(service);
composite.register(service);
- assertEquals(wire, composite.getInboundWire(null));
+ assertNotNull(composite.getService("service"));
}
- public void testNoLocalBinding() throws Exception {
- InboundWire wire = EasyMock.createMock(InboundWire.class);
- EasyMock.expect(wire.getServiceContract()).andReturn(contract).atLeastOnce();
- EasyMock.expect(wire.getBindingType()).andReturn(new QName("foo", "foo")).atLeastOnce();
- EasyMock.replay(wire);
- ServiceBinding binding = EasyMock.createMock(ServiceBinding.class);
- EasyMock.expect(binding.getInboundWire()).andReturn(wire).atLeastOnce();
- EasyMock.replay(binding);
+ public void testGetDefaultService() throws Exception {
Service service = EasyMock.createMock(Service.class);
EasyMock.expect(service.getUri()).andReturn(URI.create("composite#service")).atLeastOnce();
- service.getServiceBindings();
- List<ServiceBinding> bindings = new ArrayList<ServiceBinding>();
- bindings.add(binding);
- EasyMock.expectLastCall().andReturn(bindings).atLeastOnce();
EasyMock.replay(service);
composite.register(service);
- assertNull(composite.getInboundWire("service"));
+ assertNotNull(composite.getService(null));
}
- public void testMoreThanOneServiceGetDefault() throws Exception {
- Service service1 = EasyMock.createMock(Service.class);
- EasyMock.expect(service1.getUri()).andReturn(URI.create("#service1")).atLeastOnce();
- service1.getServiceBindings();
- EasyMock.expectLastCall().andReturn(Collections.emptyList()).atLeastOnce();
- EasyMock.replay(service1);
-
- Service service2 = EasyMock.createMock(Service.class);
- EasyMock.expect(service2.getUri()).andReturn(URI.create("#service2")).atLeastOnce();
- service2.getServiceBindings();
- EasyMock.expectLastCall().andReturn(Collections.emptyList()).atLeastOnce();
- EasyMock.replay(service2);
-
- composite.register(service1);
- composite.register(service2);
- assertNull(composite.getInboundWire(null));
- }
-
- public void testInboundWire() throws Exception {
- ServiceContract<Object> contract = new ServiceContract<Object>(Object.class) {
- };
- InboundWire wire = EasyMock.createMock(InboundWire.class);
- EasyMock.expect(wire.getBindingType()).andReturn(Wire.LOCAL_BINDING);
- wire.getServiceContract();
- EasyMock.expectLastCall().andReturn(contract).atLeastOnce();
- EasyMock.replay(wire);
- ServiceBinding binding = EasyMock.createMock(ServiceBinding.class);
- EasyMock.expect(binding.getInboundWire()).andReturn(wire).atLeastOnce();
- EasyMock.replay(binding);
-
- Service service = EasyMock.createMock(Service.class);
- EasyMock.expect(service.getUri()).andReturn(URI.create("composite#service")).atLeastOnce();
- List<ServiceBinding> bindings = new ArrayList<ServiceBinding>();
- bindings.add(binding);
- service.getServiceBindings();
- EasyMock.expectLastCall().andReturn(bindings).atLeastOnce();
- EasyMock.replay(service);
- composite.register(service);
- assertNotNull(composite.getInboundWire("service"));
- }
-
- public void testInboundWires() throws Exception {
- ServiceContract<Object> contract = new ServiceContract<Object>(Object.class) {
- };
- InboundWire wire = EasyMock.createMock(InboundWire.class);
- EasyMock.expect(wire.getBindingType()).andReturn(Wire.LOCAL_BINDING);
- wire.getServiceContract();
- EasyMock.expectLastCall().andReturn(contract).atLeastOnce();
- EasyMock.replay(wire);
- ServiceBinding binding = EasyMock.createMock(ServiceBinding.class);
- EasyMock.expect(binding.getInboundWire()).andReturn(wire).atLeastOnce();
- EasyMock.replay(binding);
-
- Service service = EasyMock.createMock(Service.class);
- EasyMock.expect(service.getUri()).andReturn(URI.create("composite#service")).atLeastOnce();
- List<ServiceBinding> bindings = new ArrayList<ServiceBinding>();
- bindings.add(binding);
- service.getServiceBindings();
- EasyMock.expectLastCall().andReturn(bindings).atLeastOnce();
- EasyMock.replay(service);
- composite.register(service);
- assertEquals(1, composite.getInboundWires().size());
- }
-
- public void testInboundWiresNonLocalBinding() throws Exception {
- ServiceContract<Object> contract = new ServiceContract<Object>(Object.class) {
- };
- InboundWire wire = EasyMock.createMock(InboundWire.class);
- EasyMock.expect(wire.getBindingType()).andReturn(new QName("foo", "foo"));
- wire.getServiceContract();
- EasyMock.expectLastCall().andReturn(contract).atLeastOnce();
- EasyMock.replay(wire);
- ServiceBinding binding = EasyMock.createMock(ServiceBinding.class);
- EasyMock.expect(binding.getInboundWire()).andReturn(wire).atLeastOnce();
- EasyMock.replay(binding);
-
- Service service = EasyMock.createMock(Service.class);
- EasyMock.expect(service.getUri()).andReturn(URI.create("composite#service")).atLeastOnce();
- List<ServiceBinding> bindings = new ArrayList<ServiceBinding>();
- bindings.add(binding);
- service.getServiceBindings();
- EasyMock.expectLastCall().andReturn(bindings).atLeastOnce();
- EasyMock.replay(service);
- composite.register(service);
- assertEquals(0, composite.getInboundWires().size());
- }
-
-
- public void testGetOutboundWires() throws Exception {
- ServiceContract<Object> contract = new ServiceContract<Object>(Object.class) {
- };
- InboundWire inboundWire = EasyMock.createMock(InboundWire.class);
- inboundWire.getServiceContract();
- EasyMock.expectLastCall().andReturn(contract).atLeastOnce();
- EasyMock.replay(inboundWire);
-
- OutboundWire outboundWire = EasyMock.createMock(OutboundWire.class);
- outboundWire.getServiceContract();
- EasyMock.expectLastCall().andReturn(contract).atLeastOnce();
- EasyMock.expect(outboundWire.getBindingType()).andReturn(Wire.LOCAL_BINDING);
- EasyMock.replay(outboundWire);
-
- ReferenceBinding binding = EasyMock.createMock(ReferenceBinding.class);
- EasyMock.expect(binding.getInboundWire()).andReturn(inboundWire).atLeastOnce();
- EasyMock.expect(binding.getOutboundWire()).andReturn(outboundWire).atLeastOnce();
- EasyMock.replay(binding);
+ public void testGetReference() throws Exception {
Reference reference = EasyMock.createMock(Reference.class);
- EasyMock.expect(reference.getUri()).andReturn(URI.create("composite#reference")).atLeastOnce();
- List<ReferenceBinding> bindings = new ArrayList<ReferenceBinding>();
- bindings.add(binding);
- EasyMock.expect(reference.getReferenceBindings()).andReturn(bindings).atLeastOnce();
+ EasyMock.expect(reference.getUri()).andReturn(URI.create("composite#service")).atLeastOnce();
EasyMock.replay(reference);
composite.register(reference);
- Map<String, List<OutboundWire>> wires = composite.getOutboundWires();
- assertEquals(1, wires.get("reference").size());
+ assertNotNull(composite.getReference("service"));
}
- public void testGetOutboundWiresWithNonLocalBinding() throws Exception {
- ServiceContract<Object> contract = new ServiceContract<Object>(Object.class) {
- };
- QName qName = new QName("foo", "foo");
- InboundWire inboundWire = EasyMock.createMock(InboundWire.class);
- EasyMock.expect(inboundWire.getBindingType()).andReturn(qName);
- inboundWire.getServiceContract();
- EasyMock.expectLastCall().andReturn(contract).atLeastOnce();
- EasyMock.replay(inboundWire);
-
- OutboundWire outboundWire = EasyMock.createMock(OutboundWire.class);
- outboundWire.getServiceContract();
- EasyMock.expectLastCall().andReturn(contract).atLeastOnce();
- EasyMock.expect(outboundWire.getBindingType()).andReturn(qName);
- EasyMock.replay(outboundWire);
-
- ReferenceBinding binding = EasyMock.createMock(ReferenceBinding.class);
- EasyMock.expect(binding.getInboundWire()).andReturn(inboundWire).atLeastOnce();
- EasyMock.expect(binding.getOutboundWire()).andReturn(outboundWire).atLeastOnce();
- EasyMock.replay(binding);
+ public void testDefaultReference() throws Exception {
Reference reference = EasyMock.createMock(Reference.class);
- EasyMock.expect(reference.getUri()).andReturn(URI.create("composite#reference")).atLeastOnce();
- List<ReferenceBinding> bindings = new ArrayList<ReferenceBinding>();
- bindings.add(binding);
- EasyMock.expect(reference.getReferenceBindings()).andReturn(bindings).atLeastOnce();
+ EasyMock.expect(reference.getUri()).andReturn(URI.create("composite#service")).atLeastOnce();
EasyMock.replay(reference);
composite.register(reference);
- Map<String, List<OutboundWire>> wires = composite.getOutboundWires();
- assertEquals(0, wires.get("reference").size());
+ assertNotNull(composite.getReference(null));
}
protected void setUp() throws Exception {
@@ -242,12 +80,28 @@
};
composite = new CompositeComponentExtension(new URI("foo"), null) {
- public TargetInvoker createTargetInvoker(String targetName, Operation operation, InboundWire callbackWire)
+ public TargetInvoker createTargetInvoker(String targetName, Operation operation)
throws TargetInvokerCreationException {
throw new UnsupportedOperationException();
}
public void setScopeContainer(ScopeContainer scopeContainer) {
+ throw new UnsupportedOperationException();
+ }
+
+ public List<Wire> getWires(String name) {
+ throw new UnsupportedOperationException();
+ }
+
+ public void attachWire(Wire wire) {
+ throw new UnsupportedOperationException();
+ }
+
+ public void attachWires(List<Wire> wires) {
+ throw new UnsupportedOperationException();
+ }
+
+ public void attachCallbackWire(Wire wire) {
throw new UnsupportedOperationException();
}
};
Modified: incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/TargetInvokerExtensionSequenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/TargetInvokerExtensionSequenceTestCase.java?view=diff&rev=508732&r1=508731&r2=508732
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/TargetInvokerExtensionSequenceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/TargetInvokerExtensionSequenceTestCase.java Sat Feb 17 00:35:19 2007
@@ -19,13 +19,13 @@
package org.apache.tuscany.spi.extension;
import java.lang.reflect.InvocationTargetException;
-import java.util.LinkedList;
import java.net.URI;
+import java.util.LinkedList;
import org.apache.tuscany.spi.component.WorkContext;
-import org.apache.tuscany.spi.wire.InboundWire;
import org.apache.tuscany.spi.wire.Message;
import org.apache.tuscany.spi.wire.MessageImpl;
+import org.apache.tuscany.spi.wire.Wire;
import junit.framework.TestCase;
import org.easymock.EasyMock;
@@ -38,19 +38,19 @@
@SuppressWarnings("unchecked")
public void testStart() {
URI from = URI.create("foo");
- InboundWire wire = EasyMock.createMock(InboundWire.class);
+ Wire wire = EasyMock.createMock(Wire.class);
EasyMock.replay(wire);
WorkContext context;
context = EasyMock.createMock(WorkContext.class);
- context.setCurrentCallbackRoutingChain(EasyMock.isA(LinkedList.class));
+ context.setCurrentCallbackUris(EasyMock.isA(LinkedList.class));
EasyMock.replay(context);
ExecutionMonitor monitor = EasyMock.createNiceMock(ExecutionMonitor.class);
Target target = EasyMock.createMock(Target.class);
target.invokeStart("test");
EasyMock.replay(target);
- Invoker invoker = new Invoker(wire, context, monitor, target);
+ Invoker invoker = new Invoker(context, monitor, target);
Message msg = new MessageImpl();
- msg.pushFromAddress(from);
+ msg.pushCallbackUri(from);
msg.setBody("test");
msg.setConversationSequence(Invoker.START);
invoker.invoke(msg);
@@ -62,19 +62,19 @@
@SuppressWarnings("unchecked")
public void testContinue() {
URI from = URI.create("foo");
- InboundWire wire = EasyMock.createMock(InboundWire.class);
+ Wire wire = EasyMock.createMock(Wire.class);
EasyMock.replay(wire);
WorkContext context;
context = EasyMock.createMock(WorkContext.class);
- context.setCurrentCallbackRoutingChain(EasyMock.isA(LinkedList.class));
+ context.setCurrentCallbackUris(EasyMock.isA(LinkedList.class));
EasyMock.replay(context);
ExecutionMonitor monitor = EasyMock.createNiceMock(ExecutionMonitor.class);
Target target = EasyMock.createMock(Target.class);
target.invokeContinue("test");
EasyMock.replay(target);
- Invoker invoker = new Invoker(wire, context, monitor, target);
+ Invoker invoker = new Invoker(context, monitor, target);
Message msg = new MessageImpl();
- msg.pushFromAddress(from);
+ msg.pushCallbackUri(from);
msg.setBody("test");
msg.setConversationSequence(Invoker.CONTINUE);
invoker.invoke(msg);
@@ -86,19 +86,19 @@
@SuppressWarnings("unchecked")
public void testEnd() {
URI from = URI.create("foo");
- InboundWire wire = EasyMock.createMock(InboundWire.class);
+ Wire wire = EasyMock.createMock(Wire.class);
EasyMock.replay(wire);
WorkContext context;
context = EasyMock.createMock(WorkContext.class);
- context.setCurrentCallbackRoutingChain(EasyMock.isA(LinkedList.class));
+ context.setCurrentCallbackUris(EasyMock.isA(LinkedList.class));
EasyMock.replay(context);
ExecutionMonitor monitor = EasyMock.createNiceMock(ExecutionMonitor.class);
Target target = EasyMock.createMock(Target.class);
target.invokeEnd("test");
EasyMock.replay(target);
- Invoker invoker = new Invoker(wire, context, monitor, target);
+ Invoker invoker = new Invoker(context, monitor, target);
Message msg = new MessageImpl();
- msg.pushFromAddress(from);
+ msg.pushCallbackUri(from);
msg.setBody("test");
msg.setConversationSequence(Invoker.END);
invoker.invoke(msg);
@@ -110,19 +110,19 @@
@SuppressWarnings("unchecked")
public void testNone() {
URI from = URI.create("foo");
- InboundWire wire = EasyMock.createMock(InboundWire.class);
+ Wire wire = EasyMock.createMock(Wire.class);
EasyMock.replay(wire);
WorkContext context;
context = EasyMock.createMock(WorkContext.class);
- context.setCurrentCallbackRoutingChain(EasyMock.isA(LinkedList.class));
+ context.setCurrentCallbackUris(EasyMock.isA(LinkedList.class));
EasyMock.replay(context);
ExecutionMonitor monitor = EasyMock.createNiceMock(ExecutionMonitor.class);
Target target = EasyMock.createMock(Target.class);
target.invokeNone("test");
EasyMock.replay(target);
- Invoker invoker = new Invoker(wire, context, monitor, target);
+ Invoker invoker = new Invoker(context, monitor, target);
Message msg = new MessageImpl();
- msg.pushFromAddress(from);
+ msg.pushCallbackUri(from);
msg.setBody("test");
invoker.invoke(msg);
EasyMock.verify(wire);
@@ -138,9 +138,8 @@
private class Invoker extends TargetInvokerExtension {
private Target target;
- public Invoker(InboundWire wire, WorkContext workContext, ExecutionMonitor monitor,
- TargetInvokerExtensionSequenceTestCase.Target target) {
- super(wire, workContext, monitor);
+ public Invoker(WorkContext workContext, ExecutionMonitor monitor, Target target) {
+ super(workContext, monitor);
this.target = target;
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/TargetInvokerExtensionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/TargetInvokerExtensionTestCase.java?view=diff&rev=508732&r1=508731&r2=508732
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/TargetInvokerExtensionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/TargetInvokerExtensionTestCase.java Sat Feb 17 00:35:19 2007
@@ -19,13 +19,13 @@
package org.apache.tuscany.spi.extension;
import java.lang.reflect.InvocationTargetException;
-import java.util.LinkedList;
import java.net.URI;
+import java.util.LinkedList;
import org.apache.tuscany.spi.component.WorkContext;
-import org.apache.tuscany.spi.wire.InboundWire;
import org.apache.tuscany.spi.wire.Message;
import org.apache.tuscany.spi.wire.MessageImpl;
+import org.apache.tuscany.spi.wire.Wire;
import junit.framework.TestCase;
import org.easymock.EasyMock;
@@ -38,19 +38,19 @@
@SuppressWarnings("unchecked")
public void testNonBlockingDispatch() {
URI from = URI.create("foo");
- InboundWire wire = EasyMock.createMock(InboundWire.class);
+ Wire wire = EasyMock.createMock(Wire.class);
EasyMock.replay(wire);
WorkContext context;
context = EasyMock.createMock(WorkContext.class);
- context.setCurrentCallbackRoutingChain(EasyMock.isA(LinkedList.class));
+ context.setCurrentCallbackUris(EasyMock.isA(LinkedList.class));
EasyMock.replay(context);
ExecutionMonitor monitor = EasyMock.createNiceMock(ExecutionMonitor.class);
Target target = EasyMock.createMock(Target.class);
target.invoke("test");
EasyMock.replay(target);
- Invoker invoker = new Invoker(wire, context, monitor, target);
+ Invoker invoker = new Invoker(context, monitor, target);
Message msg = new MessageImpl();
- msg.pushFromAddress(from);
+ msg.pushCallbackUri(from);
msg.setBody("test");
invoker.invoke(msg);
EasyMock.verify(wire);
@@ -66,8 +66,8 @@
private class Invoker extends TargetInvokerExtension {
private Target target;
- public Invoker(InboundWire wire, WorkContext workContext, ExecutionMonitor monitor, Target target) {
- super(wire, workContext, monitor);
+ public Invoker(WorkContext workContext, ExecutionMonitor monitor, Target target) {
+ super(workContext, monitor);
this.target = target;
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/policy/SourcePolicyBuilderExtensionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/policy/SourcePolicyBuilderExtensionTestCase.java?view=diff&rev=508732&r1=508731&r2=508732
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/policy/SourcePolicyBuilderExtensionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/policy/SourcePolicyBuilderExtensionTestCase.java Sat Feb 17 00:35:19 2007
@@ -21,13 +21,14 @@
import org.apache.tuscany.spi.builder.BuilderException;
import org.apache.tuscany.spi.model.ReferenceDefinition;
import static org.apache.tuscany.spi.policy.PolicyBuilderRegistry.EXTENSION;
-import org.apache.tuscany.spi.wire.OutboundWire;
+import org.apache.tuscany.spi.wire.Wire;
import junit.framework.TestCase;
import org.easymock.EasyMock;
/**
* @version $Rev$ $Date$
+ * @deprecated
*/
public class SourcePolicyBuilderExtensionTestCase extends TestCase {
@@ -43,7 +44,7 @@
private static class MockPolicyBuilderExtension extends SourcePolicyBuilderExtension {
- public void build(ReferenceDefinition definition, OutboundWire wire) throws BuilderException {
+ public void build(ReferenceDefinition definition, Wire wire) throws BuilderException {
}
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/policy/TargetPolicyBuilderExtensionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/policy/TargetPolicyBuilderExtensionTestCase.java?view=diff&rev=508732&r1=508731&r2=508732
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/policy/TargetPolicyBuilderExtensionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/policy/TargetPolicyBuilderExtensionTestCase.java Sat Feb 17 00:35:19 2007
@@ -21,7 +21,7 @@
import org.apache.tuscany.spi.builder.BuilderException;
import org.apache.tuscany.spi.model.ServiceDefinition;
import static org.apache.tuscany.spi.policy.PolicyBuilderRegistry.EXTENSION;
-import org.apache.tuscany.spi.wire.InboundWire;
+import org.apache.tuscany.spi.wire.Wire;
import junit.framework.TestCase;
import org.easymock.EasyMock;
@@ -43,7 +43,7 @@
private static class MockPolicyBuilderExtension extends TargetPolicyBuilderExtension {
- public void build(ServiceDefinition definition, InboundWire wire) throws BuilderException {
+ public void build(ServiceDefinition definition, Wire wire) throws BuilderException {
}
}
Copied: incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/wire/AbstractInvocationHandlerTestCase.java (from r507339, incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/wire/AbstractOutboundInvocationHandlerTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/wire/AbstractInvocationHandlerTestCase.java?view=diff&rev=508732&p1=incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/wire/AbstractOutboundInvocationHandlerTestCase.java&r1=507339&p2=incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/wire/AbstractInvocationHandlerTestCase.java&r2=508732
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/wire/AbstractOutboundInvocationHandlerTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/wire/AbstractInvocationHandlerTestCase.java Sat Feb 17 00:35:19 2007
@@ -2,8 +2,8 @@
import java.lang.reflect.Array;
import java.lang.reflect.InvocationTargetException;
-import java.util.LinkedList;
import java.net.URI;
+import java.util.LinkedList;
import junit.framework.TestCase;
import org.easymock.EasyMock;
@@ -11,14 +11,14 @@
/**
* @version $Rev$ $Date$
*/
-public class AbstractOutboundInvocationHandlerTestCase extends TestCase {
+public class AbstractInvocationHandlerTestCase extends TestCase {
public void testInvocation() throws Throwable {
InvocationHandler handler = new InvocationHandler();
Interceptor interceptor = new MockInterceptor();
TargetInvoker invoker = EasyMock.createMock(TargetInvoker.class);
EasyMock.replay(invoker);
- OutboundInvocationChain chain = EasyMock.createMock(OutboundInvocationChain.class);
+ InvocationChain chain = EasyMock.createMock(InvocationChain.class);
EasyMock.expect(chain.getHeadInterceptor()).andReturn(interceptor);
EasyMock.replay(chain);
Object resp = handler.invoke(chain, invoker, new String[]{"foo"}, null, new LinkedList<URI>());
@@ -28,7 +28,7 @@
public void testShortCircuitInvocation() throws Throwable {
InvocationHandler handler = new InvocationHandler();
TargetInvoker invoker = new MockInvoker();
- OutboundInvocationChain chain = EasyMock.createMock(OutboundInvocationChain.class);
+ InvocationChain chain = EasyMock.createMock(InvocationChain.class);
EasyMock.expect(chain.getHeadInterceptor()).andReturn(null);
EasyMock.expect(chain.getTargetInvoker()).andReturn(invoker);
EasyMock.replay(chain);
@@ -66,7 +66,7 @@
}
}
- private class InvocationHandler extends AbstractOutboundInvocationHandler {
+ private class InvocationHandler extends AbstractInvocationHandler {
protected URI getFromAddress() {
return URI.create("from");
@@ -80,7 +80,7 @@
assertNotNull(msg.getCorrelationId());
assertNotNull(msg.getTargetInvoker());
assertNotNull(msg.getMessageId());
- assertNotNull(msg.getCallbackRoutingChain());
+ assertNotNull(msg.getCallbackUris());
assertEquals("foo", Array.get(msg.getBody(), 0));
msg.setBody("response");
return msg;
Propchange: incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/wire/AbstractInvocationHandlerTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/wire/AbstractInvocationHandlerTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/wire/ChainHolderTestCase.java (from r507339, incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/wire/OutboundChainHolderTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/wire/ChainHolderTestCase.java?view=diff&rev=508732&p1=incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/wire/OutboundChainHolderTestCase.java&r1=507339&p2=incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/wire/ChainHolderTestCase.java&r2=508732
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/wire/OutboundChainHolderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/wire/ChainHolderTestCase.java Sat Feb 17 00:35:19 2007
@@ -24,12 +24,12 @@
/**
* @version $Rev$ $Date$
*/
-public class OutboundChainHolderTestCase extends TestCase {
+public class ChainHolderTestCase extends TestCase {
public void testClone() {
- OutboundInvocationChain chain = EasyMock.createMock(OutboundInvocationChain.class);
+ InvocationChain chain = EasyMock.createMock(InvocationChain.class);
EasyMock.replay(chain);
- OutboundChainHolder holder = new OutboundChainHolder(chain);
+ ChainHolder holder = new ChainHolder(chain);
assertNotNull(holder.clone());
}
}
Propchange: incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/wire/ChainHolderTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/wire/ChainHolderTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenEmbeddedRuntime.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenEmbeddedRuntime.java?view=diff&rev=508732&r1=508731&r2=508732
==============================================================================
--- incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenEmbeddedRuntime.java (original)
+++ incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/MavenEmbeddedRuntime.java Sat Feb 17 00:35:19 2007
@@ -63,7 +63,7 @@
public void executeTest(URI componentId, Operation<?> operation) throws Exception {
Component testComponent = getComponentManager().getComponent(componentId);
- TargetInvoker targetInvoker = testComponent.createTargetInvoker("testService", operation, null);
+ TargetInvoker targetInvoker = testComponent.createTargetInvoker("testService", operation);
targetInvoker.invokeTarget(null, TargetInvoker.NONE);
}
}
Modified: incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/implementation/webapp/WebappComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/implementation/webapp/WebappComponent.java?view=diff&rev=508732&r1=508731&r2=508732
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/implementation/webapp/WebappComponent.java (original)
+++ incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/implementation/webapp/WebappComponent.java Sat Feb 17 00:35:19 2007
@@ -19,6 +19,7 @@
package org.apache.tuscany.runtime.webapp.implementation.webapp;
import java.net.URI;
+import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import javax.servlet.ServletContext;
@@ -35,10 +36,10 @@
import org.apache.tuscany.spi.extension.ExecutionMonitor;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.services.work.WorkScheduler;
-import org.apache.tuscany.spi.wire.InboundWire;
import org.apache.tuscany.spi.wire.TargetInvoker;
+import org.apache.tuscany.spi.wire.Wire;
import org.apache.tuscany.spi.wire.WireService;
-import org.apache.tuscany.spi.wire.OutboundWire;
+
import org.apache.tuscany.core.wire.WireObjectFactory;
import org.apache.tuscany.core.component.ComponentContextProvider;
import org.apache.tuscany.core.component.ComponentContextImpl;
@@ -51,7 +52,7 @@
public class WebappComponent extends AtomicComponentExtension implements ComponentContextProvider {
private final Map<String, ObjectFactory<?>> propertyFactories;
private final Map<String, Class<?>> referenceTypes;
- private final Map<String, OutboundWire> referenceFactories;
+ private final Map<String, Wire> referenceFactories;
private final ComponentContext context;
public WebappComponent(URI name,
@@ -64,16 +65,28 @@
super(name, wireService, workContext, workScheduler, monitor, 0, 0, 0);
this.propertyFactories = attributes;
this.referenceTypes = referenceTypes;
- referenceFactories = new ConcurrentHashMap<String, OutboundWire>(referenceTypes.size());
+ referenceFactories = new ConcurrentHashMap<String, Wire>(referenceTypes.size());
context = new ComponentContextImpl(this);
}
- protected void onReferenceWire(OutboundWire wire) {
+ public List<Wire> getWires(String name) {
+ throw new UnsupportedOperationException();
+ }
+
+ public void attachCallbackWire(Wire wire) {
+ throw new UnsupportedOperationException();
+ }
+
+ public void attachWire(Wire wire) {
String name = wire.getSourceUri().getFragment();
referenceFactories.put(name, wire);
}
- protected <B> ObjectFactory<B> createWireFactory(Class<B> interfaze, OutboundWire wire) {
+ public void attachWires(List<Wire> wires) {
+ throw new UnsupportedOperationException();
+ }
+
+ protected <B> ObjectFactory<B> createWireFactory(Class<B> interfaze, Wire wire) {
return new WireObjectFactory<B>(interfaze, wire, wireService);
}
@@ -82,18 +95,18 @@
for (Map.Entry<String, ObjectFactory<?>> entry : propertyFactories.entrySet()) {
servletContext.setAttribute(entry.getKey(), entry.getValue().getInstance());
}
- for (Map.Entry<String, OutboundWire> entry : referenceFactories.entrySet()) {
+ for (Map.Entry<String, Wire> entry : referenceFactories.entrySet()) {
String name = entry.getKey();
- OutboundWire wire = entry.getValue();
+ Wire wire = entry.getValue();
Class<?> type = referenceTypes.get(name);
ObjectFactory<?> factory = createWireFactory(type, wire);
servletContext.setAttribute(name, factory.getInstance());
}
}
- public TargetInvoker createTargetInvoker(String targetName,
- Operation operation,
- InboundWire callbackWire) throws TargetInvokerCreationException {
+
+ public TargetInvoker createTargetInvoker(String targetName, Operation operation)
+ throws TargetInvokerCreationException {
throw new UnsupportedOperationException();
}
@@ -120,7 +133,7 @@
}
public <B> B getService(Class<B> type, String name) {
- OutboundWire wire = referenceFactories.get(name);
+ Wire wire = referenceFactories.get(name);
if (wire == null) {
return null;
}
@@ -129,7 +142,7 @@
}
public <B> ServiceReference<B> getServiceReference(Class<B> type, String name) {
- OutboundWire wire = referenceFactories.get(name);
+ Wire wire = referenceFactories.get(name);
if (wire == null) {
return null;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org