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/05/30 01:47:53 UTC
svn commit: r410164 [1/4] - in /incubator/tuscany/sandbox/jboynes/sca:
containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/
containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/
containers/container.ja...
Author: jmarino
Date: Mon May 29 16:47:49 2006
New Revision: 410164
URL: http://svn.apache.org/viewvc?rev=410164&view=rev
Log:
start move to inbound-outbound wiring; more changes coming
Added:
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/wire/SystemInboundAutowire.java
- copied, changed from r410152, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/wire/SystemServiceAutowire.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/wire/SystemInboundWire.java
- copied, changed from r410152, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/wire/SystemServiceWire.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/wire/SystemOutboundAutowire.java
- copied, changed from r410152, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/wire/SystemReferenceAutowire.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/wire/SystemOutboundWire.java
- copied, changed from r410152, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/wire/SystemReferenceWire.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/InboundInvocationChainImpl.java
- copied, changed from r410151, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/ServiceInvocationChainImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/OutboundAutowire.java
- copied, changed from r410151, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/ReferenceAutowire.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/OutboundInvocationChainImpl.java
- copied, changed from r410151, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/ReferenceInvocationChainImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInboundWire.java
- copied, changed from r410152, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/jdk/JDKServiceWire.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/jdk/JDKOutboundWire.java
- copied, changed from r410152, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/jdk/JDKReferenceWire.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/builder/OutboundToInboundConnectTestCase.java
- copied, changed from r410152, incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/builder/ReferenceToServiceConnectTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/builder/ReferenceToReferenceConnectTestCase.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/InboundInvocationChain.java
- copied, changed from r410151, incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/ServiceInvocationChain.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/InboundWire.java (contents, props changed)
- copied, changed from r410152, incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/ServiceWire.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/OutboundInvocationChain.java
- copied, changed from r410151, incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/ReferenceInvocationChain.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/OutboundWire.java (contents, props changed)
- copied, changed from r410152, incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/ReferenceWire.java
Removed:
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/wire/SystemReferenceAutowire.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/wire/SystemReferenceWire.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/wire/SystemServiceAutowire.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/wire/SystemServiceWire.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/ReferenceAutowire.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/ReferenceInvocationChainImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/ServiceInvocationChainImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/jdk/JDKReferenceWire.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/jdk/JDKServiceWire.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/builder/ReferenceToServiceConnectTestCase.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/ReferenceInvocationChain.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/ReferenceWire.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/ServiceInvocationChain.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/ServiceWire.java
Modified:
incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicContext.java
incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/WireTestCase.java
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/JavaAtomicContext.java
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/GetServiceByNameTestCase.java
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/JavaReferenceWireTestCase.java
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/context/ServiceToJavaTestCase.java
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockContextFactory.java
incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/SpringCompositeBuilder.java
incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/ServiceInvocationTestCase.java
incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/SpringCompositeBuilderTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/Connector.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/PojoAtomicContext.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/WireObjectFactory.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/policy/PolicyBuilderRegistryImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/policy/async/AsyncPolicyBuilder.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemBindingBuilder.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemComponentBuilder.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemReferenceContextImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemServiceContextImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemSingletonAtomicContext.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/BridgingHandler.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/BridgingInterceptor.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireFactoryService.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/system/WireServiceImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/builder/ServiceToServiceConnectTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/builder/SystemBuildersTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockContextFactory.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/AtomicContextWireInvocationTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/ReferenceWireTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/ServiceContextToAtomicContextTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/SystemServiceWireTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/InvocationConfigurationErrorTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/InvocationConfigurationTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/InvocationErrorTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/jdk/JDKSourceInvocationHandlerTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/jdk/JDKWireOptimizationTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/jdk/WireTestCase.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/ComponentContext.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/ReferenceContext.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/context/ServiceContext.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicContextExtension.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeContextExtension.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceContextExtension.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ServiceContextExtension.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/policy/PolicyBuilderRegistry.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/policy/SourcePolicyBuilder.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/policy/TargetPolicyBuilder.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/ReferenceInvocationHandler.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/ServiceInvocationHandler.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireFactoryService.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireService.java
incubator/tuscany/sandbox/jboynes/sca/test/src/main/java/org/apache/tuscany/test/ArtifactFactory.java
Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicContext.java?rev=410164&r1=410163&r2=410164&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicContext.java Mon May 29 16:47:49 2006
@@ -30,9 +30,9 @@
import org.apache.tuscany.spi.context.ScopeContext;
import org.apache.tuscany.spi.extension.AtomicContextExtension;
import org.apache.tuscany.spi.model.Scope;
-import org.apache.tuscany.spi.wire.ReferenceWire;
+import org.apache.tuscany.spi.wire.OutboundWire;
import org.apache.tuscany.spi.wire.TargetInvoker;
-import org.apache.tuscany.spi.wire.ServiceWire;
+import org.apache.tuscany.spi.wire.InboundWire;
import org.codehaus.groovy.control.CompilationFailedException;
/**
@@ -76,8 +76,8 @@
injector.inject(object);
}
// inject wires
- for (List<ReferenceWire> referenceWires : getReferenceWires().values()) {
- for (ReferenceWire<?> wire : referenceWires) {
+ for (List<OutboundWire> referenceWires : getReferenceWires().values()) {
+ for (OutboundWire<?> wire : referenceWires) {
object.setProperty(wire.getReferenceName(), wire.getTargetService());
}
}
@@ -103,7 +103,7 @@
}
public Object getService(String service) throws TargetException {
- ServiceWire<?> wire = getServiceWire(service);
+ InboundWire<?> wire = getServiceWire(service);
if (wire == null) {
TargetException e = new TargetException("Service not found"); // TODO better error message
e.setIdentifier(service);
Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/WireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/WireTestCase.java?rev=410164&r1=410163&r2=410164&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/WireTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/WireTestCase.java Mon May 29 16:47:49 2006
@@ -6,9 +6,9 @@
import org.apache.tuscany.container.groovy.mock.Greeting;
import org.apache.tuscany.core.context.scope.ModuleScopeContext;
import org.apache.tuscany.spi.model.Scope;
-import org.apache.tuscany.spi.wire.ReferenceWire;
+import org.apache.tuscany.spi.wire.OutboundWire;
import org.apache.tuscany.spi.wire.TargetInvoker;
-import org.apache.tuscany.spi.wire.ServiceWire;
+import org.apache.tuscany.spi.wire.InboundWire;
import org.jmock.Mock;
import org.jmock.MockObjectTestCase;
import org.jmock.core.Invocation;
@@ -45,7 +45,7 @@
GroovyAtomicContext<Greeting> context = new GroovyAtomicContext<Greeting>("source", SCRIPT, services,
Scope.MODULE, null, null, scope);
scope.register(context);
- Mock mock = mock(ReferenceWire.class);
+ Mock mock = mock(OutboundWire.class);
mock.expects(atLeastOnce()).method("getTargetService").will(
returnValue(new Greeting() {
public String greet(String name) {
@@ -53,7 +53,7 @@
}
}));
mock.expects(atLeastOnce()).method("getReferenceName").will(returnValue("wire"));
- ReferenceWire<Greeting> wire = (ReferenceWire<Greeting>) mock.proxy();
+ OutboundWire<Greeting> wire = (OutboundWire<Greeting>) mock.proxy();
context.addReferenceWire(wire);
Greeting greeting = context.getService();
assertEquals("foo", greeting.greet("foo"));
@@ -89,7 +89,7 @@
final GroovyAtomicContext<Greeting> context = new GroovyAtomicContext<Greeting>("source", SCRIPT2,
services, Scope.MODULE, null, null, scope);
scope.register(context);
- Mock mock = mock(ServiceWire.class);
+ Mock mock = mock(InboundWire.class);
mock.stubs().method("getServiceName").will(returnValue("Greeting"));
mock.expects(atLeastOnce()).method("getTargetService").will(
new Stub() {
@@ -102,7 +102,7 @@
}
});
- ServiceWire<Greeting> wire = (ServiceWire<Greeting>) mock.proxy();
+ InboundWire<Greeting> wire = (InboundWire<Greeting>) mock.proxy();
context.addServiceWire(wire);
Greeting greeting = (Greeting) context.getService("Greeting");
assertEquals("foo", greeting.greet("foo"));
Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/JavaAtomicContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/JavaAtomicContext.java?rev=410164&r1=410163&r2=410164&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/JavaAtomicContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/JavaAtomicContext.java Mon May 29 16:47:49 2006
@@ -31,7 +31,7 @@
import org.apache.tuscany.spi.context.TargetNotFoundException;
import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.wire.TargetInvoker;
-import org.apache.tuscany.spi.wire.ServiceWire;
+import org.apache.tuscany.spi.wire.InboundWire;
/**
* Provides a runtime context for Java component implementations
@@ -56,7 +56,7 @@
}
public Object getService(String name) throws TargetException {
- ServiceWire<?> wire = serviceWires.get(name);
+ InboundWire<?> wire = serviceWires.get(name);
if (wire == null){
TargetNotFoundException e = new TargetNotFoundException(name);
e.addContextName(getName());
Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/GetServiceByNameTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/GetServiceByNameTestCase.java?rev=410164&r1=410163&r2=410164&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/GetServiceByNameTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/GetServiceByNameTestCase.java Mon May 29 16:47:49 2006
@@ -7,7 +7,7 @@
import org.apache.tuscany.container.java.mock.components.TargetImpl;
import org.apache.tuscany.core.context.scope.ModuleScopeContext;
import org.apache.tuscany.spi.model.Scope;
-import org.apache.tuscany.spi.wire.ServiceWire;
+import org.apache.tuscany.spi.wire.InboundWire;
import org.jmock.Mock;
import org.jmock.MockObjectTestCase;
@@ -22,11 +22,11 @@
final JavaAtomicContext<?> context =
MockContextFactory.createJavaAtomicContext("target", scope, TargetImpl.class, Target.class, Scope.MODULE);
- Mock mock = mock(ServiceWire.class);
+ Mock mock = mock(InboundWire.class);
mock.stubs().method("getServiceName").will(returnValue("Target"));
mock.stubs().method("getInvocationChains").will(returnValue(Collections.emptyMap()));
- ServiceWire<Target> wire = (ServiceWire<Target>) mock.proxy();
+ InboundWire<Target> wire = (InboundWire<Target>) mock.proxy();
context.addServiceWire(wire);
context.prepare();
context.start();
Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/JavaReferenceWireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/JavaReferenceWireTestCase.java?rev=410164&r1=410163&r2=410164&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/JavaReferenceWireTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/JavaReferenceWireTestCase.java Mon May 29 16:47:49 2006
@@ -10,7 +10,7 @@
import org.apache.tuscany.container.java.mock.components.Target;
import org.apache.tuscany.container.java.mock.components.TargetImpl;
import org.apache.tuscany.core.context.scope.ModuleScopeContext;
-import org.apache.tuscany.spi.wire.ReferenceWire;
+import org.apache.tuscany.spi.wire.OutboundWire;
import org.jmock.Mock;
import org.jmock.MockObjectTestCase;
@@ -31,10 +31,10 @@
SourceImpl.class, Source.class,
scope.getScope(), false, null, null, null, members);
- Mock mock = mock(ReferenceWire.class);
+ Mock mock = mock(OutboundWire.class);
mock.expects(atLeastOnce()).method("getTargetService").will(returnValue(target));
mock.expects(atLeastOnce()).method("getReferenceName").will(returnValue("target"));
- ReferenceWire<Target> wire = (ReferenceWire<Target>) mock.proxy();
+ OutboundWire<Target> wire = (OutboundWire<Target>) mock.proxy();
sourceContext.addReferenceWire(wire);
sourceContext.start();
Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/context/ServiceToJavaTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/context/ServiceToJavaTestCase.java?rev=410164&r1=410163&r2=410164&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/context/ServiceToJavaTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/context/ServiceToJavaTestCase.java Mon May 29 16:47:49 2006
@@ -26,15 +26,15 @@
import org.apache.tuscany.core.system.context.SystemCompositeContext;
import org.apache.tuscany.core.system.context.SystemCompositeContextImpl;
import org.apache.tuscany.core.util.MethodHashMap;
-import org.apache.tuscany.core.wire.ServiceInvocationChainImpl;
-import org.apache.tuscany.core.wire.jdk.JDKServiceWire;
+import org.apache.tuscany.core.wire.InboundInvocationChainImpl;
+import org.apache.tuscany.core.wire.jdk.JDKInboundWire;
import org.apache.tuscany.spi.context.AtomicContext;
import org.apache.tuscany.spi.context.CompositeContext;
import org.apache.tuscany.spi.context.ScopeContext;
import org.apache.tuscany.spi.context.WorkContext;
import org.apache.tuscany.spi.extension.ServiceContextExtension;
-import org.apache.tuscany.spi.wire.ServiceInvocationChain;
-import org.apache.tuscany.spi.wire.ServiceWire;
+import org.apache.tuscany.spi.wire.InboundInvocationChain;
+import org.apache.tuscany.spi.wire.InboundWire;
/**
* Validates wiring from a service context to Java atomic contexts by scope
@@ -161,15 +161,15 @@
@SuppressWarnings("unchecked")
private void setupComposite(CompositeContext<?> parent, ScopeContext scope) throws NoSuchMethodException {
Connector connector = new ConnectorImpl();
- ServiceWire<Target> sourceWire = createServiceWire("target", Target.class);
+ InboundWire<Target> sourceWire = createServiceWire("target", Target.class);
sourceWire.setServiceName("Target");
ServiceContextExtension<Target> serviceContext = new ServiceContextExtension<Target>("service", sourceWire, parent);
AtomicContext<?> atomicContext = MockContextFactory.createJavaAtomicContext("target", scope, TargetImpl.class, Target.class, scope.getScope());
- ServiceWire targetWire = MockContextFactory.createTargetWire("Target", Target.class);
+ InboundWire targetWire = MockContextFactory.createTargetWire("Target", Target.class);
atomicContext.addServiceWire(targetWire);
parent.registerContext(serviceContext);
parent.registerContext(atomicContext);
- connector.connect(serviceContext.getWire(), atomicContext);
+ connector.connect(serviceContext.getInboundWire(), atomicContext);
}
protected void setUp() throws Exception {
@@ -178,19 +178,19 @@
parent = new SystemCompositeContextImpl(null, null, null);
}
- public static <T> ServiceWire<T> createServiceWire(String serviceName, Class<T> interfaze) {
- ServiceWire<T> wire = new JDKServiceWire<T>();
+ public static <T> InboundWire<T> createServiceWire(String serviceName, Class<T> interfaze) {
+ InboundWire<T> wire = new JDKInboundWire<T>();
wire.setBusinessInterface(interfaze);
wire.setServiceName(serviceName);
wire.addInvocationChains(createServiceInvocationChains(interfaze));
return wire;
}
- private static Map<Method, ServiceInvocationChain> createServiceInvocationChains(Class<?> interfaze) {
- Map<Method, ServiceInvocationChain> invocations = new MethodHashMap<ServiceInvocationChain>();
+ private static Map<Method, InboundInvocationChain> createServiceInvocationChains(Class<?> interfaze) {
+ Map<Method, InboundInvocationChain> invocations = new MethodHashMap<InboundInvocationChain>();
Method[] methods = interfaze.getMethods();
for (Method method : methods) {
- ServiceInvocationChain chain = new ServiceInvocationChainImpl(method);
+ InboundInvocationChain chain = new InboundInvocationChainImpl(method);
invocations.put(method, chain);
}
return invocations;
Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockContextFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockContextFactory.java?rev=410164&r1=410163&r2=410164&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockContextFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockContextFactory.java Mon May 29 16:47:49 2006
@@ -16,10 +16,10 @@
import org.apache.tuscany.core.util.MethodHashMap;
import org.apache.tuscany.core.wire.InvokerInterceptor;
import org.apache.tuscany.core.wire.MessageChannelImpl;
-import org.apache.tuscany.core.wire.ReferenceInvocationChainImpl;
-import org.apache.tuscany.core.wire.ServiceInvocationChainImpl;
-import org.apache.tuscany.core.wire.jdk.JDKReferenceWire;
-import org.apache.tuscany.core.wire.jdk.JDKServiceWire;
+import org.apache.tuscany.core.wire.OutboundInvocationChainImpl;
+import org.apache.tuscany.core.wire.InboundInvocationChainImpl;
+import org.apache.tuscany.core.wire.jdk.JDKOutboundWire;
+import org.apache.tuscany.core.wire.jdk.JDKInboundWire;
import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.spi.builder.BuilderConfigException;
@@ -28,11 +28,11 @@
import org.apache.tuscany.spi.context.CompositeContext;
import org.apache.tuscany.spi.wire.Interceptor;
import org.apache.tuscany.spi.wire.MessageHandler;
-import org.apache.tuscany.spi.wire.ReferenceInvocationChain;
-import org.apache.tuscany.spi.wire.ReferenceWire;
-import org.apache.tuscany.spi.wire.ServiceInvocationChain;
+import org.apache.tuscany.spi.wire.OutboundInvocationChain;
+import org.apache.tuscany.spi.wire.OutboundWire;
+import org.apache.tuscany.spi.wire.InboundInvocationChain;
import org.apache.tuscany.spi.wire.TargetInvoker;
-import org.apache.tuscany.spi.wire.ServiceWire;
+import org.apache.tuscany.spi.wire.InboundWire;
/**
* @version $$Rev$$ $$Date$$
@@ -112,17 +112,17 @@
MessageHandler targetRequestHeadHandler,
MessageHandler targetResponseHeadHandler) throws Exception {
JavaAtomicContext targetContext = createJavaAtomicContext(targetName, targetScope, targetClass, targetScope.getScope());
- ServiceWire serviceWire = createServiceWire(targetService.getName().substring(
+ InboundWire inboundWire = createServiceWire(targetService.getName().substring(
targetService.getName().lastIndexOf('.') + 1), targetService, targetHeadInterceptor, targetRequestHeadHandler, targetResponseHeadHandler);
- targetContext.addServiceWire(serviceWire);
+ targetContext.addServiceWire(inboundWire);
JavaAtomicContext sourceContext = createJavaAtomicContext(sourceName, null, sourceScope, sourceClass, sourceClass, sourceScope.getScope(), false, null, null, null, members);
- ReferenceWire referenceWire = createReferenceWire(targetName, sourceReferenceClass, sourceHeadInterceptor,
+ OutboundWire outboundWire = createReferenceWire(targetName, sourceReferenceClass, sourceHeadInterceptor,
sourceHeadRequestHandler, sourceHeadResponseHandler);
- sourceContext.addReferenceWire(referenceWire);
+ sourceContext.addReferenceWire(outboundWire);
targetScope.register(targetContext);
sourceScope.register(sourceContext);
- connect(referenceWire, serviceWire, targetContext, false);
+ connect(outboundWire, inboundWire, targetContext, false);
Map<String, AtomicContext> contexts = new HashMap<String, AtomicContext>();
contexts.put(sourceName, sourceContext);
contexts.put(targetName, targetContext);
@@ -150,54 +150,54 @@
String targetName, Class<?> targetService, Class<?> targetClass,
Map<String, Member> members, ScopeContext targetScope) throws Exception {
JavaAtomicContext targetContext = createJavaAtomicContext(targetName, targetScope, targetClass, targetScope.getScope());
- ServiceWire serviceWire = createServiceWire(targetService.getName().substring(
+ InboundWire inboundWire = createServiceWire(targetService.getName().substring(
targetService.getName().lastIndexOf('.') + 1), targetService, null, null, null);
- targetContext.addServiceWire(serviceWire);
+ targetContext.addServiceWire(inboundWire);
JavaAtomicContext sourceContext = createJavaAtomicContext(sourceName, null, sourceScope, sourceClass, sourceClass, sourceScope.getScope(), false, null, null, null, members);
- ReferenceWire referenceWire = createReferenceWire(targetName, sourceReferenceClass, null, null, null);
- List<ReferenceWire> factories = new ArrayList<ReferenceWire>();
- factories.add(referenceWire);
+ OutboundWire outboundWire = createReferenceWire(targetName, sourceReferenceClass, null, null, null);
+ List<OutboundWire> factories = new ArrayList<OutboundWire>();
+ factories.add(outboundWire);
sourceContext.addReferenceWires(sourceReferenceClass, factories);
targetScope.register(targetContext);
sourceScope.register(sourceContext);
- connect(referenceWire, serviceWire, targetContext, false);
+ connect(outboundWire, inboundWire, targetContext, false);
Map<String, AtomicContext> contexts = new HashMap<String, AtomicContext>();
contexts.put(sourceName, sourceContext);
contexts.put(targetName, targetContext);
return contexts;
}
- public static <T> ServiceWire<T> createTargetWire(String serviceName, Class<T> interfaze) {
+ public static <T> InboundWire<T> createTargetWire(String serviceName, Class<T> interfaze) {
return createServiceWire(serviceName, interfaze, null, null, null);
}
- public static <T> ServiceWire<T> createServiceWire(String serviceName, Class<T> interfaze,
+ public static <T> InboundWire<T> createServiceWire(String serviceName, Class<T> interfaze,
Interceptor headInterceptor,
MessageHandler headRequestHandler,
MessageHandler headResponseHandler) {
- ServiceWire<T> wire = new JDKServiceWire<T>();
+ InboundWire<T> wire = new JDKInboundWire<T>();
wire.setBusinessInterface(interfaze);
wire.setServiceName(serviceName);
wire.addInvocationChains(createServiceInvocationChains(interfaze, headInterceptor, headRequestHandler, headResponseHandler));
return wire;
}
- public static <T> ReferenceWire<T> createReferenceWire(String refName, Class<T> interfaze,
+ public static <T> OutboundWire<T> createReferenceWire(String refName, Class<T> interfaze,
Interceptor headInterceptor,
MessageHandler headRequestHandler,
MessageHandler headResponseHandler) {
- ReferenceWire<T> wire = new JDKReferenceWire<T>();
+ OutboundWire<T> wire = new JDKOutboundWire<T>();
wire.setReferenceName(refName);
wire.addInvocationChains(createReferenceInvocationChains(interfaze, headInterceptor, headRequestHandler, headResponseHandler));
wire.setBusinessInterface(interfaze);
return wire;
}
- public static <T> ReferenceWire<T> createReferenceWire(String refName, Class<T> interfaze) {
- ReferenceWire<T> wire = new JDKReferenceWire<T>();
+ public static <T> OutboundWire<T> createReferenceWire(String refName, Class<T> interfaze) {
+ OutboundWire<T> wire = new JDKOutboundWire<T>();
wire.setReferenceName(refName);
wire.addInvocationChains(createReferenceInvocationChains(interfaze));
wire.setBusinessInterface(interfaze);
@@ -206,66 +206,66 @@
/**
- * @param referenceWire
- * @param serviceWire
+ * @param outboundWire
+ * @param inboundWire
* @param targetContext
* @param cacheable
* @throws Exception
*/
- public static void connect(ReferenceWire<?> referenceWire, ServiceWire<?> serviceWire, JavaAtomicContext targetContext, boolean cacheable) throws Exception {
- if (serviceWire != null) {
+ public static void connect(OutboundWire<?> outboundWire, InboundWire<?> inboundWire, JavaAtomicContext targetContext, boolean cacheable) throws Exception {
+ if (inboundWire != null) {
// if null, the target side has no interceptors or handlers
- Map<Method, ServiceInvocationChain> targetInvocationConfigs = serviceWire.getInvocationChains();
- for (ReferenceInvocationChain referenceInvocationConfig : referenceWire.getInvocationChains().values()) {
+ Map<Method, InboundInvocationChain> targetInvocationConfigs = inboundWire.getInvocationChains();
+ for (OutboundInvocationChain outboundInvocationConfig : outboundWire.getInvocationChains().values()) {
// match wire chains
- ServiceInvocationChain serviceInvocationConfig = targetInvocationConfigs.get(referenceInvocationConfig.getMethod());
- if (serviceInvocationConfig == null) {
+ InboundInvocationChain inboundInvocationConfig = targetInvocationConfigs.get(outboundInvocationConfig.getMethod());
+ if (inboundInvocationConfig == null) {
BuilderConfigException e = new BuilderConfigException("Incompatible source and target interface types for reference");
- e.setIdentifier(referenceWire.getReferenceName());
+ e.setIdentifier(outboundWire.getReferenceName());
throw e;
}
// if handler is configured, add that
- if (serviceInvocationConfig.getRequestHandlers() != null) {
- referenceInvocationConfig.setTargetRequestChannel(new MessageChannelImpl(serviceInvocationConfig
+ if (inboundInvocationConfig.getRequestHandlers() != null) {
+ outboundInvocationConfig.setTargetRequestChannel(new MessageChannelImpl(inboundInvocationConfig
.getRequestHandlers()));
- referenceInvocationConfig.setTargetResponseChannel(new MessageChannelImpl(serviceInvocationConfig
+ outboundInvocationConfig.setTargetResponseChannel(new MessageChannelImpl(inboundInvocationConfig
.getResponseHandlers()));
} else {
// no handlers, just connect interceptors
- if (serviceInvocationConfig.getHeadInterceptor() == null) {
+ if (inboundInvocationConfig.getHeadInterceptor() == null) {
BuilderConfigException e = new BuilderConfigException("No target handler or interceptor for operation");
- e.setIdentifier(serviceInvocationConfig.getMethod().getName());
+ e.setIdentifier(inboundInvocationConfig.getMethod().getName());
throw e;
}
- if (!(referenceInvocationConfig.getTailInterceptor() instanceof InvokerInterceptor && serviceInvocationConfig
+ if (!(outboundInvocationConfig.getTailInterceptor() instanceof InvokerInterceptor && inboundInvocationConfig
.getHeadInterceptor() instanceof InvokerInterceptor)) {
// check that we do not have the case where the only interceptors are invokers since we just need one
- referenceInvocationConfig.setTargetInterceptor(serviceInvocationConfig.getHeadInterceptor());
+ outboundInvocationConfig.setTargetInterceptor(inboundInvocationConfig.getHeadInterceptor());
}
}
}
- for (ReferenceInvocationChain referenceInvocationConfig : referenceWire.getInvocationChains()
+ for (OutboundInvocationChain outboundInvocationConfig : outboundWire.getInvocationChains()
.values()) {
- //FIXME should use target method, not referenceInvocationConfig.getMethod()
- TargetInvoker invoker = new JavaTargetInvoker(referenceInvocationConfig.getMethod(), targetContext);
+ //FIXME should use target method, not outboundInvocationConfig.getMethod()
+ TargetInvoker invoker = new JavaTargetInvoker(outboundInvocationConfig.getMethod(), targetContext);
invoker.setCacheable(cacheable);
- referenceInvocationConfig.setTargetInvoker(invoker);
+ outboundInvocationConfig.setTargetInvoker(invoker);
}
}
}
- private static Map<Method, ReferenceInvocationChain> createReferenceInvocationChains(Class<?> interfaze) {
+ private static Map<Method, OutboundInvocationChain> createReferenceInvocationChains(Class<?> interfaze) {
return createReferenceInvocationChains(interfaze, null, null, null);
}
- private static Map<Method, ReferenceInvocationChain> createReferenceInvocationChains(Class<?> interfaze,
+ private static Map<Method, OutboundInvocationChain> createReferenceInvocationChains(Class<?> interfaze,
Interceptor headInterceptor, MessageHandler headRequestHandler,
MessageHandler headResponseHandler) {
- Map<Method, ReferenceInvocationChain> invocations = new HashMap<Method, ReferenceInvocationChain>();
+ Map<Method, OutboundInvocationChain> invocations = new HashMap<Method, OutboundInvocationChain>();
Method[] methods = interfaze.getMethods();
for (Method method : methods) {
- ReferenceInvocationChain chain = new ReferenceInvocationChainImpl(method);
+ OutboundInvocationChain chain = new OutboundInvocationChainImpl(method);
if (headInterceptor != null) {
chain.addInterceptor(headInterceptor);
}
@@ -280,13 +280,13 @@
return invocations;
}
- private static Map<Method, ServiceInvocationChain> createServiceInvocationChains(Class<?> interfaze,
+ private static Map<Method, InboundInvocationChain> createServiceInvocationChains(Class<?> interfaze,
Interceptor headInterceptor, MessageHandler headRequestHandler,
MessageHandler headResponseHandler) {
- Map<Method, ServiceInvocationChain> invocations = new MethodHashMap<ServiceInvocationChain>();
+ Map<Method, InboundInvocationChain> invocations = new MethodHashMap<InboundInvocationChain>();
Method[] methods = interfaze.getMethods();
for (Method method : methods) {
- ServiceInvocationChain chain = new ServiceInvocationChainImpl(method);
+ InboundInvocationChain chain = new InboundInvocationChainImpl(method);
if (headInterceptor != null) {
chain.addInterceptor(headInterceptor);
}
Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/SpringCompositeBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/SpringCompositeBuilder.java?rev=410164&r1=410163&r2=410164&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/SpringCompositeBuilder.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/SpringCompositeBuilder.java Mon May 29 16:47:49 2006
@@ -14,8 +14,8 @@
import org.apache.tuscany.spi.model.Reference;
import org.apache.tuscany.spi.model.ReferenceTarget;
import org.apache.tuscany.spi.model.Service;
-import org.apache.tuscany.spi.wire.ServiceInvocationChain;
-import org.apache.tuscany.spi.wire.ServiceWire;
+import org.apache.tuscany.spi.wire.InboundInvocationChain;
+import org.apache.tuscany.spi.wire.InboundWire;
import org.springframework.context.support.GenericApplicationContext;
/**
@@ -39,8 +39,8 @@
(BoundService<? extends Binding>) service,
deploymentContext);
// wire service to bean invokers
- ServiceWire<?> wire = childContext.getWire();
- for (ServiceInvocationChain chain : wire.getInvocationChains().values()) {
+ InboundWire<?> wire = childContext.getInboundWire();
+ for (InboundInvocationChain chain : wire.getInvocationChains().values()) {
String beanName = wire.getTargetName().getPartName();
chain.setTargetInvoker(context.createTargetInvoker(beanName, chain.getMethod()));
}
Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/ServiceInvocationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/ServiceInvocationTestCase.java?rev=410164&r1=410163&r2=410164&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/ServiceInvocationTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/ServiceInvocationTestCase.java Mon May 29 16:47:49 2006
@@ -5,8 +5,8 @@
import org.apache.tuscany.container.spring.mock.TestBeanImpl;
import org.apache.tuscany.spi.context.ServiceContext;
import org.apache.tuscany.spi.extension.ServiceContextExtension;
-import org.apache.tuscany.spi.wire.ServiceInvocationChain;
-import org.apache.tuscany.spi.wire.ServiceWire;
+import org.apache.tuscany.spi.wire.InboundInvocationChain;
+import org.apache.tuscany.spi.wire.InboundWire;
import org.apache.tuscany.test.ArtifactFactory;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.support.RootBeanDefinition;
@@ -23,12 +23,12 @@
public void testInvocation() {
SpringCompositeContext context = new SpringCompositeContext("parent", createSpringContext(), null);
context.start();
- ServiceWire<TestBean> wire = ArtifactFactory.createTargetWire("fooService", TestBean.class);
- for (ServiceInvocationChain chain : wire.getInvocationChains().values()) {
+ InboundWire<TestBean> wire = ArtifactFactory.createTargetWire("fooService", TestBean.class);
+ for (InboundInvocationChain chain : wire.getInvocationChains().values()) {
chain.setTargetInvoker(context.createTargetInvoker("foo", chain.getMethod()));
}
ServiceContext<TestBean> serviceContext = new ServiceContextExtension<TestBean>("fooService", wire, context);
- serviceContext.setWire(wire);
+ serviceContext.setInboundWire(wire);
context.registerContext(serviceContext);
assertEquals("bar", ((TestBean) context.getContext("fooService").getService()).echo("bar"));
}
Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/SpringCompositeBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/SpringCompositeBuilderTestCase.java?rev=410164&r1=410163&r2=410164&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/SpringCompositeBuilderTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/SpringCompositeBuilderTestCase.java Mon May 29 16:47:49 2006
@@ -13,7 +13,7 @@
import org.apache.tuscany.spi.model.BoundService;
import org.apache.tuscany.spi.model.Component;
import org.apache.tuscany.spi.model.CompositeComponentType;
-import org.apache.tuscany.spi.wire.ServiceWire;
+import org.apache.tuscany.spi.wire.InboundWire;
import org.apache.tuscany.spi.QualifiedName;
import org.apache.tuscany.test.ArtifactFactory;
import org.jmock.Mock;
@@ -36,9 +36,9 @@
Component<SpringImplementation> component = new Component<SpringImplementation>("spring", impl);
Mock mock = mock(BuilderRegistry.class);
ServiceContextExtension<TestBean> serviceContext = new ServiceContextExtension<TestBean>("fooService", null, null);
- ServiceWire<TestBean> wire = ArtifactFactory.createTargetWire("foo", TestBean.class);
+ InboundWire<TestBean> wire = ArtifactFactory.createTargetWire("foo", TestBean.class);
wire.setTargetName(new QualifiedName("foo"));
- serviceContext.setWire(wire);
+ serviceContext.setInboundWire(wire);
mock.expects(atLeastOnce()).method("build").will(returnValue(serviceContext));
builder.setBuilderRegistry((BuilderRegistry) mock.proxy());
CompositeContext context = (CompositeContext) builder.build(null, component, null);
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/Connector.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/Connector.java?rev=410164&r1=410163&r2=410164&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/Connector.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/Connector.java Mon May 29 16:47:49 2006
@@ -2,7 +2,7 @@
import org.apache.tuscany.spi.builder.BuilderConfigException;
import org.apache.tuscany.spi.context.Context;
-import org.apache.tuscany.spi.wire.ServiceWire;
+import org.apache.tuscany.spi.wire.InboundWire;
/**
* Implementations are responsible for bridging invocation chains as an assembly is converted to runtime
@@ -14,7 +14,7 @@
<T> void connect(Context<T> source);
- public <T> void connect(ServiceWire<T> sourceWire, Context<?> targetContext) throws BuilderConfigException;
+ public <T> void connect(InboundWire<T> sourceWire, Context<?> targetContext) throws BuilderConfigException;
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java?rev=410164&r1=410163&r2=410164&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java Mon May 29 16:47:49 2006
@@ -10,7 +10,7 @@
import org.apache.tuscany.core.wire.InvokerInterceptor;
import org.apache.tuscany.core.wire.MessageChannelImpl;
import org.apache.tuscany.core.wire.MessageDispatcher;
-import org.apache.tuscany.core.wire.ReferenceAutowire;
+import org.apache.tuscany.core.wire.OutboundAutowire;
import org.apache.tuscany.core.wire.RequestResponseInterceptor;
import org.apache.tuscany.spi.QualifiedName;
import org.apache.tuscany.spi.builder.BuilderConfigException;
@@ -20,12 +20,12 @@
import org.apache.tuscany.spi.context.Context;
import org.apache.tuscany.spi.context.ReferenceContext;
import org.apache.tuscany.spi.model.Scope;
+import org.apache.tuscany.spi.wire.InboundInvocationChain;
+import org.apache.tuscany.spi.wire.InboundWire;
import org.apache.tuscany.spi.wire.MessageChannel;
import org.apache.tuscany.spi.wire.MessageHandler;
-import org.apache.tuscany.spi.wire.ReferenceInvocationChain;
-import org.apache.tuscany.spi.wire.ReferenceWire;
-import org.apache.tuscany.spi.wire.ServiceInvocationChain;
-import org.apache.tuscany.spi.wire.ServiceWire;
+import org.apache.tuscany.spi.wire.OutboundInvocationChain;
+import org.apache.tuscany.spi.wire.OutboundWire;
import org.apache.tuscany.spi.wire.TargetInvoker;
/**
@@ -40,13 +40,13 @@
Scope scope = source.getScope();
if (source instanceof AtomicContext) {
AtomicContext<T> sourceContext = (AtomicContext<T>) source;
- for (List<ReferenceWire> referenceWires : sourceContext.getReferenceWires().values()) {
- for (ReferenceWire<T> referenceWire : referenceWires) {
- if (referenceWire instanceof ReferenceAutowire) {
+ for (List<OutboundWire> referenceWires : sourceContext.getReferenceWires().values()) {
+ for (OutboundWire<T> outboundWire : referenceWires) {
+ if (outboundWire instanceof OutboundAutowire) {
continue;
}
try {
- connect(referenceWire, parent, scope);
+ connect(outboundWire, parent, scope);
} catch (BuilderConfigException e) {
e.addContextName(source.getName());
e.addContextName(parent.getName());
@@ -63,7 +63,7 @@
}
@SuppressWarnings("unchecked")
- private <T> void connect(ReferenceWire<T> sourceWire, CompositeContext<?> parent, Scope sourceScope) throws BuilderConfigException {
+ private <T> void connect(OutboundWire<T> sourceWire, CompositeContext<?> parent, Scope sourceScope) throws BuilderConfigException {
assert(sourceScope != null): "Source scope was null";
assert(sourceWire.getTargetName() != null): "Wire target name was null";
QualifiedName targetName = sourceWire.getTargetName();
@@ -76,7 +76,7 @@
if (target instanceof AtomicContext) {
AtomicContext<?> targetContext = (AtomicContext<?>) target;
- ServiceWire<?> targetWire = targetContext.getServiceWire(targetName.getPortName());
+ InboundWire<?> targetWire = targetContext.getServiceWire(targetName.getPortName());
if (targetWire == null) {
BuilderConfigException e = new BuilderConfigException("Target service not found for reference " + sourceWire.getReferenceName());
e.setIdentifier(targetName.getPortName());
@@ -85,9 +85,9 @@
if (!sourceWire.getBusinessInterface().isAssignableFrom(targetWire.getBusinessInterface())) {
throw new BuilderConfigException("Incompatible source and target interfaces");
}
- connect(sourceWire, (ServiceWire<T>) targetWire, target, isOptimizable(sourceScope, targetContext.getScope()));
+ connect(sourceWire, (InboundWire<T>) targetWire, target, isOptimizable(sourceScope, targetContext.getScope()));
} else if (target instanceof ReferenceContext) {
- ReferenceWire<T> targetWire = ((ReferenceContext) target).getWire();
+ InboundWire<T> targetWire = ((ReferenceContext) target).getInboundWire();
assert(targetWire != null);
if (!sourceWire.getBusinessInterface().isAssignableFrom(targetWire.getBusinessInterface())) {
throw new BuilderConfigException("Incompatible source and target interfaces");
@@ -100,15 +100,15 @@
}
@SuppressWarnings("unchecked")
- public <T> void connect(ServiceWire<T> sourceWire, Context<?> targetContext) throws BuilderConfigException {
+ public <T> void connect(InboundWire<T> sourceWire, Context<?> targetContext) throws BuilderConfigException {
if (targetContext instanceof ComponentContext) {
- ServiceWire<T> targetWire = ((ComponentContext) targetContext).getServiceWire(sourceWire.getServiceName());
+ InboundWire<T> targetWire = ((ComponentContext) targetContext).getServiceWire(sourceWire.getServiceName());
// perform optimization, if possible
if (sourceWire.getInvocationChains().isEmpty() && targetWire.getInvocationChains().isEmpty()) {
sourceWire.setTargetWire(targetWire);
return;
}
- for (ServiceInvocationChain sourceChain : sourceWire.getInvocationChains().values()) {
+ for (InboundInvocationChain sourceChain : sourceWire.getInvocationChains().values()) {
if (targetWire.getInvocationChains() != null || targetWire.getInvocationChains().isEmpty()) {
if (sourceChain.getTailInterceptor() != null &&
!(sourceChain.getTailInterceptor() instanceof InvokerInterceptor)) {
@@ -124,17 +124,17 @@
}
}
}
- ServiceInvocationChain targetChain = targetWire.getInvocationChains().get(sourceChain.getMethod());
+ InboundInvocationChain targetChain = targetWire.getInvocationChains().get(sourceChain.getMethod());
connect(sourceChain, targetChain);
}
} else if (targetContext instanceof ReferenceContext) {
- ReferenceWire<T> targetWire = ((ReferenceContext) targetContext).getWire();
+ InboundWire<T> targetWire = ((ReferenceContext) targetContext).getInboundWire();
// perform optimization, if possible
if (sourceWire.getInvocationChains().isEmpty() && targetWire.getInvocationChains().isEmpty()) {
sourceWire.setTargetWire(targetWire);
return;
}
- for (ServiceInvocationChain sourceChain : sourceWire.getInvocationChains().values()) {
+ for (InboundInvocationChain sourceChain : sourceWire.getInvocationChains().values()) {
if (targetWire.getInvocationChains() != null || targetWire.getInvocationChains().isEmpty()) {
if (sourceChain.getTailInterceptor() != null &&
!(sourceChain.getTailInterceptor() instanceof InvokerInterceptor)) {
@@ -150,7 +150,7 @@
}
}
}
- ReferenceInvocationChain targetChain = targetWire.getInvocationChains().get(sourceChain.getMethod());
+ InboundInvocationChain targetChain = targetWire.getInvocationChains().get(sourceChain.getMethod());
connect(sourceChain, targetChain);
}
} else {
@@ -160,46 +160,46 @@
}
}
- public <T> void connect(ReferenceWire<T> sourceWire, ServiceWire<T> targetWire, Context<?> target, boolean optimizable) {
- Map<Method, ServiceInvocationChain> targetChains = targetWire.getInvocationChains();
+ public <T> void connect(OutboundWire<T> sourceWire, InboundWire<T> targetWire, Context<?> target, boolean optimizable) {
+ Map<Method, InboundInvocationChain> targetChains = targetWire.getInvocationChains();
// perform optimization, if possible
if (optimizable && sourceWire.getInvocationChains().isEmpty() && targetChains.isEmpty()) {
sourceWire.setTargetWire(targetWire);
return;
}
String serviceName = targetWire.getServiceName();
- for (ReferenceInvocationChain referenceChain : sourceWire.getInvocationChains().values()) {
+ for (OutboundInvocationChain outboundChain : sourceWire.getInvocationChains().values()) {
// match wire chains
- ServiceInvocationChain serviceChain = targetChains.get(referenceChain.getMethod());
- if (serviceChain == null) {
+ InboundInvocationChain inboundChain = targetChains.get(outboundChain.getMethod());
+ if (inboundChain == null) {
BuilderConfigException e = new BuilderConfigException("Incompatible sourceWire and target chain interfaces for reference");
e.setIdentifier(sourceWire.getReferenceName());
throw e;
}
if (target instanceof ReferenceContext) {
ReferenceContext referenceContext = (ReferenceContext) target;
- TargetInvoker invoker = referenceContext.createTargetInvoker(serviceName, referenceChain.getMethod());
- connect(referenceChain, serviceChain, invoker);
+ TargetInvoker invoker = referenceContext.createTargetInvoker(serviceName, outboundChain.getMethod());
+ connect(outboundChain, inboundChain, invoker);
} else {
ComponentContext componentContext = (ComponentContext) target;
- TargetInvoker invoker = componentContext.createTargetInvoker(serviceName, referenceChain.getMethod());
- connect(referenceChain, serviceChain, invoker);
+ TargetInvoker invoker = componentContext.createTargetInvoker(serviceName, outboundChain.getMethod());
+ connect(outboundChain, inboundChain, invoker);
}
}
}
- public <T> void connect(ReferenceWire<T> sourceWire, ReferenceWire<T> targetWire, Context<?> target, boolean optimizable) {
+ public <T> void connect(OutboundWire<T> sourceWire, OutboundWire<T> targetWire, Context<?> target, boolean optimizable) {
//xcv
- Map<Method, ReferenceInvocationChain> targetChains = targetWire.getInvocationChains();
+ Map<Method, OutboundInvocationChain> targetChains = targetWire.getInvocationChains();
// perform optimization, if possible
if (optimizable && sourceWire.getInvocationChains().isEmpty() && targetChains.isEmpty()) {
sourceWire.setTargetWire(targetWire);
return;
}
String serviceName = targetWire.getTargetName().getPortName();
- for (ReferenceInvocationChain referenceChain : sourceWire.getInvocationChains().values()) {
+ for (OutboundInvocationChain outboundChain : sourceWire.getInvocationChains().values()) {
// match wire chains
- ReferenceInvocationChain serviceChain = targetChains.get(referenceChain.getMethod());
+ OutboundInvocationChain serviceChain = targetChains.get(outboundChain.getMethod());
if (serviceChain == null) {
BuilderConfigException e = new BuilderConfigException("Incompatible sourceWire and target chain interfaces for reference");
e.setIdentifier(sourceWire.getReferenceName());
@@ -207,17 +207,17 @@
}
if (target instanceof ReferenceContext) {
ReferenceContext referenceContext = (ReferenceContext) target;
- TargetInvoker invoker = referenceContext.createTargetInvoker(serviceName, referenceChain.getMethod());
- connect(referenceChain, serviceChain, invoker);
+ TargetInvoker invoker = referenceContext.createTargetInvoker(serviceName, outboundChain.getMethod());
+ connect(outboundChain, serviceChain, invoker);
} else {
ComponentContext componentContext = (ComponentContext) target;
- TargetInvoker invoker = componentContext.createTargetInvoker(serviceName, referenceChain.getMethod());
- connect(referenceChain, serviceChain, invoker);
+ TargetInvoker invoker = componentContext.createTargetInvoker(serviceName, outboundChain.getMethod());
+ connect(outboundChain, serviceChain, invoker);
}
}
}
- public void connect(ReferenceInvocationChain sourceChain, ServiceInvocationChain targetChain, TargetInvoker invoker) {
+ public void connect(OutboundInvocationChain sourceChain, InboundInvocationChain targetChain, TargetInvoker invoker) {
// if handlers are configured, add them
if (targetChain.getRequestHandlers() != null || targetChain.getResponseHandlers() != null) {
if (targetChain.getRequestHandlers() == null) {
@@ -253,7 +253,7 @@
sourceChain.setTargetInvoker(invoker);
}
- public void connect(ServiceInvocationChain sourceChain, ServiceInvocationChain targetChain) {
+ public void connect(InboundInvocationChain sourceChain, InboundInvocationChain targetChain) {
if (sourceChain.getTailInterceptor() != null) {
// connect the tail interceptor to a target request channel or target interceptor
if (targetChain.getRequestHandlers() != null) {
@@ -318,15 +318,16 @@
}
}
- public void connect(ReferenceInvocationChain sourceChain, ReferenceInvocationChain targetChain, TargetInvoker invoker) {
+ public void connect(OutboundInvocationChain sourceChain, OutboundInvocationChain targetChain, TargetInvoker invoker) {
if (sourceChain.getRequestChannel() != null) {
sourceChain.addRequestHandler(new MessageDispatcher(targetChain.getHeadInterceptor()));
} else {
- sourceChain.addInterceptor(new BridgingInterceptor(targetChain.getHeadInterceptor()));
+ sourceChain.setTargetInterceptor(targetChain.getHeadInterceptor());
}
+ sourceChain.setTargetInvoker(invoker);
}
- public void connect(ServiceInvocationChain sourceChain, ReferenceInvocationChain targetChain) {
+ public void connect(InboundInvocationChain sourceChain, OutboundInvocationChain targetChain) {
sourceChain.addInterceptor(new BridgingInterceptor(targetChain.getHeadInterceptor()));
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/PojoAtomicContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/PojoAtomicContext.java?rev=410164&r1=410163&r2=410164&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/PojoAtomicContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/PojoAtomicContext.java Mon May 29 16:47:49 2006
@@ -25,7 +25,7 @@
import org.apache.tuscany.spi.context.CompositeContext;
import org.apache.tuscany.spi.context.ScopeContext;
import org.apache.tuscany.spi.extension.AtomicContextExtension;
-import org.apache.tuscany.spi.wire.ReferenceWire;
+import org.apache.tuscany.spi.wire.OutboundWire;
/**
* Base implementation of an {@link AtomicContext} whose type is a Java class
@@ -129,7 +129,7 @@
return ctx;
}
- public void onReferenceWire(ReferenceWire wire) {
+ public void onReferenceWire(OutboundWire wire) {
String referenceName = wire.getReferenceName();
Member member = members.get(referenceName);
if (member == null) {
@@ -138,7 +138,7 @@
injectors.add(createInjector(member, wire));
}
- public void onReferenceWires(Class<?> multiplicityClass, List<ReferenceWire> wires) {
+ public void onReferenceWires(Class<?> multiplicityClass, List<OutboundWire> wires) {
assert(wires.size() > 0): "Wires were empty";
String referenceName = wires.get(0).getReferenceName();
Member member = members.get(referenceName);
@@ -148,7 +148,7 @@
injectors.add(createMultiplicityInjector(member, multiplicityClass, wires));
}
- protected Injector createInjector(Member member, ReferenceWire wire) {
+ protected Injector createInjector(Member member, OutboundWire wire) {
ObjectFactory<?> factory = new WireObjectFactory(wire);
if (member instanceof Field) {
return new FieldInjector(((Field) member), factory);
@@ -161,9 +161,9 @@
}
}
- protected Injector createMultiplicityInjector(Member member, Class<?> interfaceType, List<ReferenceWire> wireFactories) {
+ protected Injector createMultiplicityInjector(Member member, Class<?> interfaceType, List<OutboundWire> wireFactories) {
List<ObjectFactory<?>> factories = new ArrayList<ObjectFactory<?>>();
- for (ReferenceWire wire : wireFactories) {
+ for (OutboundWire wire : wireFactories) {
factories.add(new WireObjectFactory(wire));
}
if (member instanceof Field) {
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/WireObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/WireObjectFactory.java?rev=410164&r1=410163&r2=410164&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/WireObjectFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/WireObjectFactory.java Mon May 29 16:47:49 2006
@@ -2,7 +2,7 @@
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.ObjectFactory;
-import org.apache.tuscany.spi.wire.ReferenceWire;
+import org.apache.tuscany.spi.wire.OutboundWire;
/**
* Uses a wire to return an object instance
@@ -11,9 +11,9 @@
*/
public class WireObjectFactory implements ObjectFactory {
- private ReferenceWire factory;
+ private OutboundWire factory;
- public WireObjectFactory(ReferenceWire factory) {
+ public WireObjectFactory(OutboundWire factory) {
this.factory = factory;
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/policy/PolicyBuilderRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/policy/PolicyBuilderRegistryImpl.java?rev=410164&r1=410163&r2=410164&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/policy/PolicyBuilderRegistryImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/policy/PolicyBuilderRegistryImpl.java Mon May 29 16:47:49 2006
@@ -9,8 +9,8 @@
import org.apache.tuscany.spi.policy.PolicyBuilderRegistry;
import org.apache.tuscany.spi.policy.SourcePolicyBuilder;
import org.apache.tuscany.spi.policy.TargetPolicyBuilder;
-import org.apache.tuscany.spi.wire.ReferenceWire;
-import org.apache.tuscany.spi.wire.ServiceWire;
+import org.apache.tuscany.spi.wire.OutboundWire;
+import org.apache.tuscany.spi.wire.InboundWire;
/**
* @version $Rev$ $Date$
@@ -40,7 +40,7 @@
}
- public void buildSource(Reference reference, ReferenceWire wire) throws BuilderException {
+ public void buildSource(Reference reference, OutboundWire wire) throws BuilderException {
for (List<SourcePolicyBuilder> builders : sourceBuilders) {
for (SourcePolicyBuilder builder : builders) {
builder.build(reference,wire);
@@ -48,7 +48,7 @@
}
}
- public void buildTarget(Service service, ServiceWire wire) throws BuilderException {
+ public void buildTarget(Service service, InboundWire wire) throws BuilderException {
for (List<TargetPolicyBuilder> builders : targetBuilders) {
for (TargetPolicyBuilder builder : builders) {
builder.build(service,wire);
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/policy/async/AsyncPolicyBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/policy/async/AsyncPolicyBuilder.java?rev=410164&r1=410163&r2=410164&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/policy/async/AsyncPolicyBuilder.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/policy/async/AsyncPolicyBuilder.java Mon May 29 16:47:49 2006
@@ -9,8 +9,8 @@
import org.apache.tuscany.spi.policy.PolicyBuilderRegistry;
import static org.apache.tuscany.spi.policy.PolicyBuilderRegistry.INITIAL;
import org.apache.tuscany.spi.policy.TargetPolicyBuilder;
-import org.apache.tuscany.spi.wire.ServiceInvocationChain;
-import org.apache.tuscany.spi.wire.ServiceWire;
+import org.apache.tuscany.spi.wire.InboundInvocationChain;
+import org.apache.tuscany.spi.wire.InboundWire;
import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.OneWay;
@@ -50,8 +50,8 @@
this.workManager = workManager;
}
- public void build(Service service, ServiceWire<?> wire) throws BuilderException {
- for (ServiceInvocationChain chain : wire.getInvocationChains().values()) {
+ public void build(Service service, InboundWire<?> wire) throws BuilderException {
+ for (InboundInvocationChain chain : wire.getInvocationChains().values()) {
// TODO fix this - it should be represented by the model and not through an annotation
if (chain.getMethod().getAnnotation(OneWay.class) != null) {
chain.addInterceptor(new AsyncInterceptor(workManager, monitor));
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemBindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemBindingBuilder.java?rev=410164&r1=410163&r2=410164&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemBindingBuilder.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemBindingBuilder.java Mon May 29 16:47:49 2006
@@ -4,8 +4,8 @@
import org.apache.tuscany.core.system.context.SystemReferenceContextImpl;
import org.apache.tuscany.core.system.context.SystemServiceContextImpl;
import org.apache.tuscany.core.system.model.SystemBinding;
-import org.apache.tuscany.core.system.wire.SystemReferenceAutowire;
-import org.apache.tuscany.core.system.wire.SystemServiceWire;
+import org.apache.tuscany.core.system.wire.SystemInboundAutowire;
+import org.apache.tuscany.core.system.wire.SystemInboundWire;
import org.apache.tuscany.spi.QualifiedName;
import org.apache.tuscany.spi.builder.BindingBuilder;
import org.apache.tuscany.spi.context.ComponentContext;
@@ -14,7 +14,7 @@
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.model.BoundReference;
import org.apache.tuscany.spi.model.BoundService;
-import org.apache.tuscany.spi.wire.ReferenceWire;
+import org.apache.tuscany.spi.wire.InboundWire;
/**
* @version $$Rev$$ $$Date$$
@@ -25,7 +25,7 @@
Class<?> interfaze = boundService.getServiceContract().getInterfaceClass();
QualifiedName targetName = new QualifiedName(boundService.getTarget().getPath());
ComponentContext target = (ComponentContext) parent.getContext(targetName.getPartName());
- SystemServiceWire<?> wire = new SystemServiceWire(targetName.getPortName(), interfaze, target);
+ SystemInboundWire<?> wire = new SystemInboundWire(targetName.getPortName(), interfaze, target);
return new SystemServiceContextImpl(boundService.getName(), wire, parent);
}
@@ -34,8 +34,8 @@
AutowireContext autowireContext = (AutowireContext) parent.getParent();
Class<?> interfaze = boundReference.getServiceContract().getInterfaceClass();
SystemReferenceContextImpl ctx = new SystemReferenceContextImpl(boundReference.getName(), interfaze, parent);
- ReferenceWire<?> wire = new SystemReferenceAutowire(boundReference.getName(), interfaze, autowireContext);
- ctx.setTargetWire(wire);
+ InboundWire<?> wire = new SystemInboundAutowire(interfaze, autowireContext);
+ ctx.setInboundWire(wire);
return ctx;
}
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemComponentBuilder.java?rev=410164&r1=410163&r2=410164&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemComponentBuilder.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemComponentBuilder.java Mon May 29 16:47:49 2006
@@ -15,9 +15,9 @@
import org.apache.tuscany.core.system.context.SystemAtomicContext;
import org.apache.tuscany.core.system.context.SystemAtomicContextImpl;
import org.apache.tuscany.core.system.model.SystemImplementation;
-import org.apache.tuscany.core.system.wire.SystemReferenceAutowire;
-import org.apache.tuscany.core.system.wire.SystemReferenceWire;
-import org.apache.tuscany.core.system.wire.SystemServiceWire;
+import org.apache.tuscany.core.system.wire.SystemOutboundAutowire;
+import org.apache.tuscany.core.system.wire.SystemOutboundWire;
+import org.apache.tuscany.core.system.wire.SystemInboundWire;
import org.apache.tuscany.core.util.JavaIntrospectionHelper;
import org.apache.tuscany.spi.model.Component;
import org.apache.tuscany.spi.model.ReferenceTarget;
@@ -29,7 +29,7 @@
import org.apache.tuscany.spi.context.ComponentContext;
import org.apache.tuscany.spi.context.CompositeContext;
import org.apache.tuscany.spi.context.ScopeContext;
-import org.apache.tuscany.spi.wire.ReferenceWire;
+import org.apache.tuscany.spi.wire.OutboundWire;
/**
* @version $$Rev$$ $$Date$$
@@ -85,7 +85,7 @@
for (Service service : component.getImplementation().getComponentType().getServices().values()) {
Class interfaze = service.getServiceContract().getInterfaceClass();
- SystemServiceWire wire = new SystemServiceWire(service.getName(), interfaze, systemContext);
+ SystemInboundWire wire = new SystemInboundWire(service.getName(), interfaze, systemContext);
systemContext.addServiceWire(wire);
}
for (ReferenceTarget target : component.getReferenceTargets().values()) {
@@ -99,14 +99,14 @@
e.addContextName(parent.getName());
throw e;
}
- ReferenceWire<?> wire;
+ OutboundWire<?> wire;
if (target.getReference().isAutowire()) {
- wire = new SystemReferenceAutowire(referenceName, interfaze, autowireContext);
+ wire = new SystemOutboundAutowire(referenceName, interfaze, autowireContext);
} else {
//FIXME support multiplicity!
assert(target.getTargets().size() == 1): "Multiplicity not yet implemented";
QualifiedName targetName = new QualifiedName(target.getTargets().get(0).getPath());
- wire = new SystemReferenceWire(referenceName, targetName, interfaze);
+ wire = new SystemOutboundWire(referenceName, targetName, interfaze);
}
systemContext.addReferenceWire(wire);
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemReferenceContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemReferenceContextImpl.java?rev=410164&r1=410163&r2=410164&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemReferenceContextImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemReferenceContextImpl.java Mon May 29 16:47:49 2006
@@ -23,7 +23,7 @@
}
public T getService() throws TargetException {
- return referenceInterface.cast(referenceWire.getTargetService());
+ return referenceInterface.cast(inboundWire.getTargetService());
}
public WireInvocationHandler getHandler() throws TargetException {
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemServiceContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemServiceContextImpl.java?rev=410164&r1=410163&r2=410164&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemServiceContextImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemServiceContextImpl.java Mon May 29 16:47:49 2006
@@ -3,7 +3,7 @@
import org.apache.tuscany.spi.CoreRuntimeException;
import org.apache.tuscany.spi.context.CompositeContext;
import org.apache.tuscany.spi.extension.ServiceContextExtension;
-import org.apache.tuscany.spi.wire.ServiceWire;
+import org.apache.tuscany.spi.wire.InboundWire;
import org.apache.tuscany.spi.wire.WireInvocationHandler;
/**
@@ -13,7 +13,7 @@
*/
public class SystemServiceContextImpl<T> extends ServiceContextExtension<T> implements SystemServiceContext<T> {
- public SystemServiceContextImpl(String name, ServiceWire<T> wire, CompositeContext parent) throws CoreRuntimeException {
+ public SystemServiceContextImpl(String name, InboundWire<T> wire, CompositeContext parent) throws CoreRuntimeException {
super(name, wire, parent);
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemSingletonAtomicContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemSingletonAtomicContext.java?rev=410164&r1=410163&r2=410164&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemSingletonAtomicContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemSingletonAtomicContext.java Mon May 29 16:47:49 2006
@@ -11,9 +11,9 @@
import org.apache.tuscany.spi.context.InstanceWrapper;
import org.apache.tuscany.spi.context.TargetException;
import org.apache.tuscany.spi.context.CompositeContext;
-import org.apache.tuscany.spi.wire.ReferenceWire;
+import org.apache.tuscany.spi.wire.OutboundWire;
import org.apache.tuscany.spi.wire.TargetInvoker;
-import org.apache.tuscany.spi.wire.ServiceWire;
+import org.apache.tuscany.spi.wire.InboundWire;
/**
* An {@link org.apache.tuscany.spi.context.AtomicContext} used when registering objects directly into a
@@ -72,23 +72,23 @@
throw new UnsupportedOperationException();
}
- public void addServiceWire(ServiceWire wire) {
+ public void addServiceWire(InboundWire wire) {
throw new UnsupportedOperationException();
}
- public ServiceWire getServiceWire(String serviceName) {
+ public InboundWire getServiceWire(String serviceName) {
throw new UnsupportedOperationException();
}
- public void addReferenceWire(ReferenceWire wire) {
+ public void addReferenceWire(OutboundWire wire) {
throw new UnsupportedOperationException();
}
- public void addReferenceWires(Class<?> multiplicityClass, List<ReferenceWire> wires) {
+ public void addReferenceWires(Class<?> multiplicityClass, List<OutboundWire> wires) {
throw new UnsupportedOperationException();
}
- public Map<String,List<ReferenceWire>> getReferenceWires() {
+ public Map<String,List<OutboundWire>> getReferenceWires() {
throw new UnsupportedOperationException();
}
Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/wire/SystemInboundAutowire.java (from r410152, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/wire/SystemServiceAutowire.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/wire/SystemInboundAutowire.java?p2=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/wire/SystemInboundAutowire.java&p1=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/wire/SystemServiceAutowire.java&r1=410152&r2=410164&rev=410164&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/wire/SystemServiceAutowire.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/wire/SystemInboundAutowire.java Mon May 29 16:47:49 2006
@@ -6,9 +6,9 @@
import org.apache.tuscany.core.context.AutowireContext;
import org.apache.tuscany.spi.context.TargetException;
-import org.apache.tuscany.spi.wire.ServiceInvocationChain;
-import org.apache.tuscany.spi.wire.ServiceWire;
-import org.apache.tuscany.spi.wire.ReferenceWire;
+import org.apache.tuscany.spi.wire.InboundInvocationChain;
+import org.apache.tuscany.spi.wire.InboundWire;
+import org.apache.tuscany.spi.wire.OutboundWire;
import org.apache.tuscany.spi.wire.RuntimeWire;
import org.apache.tuscany.spi.QualifiedName;
@@ -17,12 +17,12 @@
*
* @version $$Rev$$ $$Date$$
*/
-public class SystemServiceAutowire<T> implements ServiceWire<T> {
+public class SystemInboundAutowire<T> implements InboundWire<T> {
private Class<T> businessInterface;
private AutowireContext<?> context;
- public SystemServiceAutowire(Class<T> businessInterface, AutowireContext context) {
+ public SystemInboundAutowire(Class<T> businessInterface, AutowireContext context) {
this.businessInterface = businessInterface;
this.context = context;
}
@@ -50,11 +50,11 @@
return new Class[0];
}
- public Map<Method, ServiceInvocationChain> getInvocationChains() {
+ public Map<Method, InboundInvocationChain> getInvocationChains() {
return Collections.emptyMap();
}
- public void addInvocationChain(Method method, ServiceInvocationChain chain) {
+ public void addInvocationChain(Method method, InboundInvocationChain chain) {
throw new UnsupportedOperationException();
}
@@ -82,7 +82,7 @@
throw new UnsupportedOperationException(); // FIXME not implemented
}
- public void setTargetWire(ReferenceWire<T> wire) {
+ public void setTargetWire(OutboundWire<T> wire) {
throw new UnsupportedOperationException(); // FIXME not implemented
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org