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/29 19:32:06 UTC
svn commit: r410128 [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 10:32:03 2006
New Revision: 410128
URL: http://svn.apache.org/viewvc?rev=410128&view=rev
Log:
rename TargetWire to ServiceWire, SourceWire to ReferenceWire, TargetInvocationChain to ServiceInvocationChain, and SourceInvocationChain to ReferenceInvocationChain to be more consistent with recursive assembly and since either type of wire can be a source or target
Added:
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/JavaReferenceWireTestCase.java
- copied, changed from r410119, incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/JavaSourceWireTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/wire/SystemReferenceAutowire.java
- copied, changed from r410061, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/wire/SystemSourceAutowire.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/wire/SystemReferenceWire.java
- copied, changed from r410061, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/wire/SystemSourceWire.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/wire/SystemServiceAutowire.java
- copied, changed from r410061, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/wire/SystemTargetAutowire.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/wire/SystemServiceWire.java
- copied, changed from r410061, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/wire/SystemTargetWire.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/ReferenceAutowire.java
- copied, changed from r410061, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/SourceAutowire.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/ReferenceInvocationChainImpl.java
- copied, changed from r410061, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/SourceInvocationChainImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/ServiceInvocationChainImpl.java
- copied, changed from r410061, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/TargetInvocationChainImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/jdk/JDKReferenceWire.java
- copied, changed from r410061, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/jdk/JDKSourceWire.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/jdk/JDKServiceWire.java
- copied, changed from r410066, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/jdk/JDKTargetWire.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/jdk/WireTestCase.java
- copied, changed from r410119, incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/jdk/JDKWireFactoryServiceTestCase.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/ReferenceInvocationChain.java
- copied, changed from r410061, incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/SourceInvocationChain.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/ReferenceInvocationHandler.java
- copied, changed from r410119, incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/SourceInvocationHandler.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/ReferenceWire.java (contents, props changed)
- copied, changed from r410061, incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/SourceWire.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/ServiceInvocationChain.java
- copied, changed from r410061, incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/TargetInvocationChain.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/ServiceInvocationHandler.java
- copied, changed from r410119, incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/TargetInvocationHandler.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/ServiceWire.java (contents, props changed)
- copied, changed from r410061, incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/TargetWire.java
Removed:
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/JavaSourceWireTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/wire/SystemSourceAutowire.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/wire/SystemSourceWire.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/wire/SystemTargetAutowire.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/wire/SystemTargetWire.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/SourceAutowire.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/SourceInvocationChainImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/TargetInvocationChainImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/jdk/JDKSourceWire.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/jdk/JDKTargetWire.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/jdk/JDKWireFactoryServiceTestCase.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/SourceInvocationChain.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/SourceInvocationHandler.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/SourceWire.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/TargetInvocationChain.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/TargetInvocationHandler.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/TargetWire.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/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/SystemCompositeContextImpl.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/BridgingResponseInterceptor.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/SourceToTargetConnectTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/builder/TargetToTargetConnectTestCase.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/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/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=410128&r1=410127&r2=410128&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 10:32:03 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.SourceWire;
+import org.apache.tuscany.spi.wire.ReferenceWire;
import org.apache.tuscany.spi.wire.TargetInvoker;
-import org.apache.tuscany.spi.wire.TargetWire;
+import org.apache.tuscany.spi.wire.ServiceWire;
import org.codehaus.groovy.control.CompilationFailedException;
/**
@@ -76,8 +76,8 @@
injector.inject(object);
}
// inject wires
- for (List<SourceWire> sourceWires : getSourceWires().values()) {
- for (SourceWire<?> wire : sourceWires) {
+ for (List<ReferenceWire> referenceWires : getReferenceWires().values()) {
+ for (ReferenceWire<?> wire : referenceWires) {
object.setProperty(wire.getReferenceName(), wire.getTargetService());
}
}
@@ -103,7 +103,7 @@
}
public Object getService(String service) throws TargetException {
- TargetWire<?> wire = getTargetWire(service);
+ ServiceWire<?> 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=410128&r1=410127&r2=410128&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 10:32:03 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.SourceWire;
+import org.apache.tuscany.spi.wire.ReferenceWire;
import org.apache.tuscany.spi.wire.TargetInvoker;
-import org.apache.tuscany.spi.wire.TargetWire;
+import org.apache.tuscany.spi.wire.ServiceWire;
import org.jmock.Mock;
import org.jmock.MockObjectTestCase;
import org.jmock.core.Invocation;
@@ -37,7 +37,7 @@
/**
* Tests a basic invocation down a source wire
*/
- public void testSourceWireInvocation() throws Exception {
+ public void testReferenceWireInvocation() throws Exception {
ModuleScopeContext scope = new ModuleScopeContext(null);
scope.start();
List<Class<?>> services = new ArrayList<Class<?>>();
@@ -45,7 +45,7 @@
GroovyAtomicContext<Greeting> context = new GroovyAtomicContext<Greeting>("source", SCRIPT, services,
Scope.MODULE, null, null, scope);
scope.register(context);
- Mock mock = mock(SourceWire.class);
+ Mock mock = mock(ReferenceWire.class);
mock.expects(atLeastOnce()).method("getTargetService").will(
returnValue(new Greeting() {
public String greet(String name) {
@@ -53,8 +53,8 @@
}
}));
mock.expects(atLeastOnce()).method("getReferenceName").will(returnValue("wire"));
- SourceWire<Greeting> wire = (SourceWire<Greeting>) mock.proxy();
- context.addSourceWire(wire);
+ ReferenceWire<Greeting> wire = (ReferenceWire<Greeting>) mock.proxy();
+ context.addReferenceWire(wire);
Greeting greeting = context.getService();
assertEquals("foo", greeting.greet("foo"));
scope.stop();
@@ -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(TargetWire.class);
+ Mock mock = mock(ServiceWire.class);
mock.stubs().method("getServiceName").will(returnValue("Greeting"));
mock.expects(atLeastOnce()).method("getTargetService").will(
new Stub() {
@@ -102,8 +102,8 @@
}
});
- TargetWire<Greeting> wire = (TargetWire<Greeting>) mock.proxy();
- context.addTargetWire(wire);
+ ServiceWire<Greeting> wire = (ServiceWire<Greeting>) mock.proxy();
+ context.addServiceWire(wire);
Greeting greeting = (Greeting) context.getService("Greeting");
assertEquals("foo", greeting.greet("foo"));
scope.stop();
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=410128&r1=410127&r2=410128&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 10:32:03 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.TargetWire;
+import org.apache.tuscany.spi.wire.ServiceWire;
/**
* Provides a runtime context for Java component implementations
@@ -56,7 +56,7 @@
}
public Object getService(String name) throws TargetException {
- TargetWire<?> wire = targetWires.get(name);
+ ServiceWire<?> 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=410128&r1=410127&r2=410128&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 10:32:03 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.TargetWire;
+import org.apache.tuscany.spi.wire.ServiceWire;
import org.jmock.Mock;
import org.jmock.MockObjectTestCase;
@@ -22,12 +22,12 @@
final JavaAtomicContext<?> context =
MockContextFactory.createJavaAtomicContext("target", scope, TargetImpl.class, Target.class, Scope.MODULE);
- Mock mock = mock(TargetWire.class);
+ Mock mock = mock(ServiceWire.class);
mock.stubs().method("getServiceName").will(returnValue("Target"));
mock.stubs().method("getInvocationChains").will(returnValue(Collections.emptyMap()));
- TargetWire<Target> wire = (TargetWire<Target>) mock.proxy();
- context.addTargetWire(wire);
+ ServiceWire<Target> wire = (ServiceWire<Target>) mock.proxy();
+ context.addServiceWire(wire);
context.prepare();
context.start();
Copied: incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/JavaReferenceWireTestCase.java (from r410119, incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/JavaSourceWireTestCase.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?p2=incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/JavaReferenceWireTestCase.java&p1=incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/JavaSourceWireTestCase.java&r1=410119&r2=410128&rev=410128&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/JavaSourceWireTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/JavaReferenceWireTestCase.java Mon May 29 10:32:03 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.SourceWire;
+import org.apache.tuscany.spi.wire.ReferenceWire;
import org.jmock.Mock;
import org.jmock.MockObjectTestCase;
@@ -19,7 +19,7 @@
*
* @version $$Rev$$ $$Date$$
*/
-public class JavaSourceWireTestCase extends MockObjectTestCase {
+public class JavaReferenceWireTestCase extends MockObjectTestCase {
public void testReferenceSet() throws Exception {
ModuleScopeContext scope = new ModuleScopeContext(null);
@@ -31,11 +31,11 @@
SourceImpl.class, Source.class,
scope.getScope(), false, null, null, null, members);
- Mock mock = mock(SourceWire.class);
+ Mock mock = mock(ReferenceWire.class);
mock.expects(atLeastOnce()).method("getTargetService").will(returnValue(target));
mock.expects(atLeastOnce()).method("getReferenceName").will(returnValue("target"));
- SourceWire<Target> wire = (SourceWire<Target>) mock.proxy();
- sourceContext.addSourceWire(wire);
+ ReferenceWire<Target> wire = (ReferenceWire<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=410128&r1=410127&r2=410128&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 10:32:03 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.TargetInvocationChainImpl;
-import org.apache.tuscany.core.wire.jdk.JDKTargetWire;
+import org.apache.tuscany.core.wire.ServiceInvocationChainImpl;
+import org.apache.tuscany.core.wire.jdk.JDKServiceWire;
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.TargetInvocationChain;
-import org.apache.tuscany.spi.wire.TargetWire;
+import org.apache.tuscany.spi.wire.ServiceInvocationChain;
+import org.apache.tuscany.spi.wire.ServiceWire;
/**
* Validates wiring from a service context to Java atomic contexts by scope
@@ -161,12 +161,12 @@
@SuppressWarnings("unchecked")
private void setupComposite(CompositeContext<?> parent, ScopeContext scope) throws NoSuchMethodException {
Connector connector = new ConnectorImpl();
- TargetWire<Target> sourceWire = createTargetWire("target", Target.class);
+ ServiceWire<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());
- TargetWire targetWire = MockContextFactory.createTargetWire("Target", Target.class);
- atomicContext.addTargetWire(targetWire);
+ ServiceWire targetWire = MockContextFactory.createTargetWire("Target", Target.class);
+ atomicContext.addServiceWire(targetWire);
parent.registerContext(serviceContext);
parent.registerContext(atomicContext);
connector.connect(serviceContext.getTargetWire(), atomicContext);
@@ -178,19 +178,19 @@
parent = new SystemCompositeContextImpl(null, null, null);
}
- public static <T> TargetWire<T> createTargetWire(String serviceName, Class<T> interfaze) {
- TargetWire<T> wire = new JDKTargetWire<T>();
+ public static <T> ServiceWire<T> createServiceWire(String serviceName, Class<T> interfaze) {
+ ServiceWire<T> wire = new JDKServiceWire<T>();
wire.setBusinessInterface(interfaze);
wire.setServiceName(serviceName);
- wire.addInvocationChains(createTargetInvocationChains(interfaze));
+ wire.addInvocationChains(createServiceInvocationChains(interfaze));
return wire;
}
- private static Map<Method, TargetInvocationChain> createTargetInvocationChains(Class<?> interfaze) {
- Map<Method, TargetInvocationChain> invocations = new MethodHashMap<TargetInvocationChain>();
+ private static Map<Method, ServiceInvocationChain> createServiceInvocationChains(Class<?> interfaze) {
+ Map<Method, ServiceInvocationChain> invocations = new MethodHashMap<ServiceInvocationChain>();
Method[] methods = interfaze.getMethods();
for (Method method : methods) {
- TargetInvocationChain chain = new TargetInvocationChainImpl(method);
+ ServiceInvocationChain chain = new ServiceInvocationChainImpl(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=410128&r1=410127&r2=410128&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 10:32:03 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.SourceInvocationChainImpl;
-import org.apache.tuscany.core.wire.TargetInvocationChainImpl;
-import org.apache.tuscany.core.wire.jdk.JDKSourceWire;
-import org.apache.tuscany.core.wire.jdk.JDKTargetWire;
+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.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.SourceInvocationChain;
-import org.apache.tuscany.spi.wire.SourceWire;
-import org.apache.tuscany.spi.wire.TargetInvocationChain;
+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.TargetInvoker;
-import org.apache.tuscany.spi.wire.TargetWire;
+import org.apache.tuscany.spi.wire.ServiceWire;
/**
* @version $$Rev$$ $$Date$$
@@ -112,17 +112,17 @@
MessageHandler targetRequestHeadHandler,
MessageHandler targetResponseHeadHandler) throws Exception {
JavaAtomicContext targetContext = createJavaAtomicContext(targetName, targetScope, targetClass, targetScope.getScope());
- TargetWire targetWire = createTargetWire(targetService.getName().substring(
+ ServiceWire serviceWire = createServiceWire(targetService.getName().substring(
targetService.getName().lastIndexOf('.') + 1), targetService, targetHeadInterceptor, targetRequestHeadHandler, targetResponseHeadHandler);
- targetContext.addTargetWire(targetWire);
+ targetContext.addServiceWire(serviceWire);
JavaAtomicContext sourceContext = createJavaAtomicContext(sourceName, null, sourceScope, sourceClass, sourceClass, sourceScope.getScope(), false, null, null, null, members);
- SourceWire sourceWire = createSourceWire(targetName, sourceReferenceClass, sourceHeadInterceptor,
+ ReferenceWire referenceWire = createReferenceWire(targetName, sourceReferenceClass, sourceHeadInterceptor,
sourceHeadRequestHandler, sourceHeadResponseHandler);
- sourceContext.addSourceWire(sourceWire);
+ sourceContext.addReferenceWire(referenceWire);
targetScope.register(targetContext);
sourceScope.register(sourceContext);
- connect(sourceWire, targetWire, targetContext, false);
+ connect(referenceWire, serviceWire, targetContext, false);
Map<String, AtomicContext> contexts = new HashMap<String, AtomicContext>();
contexts.put(sourceName, sourceContext);
contexts.put(targetName, targetContext);
@@ -150,122 +150,122 @@
String targetName, Class<?> targetService, Class<?> targetClass,
Map<String, Member> members, ScopeContext targetScope) throws Exception {
JavaAtomicContext targetContext = createJavaAtomicContext(targetName, targetScope, targetClass, targetScope.getScope());
- TargetWire targetWire = createTargetWire(targetService.getName().substring(
+ ServiceWire serviceWire = createServiceWire(targetService.getName().substring(
targetService.getName().lastIndexOf('.') + 1), targetService, null, null, null);
- targetContext.addTargetWire(targetWire);
+ targetContext.addServiceWire(serviceWire);
JavaAtomicContext sourceContext = createJavaAtomicContext(sourceName, null, sourceScope, sourceClass, sourceClass, sourceScope.getScope(), false, null, null, null, members);
- SourceWire sourceWire = createSourceWire(targetName, sourceReferenceClass, null, null, null);
- List<SourceWire> factories = new ArrayList<SourceWire>();
- factories.add(sourceWire);
- sourceContext.addSourceWires(sourceReferenceClass, factories);
+ ReferenceWire referenceWire = createReferenceWire(targetName, sourceReferenceClass, null, null, null);
+ List<ReferenceWire> factories = new ArrayList<ReferenceWire>();
+ factories.add(referenceWire);
+ sourceContext.addReferenceWires(sourceReferenceClass, factories);
targetScope.register(targetContext);
sourceScope.register(sourceContext);
- connect(sourceWire, targetWire, targetContext, false);
+ connect(referenceWire, serviceWire, targetContext, false);
Map<String, AtomicContext> contexts = new HashMap<String, AtomicContext>();
contexts.put(sourceName, sourceContext);
contexts.put(targetName, targetContext);
return contexts;
}
- public static <T> TargetWire<T> createTargetWire(String serviceName, Class<T> interfaze) {
- return createTargetWire(serviceName, interfaze, null, null, null);
+ public static <T> ServiceWire<T> createTargetWire(String serviceName, Class<T> interfaze) {
+ return createServiceWire(serviceName, interfaze, null, null, null);
}
- public static <T> TargetWire<T> createTargetWire(String serviceName, Class<T> interfaze,
- Interceptor headInterceptor,
- MessageHandler headRequestHandler,
- MessageHandler headResponseHandler) {
- TargetWire<T> wire = new JDKTargetWire<T>();
+ public static <T> ServiceWire<T> createServiceWire(String serviceName, Class<T> interfaze,
+ Interceptor headInterceptor,
+ MessageHandler headRequestHandler,
+ MessageHandler headResponseHandler) {
+ ServiceWire<T> wire = new JDKServiceWire<T>();
wire.setBusinessInterface(interfaze);
wire.setServiceName(serviceName);
- wire.addInvocationChains(createTargetInvocationChains(interfaze, headInterceptor, headRequestHandler, headResponseHandler));
+ wire.addInvocationChains(createServiceInvocationChains(interfaze, headInterceptor, headRequestHandler, headResponseHandler));
return wire;
}
- public static <T> SourceWire<T> createSourceWire(String refName, Class<T> interfaze,
- Interceptor headInterceptor,
- MessageHandler headRequestHandler,
- MessageHandler headResponseHandler) {
+ public static <T> ReferenceWire<T> createReferenceWire(String refName, Class<T> interfaze,
+ Interceptor headInterceptor,
+ MessageHandler headRequestHandler,
+ MessageHandler headResponseHandler) {
- SourceWire<T> wire = new JDKSourceWire<T>();
+ ReferenceWire<T> wire = new JDKReferenceWire<T>();
wire.setReferenceName(refName);
- wire.addInvocationChains(createSourceInvocationChains(interfaze, headInterceptor, headRequestHandler, headResponseHandler));
+ wire.addInvocationChains(createReferenceInvocationChains(interfaze, headInterceptor, headRequestHandler, headResponseHandler));
wire.setBusinessInterface(interfaze);
return wire;
}
- public static <T> SourceWire<T> createSourceWire(String refName, Class<T> interfaze) {
- SourceWire<T> wire = new JDKSourceWire<T>();
+ public static <T> ReferenceWire<T> createReferenceWire(String refName, Class<T> interfaze) {
+ ReferenceWire<T> wire = new JDKReferenceWire<T>();
wire.setReferenceName(refName);
- wire.addInvocationChains(createSourceInvocationChains(interfaze));
+ wire.addInvocationChains(createReferenceInvocationChains(interfaze));
wire.setBusinessInterface(interfaze);
return wire;
}
/**
- * @param sourceWire
- * @param targetWire
+ * @param referenceWire
+ * @param serviceWire
* @param targetContext
* @param cacheable
* @throws Exception
*/
- public static void connect(SourceWire<?> sourceWire, TargetWire<?> targetWire, JavaAtomicContext targetContext, boolean cacheable) throws Exception {
- if (targetWire != null) {
+ public static void connect(ReferenceWire<?> referenceWire, ServiceWire<?> serviceWire, JavaAtomicContext targetContext, boolean cacheable) throws Exception {
+ if (serviceWire != null) {
// if null, the target side has no interceptors or handlers
- Map<Method, TargetInvocationChain> targetInvocationConfigs = targetWire.getInvocationChains();
- for (SourceInvocationChain sourceInvocationConfig : sourceWire.getInvocationChains().values()) {
+ Map<Method, ServiceInvocationChain> targetInvocationConfigs = serviceWire.getInvocationChains();
+ for (ReferenceInvocationChain referenceInvocationConfig : referenceWire.getInvocationChains().values()) {
// match wire chains
- TargetInvocationChain targetInvocationConfig = targetInvocationConfigs.get(sourceInvocationConfig.getMethod());
- if (targetInvocationConfig == null) {
+ ServiceInvocationChain serviceInvocationConfig = targetInvocationConfigs.get(referenceInvocationConfig.getMethod());
+ if (serviceInvocationConfig == null) {
BuilderConfigException e = new BuilderConfigException("Incompatible source and target interface types for reference");
- e.setIdentifier(sourceWire.getReferenceName());
+ e.setIdentifier(referenceWire.getReferenceName());
throw e;
}
// if handler is configured, add that
- if (targetInvocationConfig.getRequestHandlers() != null) {
- sourceInvocationConfig.setTargetRequestChannel(new MessageChannelImpl(targetInvocationConfig
+ if (serviceInvocationConfig.getRequestHandlers() != null) {
+ referenceInvocationConfig.setTargetRequestChannel(new MessageChannelImpl(serviceInvocationConfig
.getRequestHandlers()));
- sourceInvocationConfig.setTargetResponseChannel(new MessageChannelImpl(targetInvocationConfig
+ referenceInvocationConfig.setTargetResponseChannel(new MessageChannelImpl(serviceInvocationConfig
.getResponseHandlers()));
} else {
// no handlers, just connect interceptors
- if (targetInvocationConfig.getHeadInterceptor() == null) {
+ if (serviceInvocationConfig.getHeadInterceptor() == null) {
BuilderConfigException e = new BuilderConfigException("No target handler or interceptor for operation");
- e.setIdentifier(targetInvocationConfig.getMethod().getName());
+ e.setIdentifier(serviceInvocationConfig.getMethod().getName());
throw e;
}
- if (!(sourceInvocationConfig.getTailInterceptor() instanceof InvokerInterceptor && targetInvocationConfig
+ if (!(referenceInvocationConfig.getTailInterceptor() instanceof InvokerInterceptor && serviceInvocationConfig
.getHeadInterceptor() instanceof InvokerInterceptor)) {
// check that we do not have the case where the only interceptors are invokers since we just need one
- sourceInvocationConfig.setTargetInterceptor(targetInvocationConfig.getHeadInterceptor());
+ referenceInvocationConfig.setTargetInterceptor(serviceInvocationConfig.getHeadInterceptor());
}
}
}
- for (SourceInvocationChain sourceInvocationConfig : sourceWire.getInvocationChains()
+ for (ReferenceInvocationChain referenceInvocationConfig : referenceWire.getInvocationChains()
.values()) {
- //FIXME should use target method, not sourceInvocationConfig.getMethod()
- TargetInvoker invoker = new JavaTargetInvoker(sourceInvocationConfig.getMethod(), targetContext);
+ //FIXME should use target method, not referenceInvocationConfig.getMethod()
+ TargetInvoker invoker = new JavaTargetInvoker(referenceInvocationConfig.getMethod(), targetContext);
invoker.setCacheable(cacheable);
- sourceInvocationConfig.setTargetInvoker(invoker);
+ referenceInvocationConfig.setTargetInvoker(invoker);
}
}
}
- private static Map<Method, SourceInvocationChain> createSourceInvocationChains(Class<?> interfaze) {
- return createSourceInvocationChains(interfaze, null, null, null);
+ private static Map<Method, ReferenceInvocationChain> createReferenceInvocationChains(Class<?> interfaze) {
+ return createReferenceInvocationChains(interfaze, null, null, null);
}
- private static Map<Method, SourceInvocationChain> createSourceInvocationChains(Class<?> interfaze,
- Interceptor headInterceptor, MessageHandler headRequestHandler,
- MessageHandler headResponseHandler) {
- Map<Method, SourceInvocationChain> invocations = new HashMap<Method, SourceInvocationChain>();
+ private static Map<Method, ReferenceInvocationChain> createReferenceInvocationChains(Class<?> interfaze,
+ Interceptor headInterceptor, MessageHandler headRequestHandler,
+ MessageHandler headResponseHandler) {
+ Map<Method, ReferenceInvocationChain> invocations = new HashMap<Method, ReferenceInvocationChain>();
Method[] methods = interfaze.getMethods();
for (Method method : methods) {
- SourceInvocationChain chain = new SourceInvocationChainImpl(method);
+ ReferenceInvocationChain chain = new ReferenceInvocationChainImpl(method);
if (headInterceptor != null) {
chain.addInterceptor(headInterceptor);
}
@@ -280,13 +280,13 @@
return invocations;
}
- private static Map<Method, TargetInvocationChain> createTargetInvocationChains(Class<?> interfaze,
- Interceptor headInterceptor, MessageHandler headRequestHandler,
- MessageHandler headResponseHandler) {
- Map<Method, TargetInvocationChain> invocations = new MethodHashMap<TargetInvocationChain>();
+ private static Map<Method, ServiceInvocationChain> createServiceInvocationChains(Class<?> interfaze,
+ Interceptor headInterceptor, MessageHandler headRequestHandler,
+ MessageHandler headResponseHandler) {
+ Map<Method, ServiceInvocationChain> invocations = new MethodHashMap<ServiceInvocationChain>();
Method[] methods = interfaze.getMethods();
for (Method method : methods) {
- TargetInvocationChain chain = new TargetInvocationChainImpl(method);
+ ServiceInvocationChain chain = new ServiceInvocationChainImpl(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=410128&r1=410127&r2=410128&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 10:32:03 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.TargetInvocationChain;
-import org.apache.tuscany.spi.wire.TargetWire;
+import org.apache.tuscany.spi.wire.ServiceInvocationChain;
+import org.apache.tuscany.spi.wire.ServiceWire;
import org.springframework.context.support.GenericApplicationContext;
/**
@@ -39,8 +39,8 @@
(BoundService<? extends Binding>) service,
deploymentContext);
// wire service to bean invokers
- TargetWire<?> wire = childContext.getTargetWire();
- for (TargetInvocationChain chain : wire.getInvocationChains().values()) {
+ ServiceWire<?> wire = childContext.getTargetWire();
+ for (ServiceInvocationChain chain : wire.getInvocationChains().values()) {
String beanName = wire.getServiceName();
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=410128&r1=410127&r2=410128&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 10:32:03 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.TargetInvocationChain;
-import org.apache.tuscany.spi.wire.TargetWire;
+import org.apache.tuscany.spi.wire.ServiceInvocationChain;
+import org.apache.tuscany.spi.wire.ServiceWire;
import org.apache.tuscany.test.ArtifactFactory;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.support.RootBeanDefinition;
@@ -23,8 +23,8 @@
public void testInvocation() {
SpringCompositeContext context = new SpringCompositeContext("parent", createSpringContext(), null);
context.start();
- TargetWire<TestBean> wire = ArtifactFactory.createTargetWire("fooService", TestBean.class);
- for (TargetInvocationChain chain : wire.getInvocationChains().values()) {
+ ServiceWire<TestBean> wire = ArtifactFactory.createTargetWire("fooService", TestBean.class);
+ for (ServiceInvocationChain chain : wire.getInvocationChains().values()) {
chain.setTargetInvoker(context.createTargetInvoker("foo", chain.getMethod()));
}
ServiceContext<TestBean> serviceContext = new ServiceContextExtension<TestBean>("fooService", wire, context);
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=410128&r1=410127&r2=410128&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 10:32:03 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.TargetWire;
+import org.apache.tuscany.spi.wire.ServiceWire;
import org.apache.tuscany.test.ArtifactFactory;
import org.jmock.Mock;
import org.jmock.MockObjectTestCase;
@@ -35,7 +35,7 @@
Component<SpringImplementation> component = new Component<SpringImplementation>("spring", impl);
Mock mock = mock(BuilderRegistry.class);
ServiceContextExtension<TestBean> serviceContext = new ServiceContextExtension<TestBean>("fooService", null, null);
- TargetWire<TestBean> wire = ArtifactFactory.createTargetWire("foo", TestBean.class);
+ ServiceWire<TestBean> wire = ArtifactFactory.createTargetWire("foo", TestBean.class);
wire.setServiceName("foo");
serviceContext.setTargetWire(wire);
mock.expects(atLeastOnce()).method("build").will(returnValue(serviceContext));
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=410128&r1=410127&r2=410128&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 10:32:03 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.TargetWire;
+import org.apache.tuscany.spi.wire.ServiceWire;
/**
* 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(TargetWire<T> sourceWire, Context<?> targetContext) throws BuilderConfigException;
+ public <T> void connect(ServiceWire<T> serviceWire, 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=410128&r1=410127&r2=410128&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 10:32:03 2006
@@ -11,7 +11,7 @@
import org.apache.tuscany.core.wire.MessageChannelImpl;
import org.apache.tuscany.core.wire.MessageDispatcher;
import org.apache.tuscany.core.wire.RequestResponseInterceptor;
-import org.apache.tuscany.core.wire.SourceAutowire;
+import org.apache.tuscany.core.wire.ReferenceAutowire;
import org.apache.tuscany.spi.QualifiedName;
import org.apache.tuscany.spi.builder.BuilderConfigException;
import org.apache.tuscany.spi.context.AtomicContext;
@@ -22,11 +22,11 @@
import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.wire.MessageChannel;
import org.apache.tuscany.spi.wire.MessageHandler;
-import org.apache.tuscany.spi.wire.SourceInvocationChain;
-import org.apache.tuscany.spi.wire.SourceWire;
-import org.apache.tuscany.spi.wire.TargetInvocationChain;
+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.TargetInvoker;
-import org.apache.tuscany.spi.wire.TargetWire;
+import org.apache.tuscany.spi.wire.ServiceWire;
/**
* The default connector implmentation
@@ -40,13 +40,13 @@
Scope scope = source.getScope();
if (source instanceof AtomicContext) {
AtomicContext<T> sourceContext = (AtomicContext<T>) source;
- for (List<SourceWire> sourceWires : sourceContext.getSourceWires().values()) {
- for (SourceWire<T> sourceWire : sourceWires) {
- if (sourceWire instanceof SourceAutowire) {
+ for (List<ReferenceWire> referenceWires : sourceContext.getReferenceWires().values()) {
+ for (ReferenceWire<T> referenceWire : referenceWires) {
+ if (referenceWire instanceof ReferenceAutowire) {
continue;
}
try {
- connect(sourceWire, parent, scope);
+ connect(referenceWire, parent, scope);
} catch (BuilderConfigException e) {
e.addContextName(source.getName());
e.addContextName(parent.getName());
@@ -63,47 +63,47 @@
}
@SuppressWarnings("unchecked")
- private <T> void connect(SourceWire<T> sourceWire, CompositeContext<?> parent, Scope sourceScope) throws BuilderConfigException {
+ private <T> void connect(ReferenceWire<T> referenceWire, 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();
+ assert(referenceWire.getTargetName() != null): "Wire target name was null";
+ QualifiedName targetName = referenceWire.getTargetName();
Context<?> target = parent.getContext(targetName.getPartName());
if (target == null) {
- BuilderConfigException e = new BuilderConfigException("Target not found for reference" + sourceWire.getReferenceName());
+ BuilderConfigException e = new BuilderConfigException("Target not found for reference" + referenceWire.getReferenceName());
e.setIdentifier(targetName.getQualifiedName());
throw e;
}
- TargetWire<?> targetWire;
+ ServiceWire<?> serviceWire;
if (target instanceof AtomicContext) {
AtomicContext<?> targetContext = (AtomicContext<?>) target;
- targetWire = targetContext.getTargetWire(targetName.getPortName());
- if (targetWire == null) {
- BuilderConfigException e = new BuilderConfigException("Target service not found for reference " + sourceWire.getReferenceName());
+ serviceWire = targetContext.getServiceWire(targetName.getPortName());
+ if (serviceWire == null) {
+ BuilderConfigException e = new BuilderConfigException("Target service not found for reference " + referenceWire.getReferenceName());
e.setIdentifier(targetName.getPortName());
throw e;
}
- if (!sourceWire.getBusinessInterface().isAssignableFrom(targetWire.getBusinessInterface())) {
+ if (!referenceWire.getBusinessInterface().isAssignableFrom(serviceWire.getBusinessInterface())) {
throw new BuilderConfigException("Incompatible source and target interfaces");
}
- connect(sourceWire, (TargetWire<T>) targetWire, target, isOptimizable(sourceScope, targetContext.getScope()));
+ connect(referenceWire, (ServiceWire<T>) serviceWire, target, isOptimizable(sourceScope, targetContext.getScope()));
} else if (target instanceof ReferenceContext) {
- targetWire = ((ReferenceContext) target).getTargetWire();
- assert(targetWire != null);
- if (!sourceWire.getBusinessInterface().isAssignableFrom(targetWire.getBusinessInterface())) {
+ serviceWire = ((ReferenceContext) target).getTargetWire();
+ assert(serviceWire != null);
+ if (!referenceWire.getBusinessInterface().isAssignableFrom(serviceWire.getBusinessInterface())) {
throw new BuilderConfigException("Incompatible source and target interfaces");
}
- connect(sourceWire, (TargetWire<T>) targetWire, target, isOptimizable(sourceScope, target.getScope()));
+ connect(referenceWire, (ServiceWire<T>) serviceWire, target, isOptimizable(sourceScope, target.getScope()));
} else {
- BuilderConfigException e = new BuilderConfigException("Invalid wire target type for reference " + sourceWire.getReferenceName());
+ BuilderConfigException e = new BuilderConfigException("Invalid wire target type for reference " + referenceWire.getReferenceName());
e.setIdentifier(targetName.getQualifiedName());
}
}
@SuppressWarnings("unchecked")
- public <T> void connect(TargetWire<T> sourceWire, Context<?> targetContext) throws BuilderConfigException {
- TargetWire<T> targetWire;
+ public <T> void connect(ServiceWire<T> sourceWire, Context<?> targetContext) throws BuilderConfigException {
+ ServiceWire<T> targetWire;
if (targetContext instanceof ComponentContext) {
- targetWire = ((ComponentContext) targetContext).getTargetWire(sourceWire.getServiceName());
+ targetWire = ((ComponentContext) targetContext).getServiceWire(sourceWire.getServiceName());
} else if (targetContext instanceof ReferenceContext) {
targetWire = ((ReferenceContext) targetContext).getTargetWire();
} else {
@@ -116,7 +116,7 @@
sourceWire.setTargetWire(targetWire);
return;
}
- for (TargetInvocationChain sourceChain : sourceWire.getInvocationChains().values()) {
+ for (ServiceInvocationChain sourceChain : sourceWire.getInvocationChains().values()) {
if (targetWire.getInvocationChains() != null || targetWire.getInvocationChains().isEmpty()) {
if (sourceChain.getTailInterceptor() != null &&
!(sourceChain.getTailInterceptor() instanceof InvokerInterceptor)) {
@@ -132,126 +132,126 @@
}
}
}
- TargetInvocationChain targetChain = targetWire.getInvocationChains().get(sourceChain.getMethod());
- connect(sourceChain, targetChain);
+ ServiceInvocationChain serviceChain = targetWire.getInvocationChains().get(sourceChain.getMethod());
+ connect(sourceChain, serviceChain);
}
}
/**
* Public access set for unit testing
*/
- public <T> void connect(SourceWire<T> source, TargetWire<T> targetWire, Context<?> target, boolean optimizable) {
- Map<Method, TargetInvocationChain> targetInvocationConfigs = targetWire.getInvocationChains();
+ public <T> void connect(ReferenceWire<T> source, ServiceWire<T> serviceWire, Context<?> target, boolean optimizable) {
+ Map<Method, ServiceInvocationChain> targetInvocationConfigs = serviceWire.getInvocationChains();
// perform optimization, if possible
if (optimizable && source.getInvocationChains().isEmpty() && targetInvocationConfigs.isEmpty()) {
- source.setTargetWire(targetWire);
+ source.setTargetWire(serviceWire);
return;
}
- String serviceName = targetWire.getServiceName();
- for (SourceInvocationChain sourceChain : source.getInvocationChains().values()) {
+ String serviceName = serviceWire.getServiceName();
+ for (ReferenceInvocationChain referenceChain : source.getInvocationChains().values()) {
// match wire chains
- TargetInvocationChain targetChain = targetInvocationConfigs.get(sourceChain.getMethod());
- if (targetChain == null) {
+ ServiceInvocationChain serviceChain = targetInvocationConfigs.get(referenceChain.getMethod());
+ if (serviceChain == null) {
BuilderConfigException e = new BuilderConfigException("Incompatible source and target chain interfaces for reference");
e.setIdentifier(source.getReferenceName());
throw e;
}
if (target instanceof ReferenceContext) {
ReferenceContext referenceContext = (ReferenceContext) target;
- TargetInvoker invoker = referenceContext.createTargetInvoker(serviceName, sourceChain.getMethod());
- connect(sourceChain, targetChain, invoker);
+ TargetInvoker invoker = referenceContext.createTargetInvoker(serviceName, referenceChain.getMethod());
+ connect(referenceChain, serviceChain, invoker);
} else {
ComponentContext componentContext = (ComponentContext) target;
- TargetInvoker invoker = componentContext.createTargetInvoker(serviceName, sourceChain.getMethod());
- connect(sourceChain, targetChain, invoker);
+ TargetInvoker invoker = componentContext.createTargetInvoker(serviceName, referenceChain.getMethod());
+ connect(referenceChain, serviceChain, invoker);
}
}
}
- public void connect(SourceInvocationChain sourceChain, TargetInvocationChain targetChain, TargetInvoker invoker) {
+ public void connect(ReferenceInvocationChain referenceChain, ServiceInvocationChain serviceChain, TargetInvoker invoker) {
// if handlers are configured, add them
- if (targetChain.getRequestHandlers() != null || targetChain.getResponseHandlers() != null) {
- if (targetChain.getRequestHandlers() == null) {
+ if (serviceChain.getRequestHandlers() != null || serviceChain.getResponseHandlers() != null) {
+ if (serviceChain.getRequestHandlers() == null) {
// the target may not have request handlers, so bridge it on the source
- if (targetChain.getHeadInterceptor() != null) {
+ if (serviceChain.getHeadInterceptor() != null) {
List<MessageHandler> handlers = new ArrayList<MessageHandler>();
- handlers.add(new MessageDispatcher(targetChain.getHeadInterceptor()));
+ handlers.add(new MessageDispatcher(serviceChain.getHeadInterceptor()));
MessageChannel channel = new MessageChannelImpl(handlers);
- sourceChain.setTargetRequestChannel(channel);
+ referenceChain.setTargetRequestChannel(channel);
} else {
- BuilderConfigException e = new BuilderConfigException("Target chain must have an interceptor");
- e.setIdentifier(targetChain.getMethod().getName());
+ BuilderConfigException e = new BuilderConfigException("Service chain must have an interceptor");
+ e.setIdentifier(serviceChain.getMethod().getName());
throw e;
}
} else {
- sourceChain.setTargetRequestChannel(new MessageChannelImpl(targetChain.getRequestHandlers()));
+ referenceChain.setTargetRequestChannel(new MessageChannelImpl(serviceChain.getRequestHandlers()));
}
- sourceChain.setTargetResponseChannel(new MessageChannelImpl(targetChain.getResponseHandlers()));
+ referenceChain.setTargetResponseChannel(new MessageChannelImpl(serviceChain.getResponseHandlers()));
} else {
// no handlers, just connect interceptors
- if (targetChain.getHeadInterceptor() == null) {
+ if (serviceChain.getHeadInterceptor() == null) {
BuilderConfigException e = new BuilderConfigException("No chain handler or interceptor for operation");
- e.setIdentifier(targetChain.getMethod().getName());
+ e.setIdentifier(serviceChain.getMethod().getName());
throw e;
}
- if (!(sourceChain.getTailInterceptor() instanceof InvokerInterceptor && targetChain
+ if (!(referenceChain.getTailInterceptor() instanceof InvokerInterceptor && serviceChain
.getHeadInterceptor() instanceof InvokerInterceptor)) {
// check that we do not have the case where the only interceptors are invokers since we just need one
- sourceChain.setTargetInterceptor(targetChain.getHeadInterceptor());
+ referenceChain.setTargetInterceptor(serviceChain.getHeadInterceptor());
}
}
- sourceChain.build(); //FIXME build should be moved out
- sourceChain.setTargetInvoker(invoker);
+ referenceChain.build(); //FIXME build should be moved out
+ referenceChain.setTargetInvoker(invoker);
}
- public void connect(TargetInvocationChain sourceChain, TargetInvocationChain targetChain) {
+ public void connect(ServiceInvocationChain sourceChain, ServiceInvocationChain serviceChain) {
if (sourceChain.getTailInterceptor() != null) {
// connect the tail interceptor to a target request channel or target interceptor
- if (targetChain.getRequestHandlers() != null) {
- MessageChannel targetRequestChannel = targetChain.getRequestChannel();
- MessageChannel targetResponseChannel = targetChain.getResponseChannel();
+ if (serviceChain.getRequestHandlers() != null) {
+ MessageChannel targetRequestChannel = serviceChain.getRequestChannel();
+ MessageChannel targetResponseChannel = serviceChain.getResponseChannel();
sourceChain.setTargetRequestChannel(targetRequestChannel);
sourceChain.setTargetResponseChannel(targetResponseChannel);
sourceChain.getTailInterceptor().setNext(new RequestResponseInterceptor(null, targetRequestChannel,
null, targetResponseChannel));
} else {
// connect to target interceptor
- if (targetChain.getHeadInterceptor() == null) {
- BuilderConfigException e = new BuilderConfigException("Target chain must have an interceptor");
- e.setIdentifier(targetChain.getMethod().getName());
+ if (serviceChain.getHeadInterceptor() == null) {
+ BuilderConfigException e = new BuilderConfigException("Service chain must have an interceptor");
+ e.setIdentifier(serviceChain.getMethod().getName());
throw e;
}
- sourceChain.getTailInterceptor().setNext(new BridgingInterceptor(targetChain.getHeadInterceptor()));
+ sourceChain.getTailInterceptor().setNext(new BridgingInterceptor(serviceChain.getHeadInterceptor()));
}
} else {
// no source interceptor
List<MessageHandler> sourceRequestHandlers = sourceChain.getRequestHandlers();
- List<MessageHandler> targetRequestHandlers = targetChain.getRequestHandlers();
- List<MessageHandler> targetResponseHandlers = targetChain.getResponseHandlers();
+ List<MessageHandler> targetRequestHandlers = serviceChain.getRequestHandlers();
+ List<MessageHandler> targetResponseHandlers = serviceChain.getResponseHandlers();
List<MessageHandler> sourceResponseHandlers = sourceChain.getResponseHandlers();
if (sourceRequestHandlers != null && !sourceRequestHandlers.isEmpty()) {
// connect source and target side request handlers
if (targetRequestHandlers != null && !targetRequestHandlers.isEmpty()) {
sourceRequestHandlers.add(new BridgingHandler(targetRequestHandlers.get(0)));
} else {
- sourceRequestHandlers.add(new MessageDispatcher(targetChain.getHeadInterceptor()));
+ sourceRequestHandlers.add(new MessageDispatcher(serviceChain.getHeadInterceptor()));
}
} else {
// no source interceptor or request handlers
- MessageChannel targetRequestChannel = targetChain.getRequestChannel();
- MessageChannel targetResponseChannel = targetChain.getResponseChannel();
+ MessageChannel targetRequestChannel = serviceChain.getRequestChannel();
+ MessageChannel targetResponseChannel = serviceChain.getResponseChannel();
if ((targetRequestHandlers == null || targetRequestHandlers.isEmpty())
&& (targetResponseHandlers == null || targetResponseHandlers.isEmpty())){
// no handlers on target, connect directly to head target interceptor (there must be at least one)
- if (targetChain.getHeadInterceptor() == null) {
- BuilderConfigException e = new BuilderConfigException("Target chain must have an interceptor");
- e.setIdentifier(targetChain.getMethod().getName());
+ if (serviceChain.getHeadInterceptor() == null) {
+ BuilderConfigException e = new BuilderConfigException("Service chain must have an interceptor");
+ e.setIdentifier(serviceChain.getMethod().getName());
throw e;
}
- sourceChain.setTargetInterceptor(targetChain.getHeadInterceptor());
+ sourceChain.setTargetInterceptor(serviceChain.getHeadInterceptor());
} else {
if (targetRequestChannel == null) {
- sourceChain.setTargetInterceptor(new BridgingInterceptor(targetChain.getHeadInterceptor()));
+ sourceChain.setTargetInterceptor(new BridgingInterceptor(serviceChain.getHeadInterceptor()));
} else {
sourceChain.setTargetRequestChannel(targetRequestChannel);
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=410128&r1=410127&r2=410128&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 10:32:03 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.SourceWire;
+import org.apache.tuscany.spi.wire.ReferenceWire;
/**
* Base implementation of an {@link AtomicContext} whose type is a Java class
@@ -129,7 +129,7 @@
return ctx;
}
- public void onSourceWire(SourceWire wire) {
+ public void onReferenceWire(ReferenceWire wire) {
String referenceName = wire.getReferenceName();
Member member = members.get(referenceName);
if (member == null) {
@@ -138,7 +138,7 @@
injectors.add(createInjector(member, wire));
}
- public void onSourceWires(Class<?> multiplicityClass, List<SourceWire> wires) {
+ public void onReferenceWires(Class<?> multiplicityClass, List<ReferenceWire> 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, SourceWire wire) {
+ protected Injector createInjector(Member member, ReferenceWire 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<SourceWire> wireFactories) {
+ protected Injector createMultiplicityInjector(Member member, Class<?> interfaceType, List<ReferenceWire> wireFactories) {
List<ObjectFactory<?>> factories = new ArrayList<ObjectFactory<?>>();
- for (SourceWire wire : wireFactories) {
+ for (ReferenceWire 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=410128&r1=410127&r2=410128&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 10:32:03 2006
@@ -2,7 +2,7 @@
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.ObjectFactory;
-import org.apache.tuscany.spi.wire.SourceWire;
+import org.apache.tuscany.spi.wire.ReferenceWire;
/**
* Uses a wire to return an object instance
@@ -11,9 +11,9 @@
*/
public class WireObjectFactory implements ObjectFactory {
- private SourceWire factory;
+ private ReferenceWire factory;
- public WireObjectFactory(SourceWire factory) {
+ public WireObjectFactory(ReferenceWire 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=410128&r1=410127&r2=410128&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 10:32:03 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.SourceWire;
-import org.apache.tuscany.spi.wire.TargetWire;
+import org.apache.tuscany.spi.wire.ReferenceWire;
+import org.apache.tuscany.spi.wire.ServiceWire;
/**
* @version $Rev$ $Date$
@@ -40,7 +40,7 @@
}
- public void buildSource(Reference reference, SourceWire wire) throws BuilderException {
+ public void buildSource(Reference reference, ReferenceWire 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, TargetWire wire) throws BuilderException {
+ public void buildTarget(Service service, ServiceWire 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=410128&r1=410127&r2=410128&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 10:32:03 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.TargetInvocationChain;
-import org.apache.tuscany.spi.wire.TargetWire;
+import org.apache.tuscany.spi.wire.ServiceInvocationChain;
+import org.apache.tuscany.spi.wire.ServiceWire;
import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.OneWay;
@@ -50,8 +50,8 @@
this.workManager = workManager;
}
- public void build(Service service, TargetWire<?> wire) throws BuilderException {
- for (TargetInvocationChain chain : wire.getInvocationChains().values()) {
+ public void build(Service service, ServiceWire<?> wire) throws BuilderException {
+ for (ServiceInvocationChain 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=410128&r1=410127&r2=410128&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 10:32:03 2006
@@ -4,9 +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.SystemSourceWire;
-import org.apache.tuscany.core.system.wire.SystemTargetAutowire;
-import org.apache.tuscany.core.system.wire.SystemTargetWire;
+import org.apache.tuscany.core.system.wire.SystemServiceAutowire;
+import org.apache.tuscany.core.system.wire.SystemServiceWire;
import org.apache.tuscany.spi.model.BoundReference;
import org.apache.tuscany.spi.model.BoundService;
import org.apache.tuscany.spi.QualifiedName;
@@ -15,7 +14,7 @@
import org.apache.tuscany.spi.context.CompositeContext;
import org.apache.tuscany.spi.context.Context;
import org.apache.tuscany.spi.context.ComponentContext;
-import org.apache.tuscany.spi.wire.TargetWire;
+import org.apache.tuscany.spi.wire.ServiceWire;
/**
* @version $$Rev$$ $$Date$$
@@ -26,7 +25,7 @@
Class<?> interfaze = boundService.getServiceContract().getInterfaceClass();
QualifiedName targetName = new QualifiedName(boundService.getTarget().getPath());
ComponentContext target = (ComponentContext)parent.getContext(targetName.getPartName());
- SystemTargetWire<?> wire = new SystemTargetWire(targetName.getPortName(), interfaze,target);
+ SystemServiceWire<?> wire = new SystemServiceWire(targetName.getPortName(), interfaze,target);
return new SystemServiceContextImpl(boundService.getName(), wire, parent);
}
@@ -35,7 +34,7 @@
AutowireContext autowireContext = (AutowireContext)parent.getParent();
Class<?> interfaze = boundReference.getServiceContract().getInterfaceClass();
SystemReferenceContextImpl ctx = new SystemReferenceContextImpl(boundReference.getName(), interfaze, parent);
- TargetWire<?> wire = new SystemTargetAutowire(interfaze, autowireContext);
+ ServiceWire<?> wire = new SystemServiceAutowire(interfaze, autowireContext);
ctx.setTargetWire(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=410128&r1=410127&r2=410128&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 10:32:03 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.SystemSourceAutowire;
-import org.apache.tuscany.core.system.wire.SystemSourceWire;
-import org.apache.tuscany.core.system.wire.SystemTargetWire;
+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.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.SourceWire;
+import org.apache.tuscany.spi.wire.ReferenceWire;
/**
* @version $$Rev$$ $$Date$$
@@ -85,8 +85,8 @@
for (Service service : component.getImplementation().getComponentType().getServices().values()) {
Class interfaze = service.getServiceContract().getInterfaceClass();
- SystemTargetWire wire = new SystemTargetWire(service.getName(), interfaze, systemContext);
- systemContext.addTargetWire(wire);
+ SystemServiceWire wire = new SystemServiceWire(service.getName(), interfaze, systemContext);
+ systemContext.addServiceWire(wire);
}
for (ReferenceTarget target : component.getReferenceTargets().values()) {
String referenceName = target.getReferenceName();
@@ -99,16 +99,16 @@
e.addContextName(parent.getName());
throw e;
}
- SourceWire<?> wire;
+ ReferenceWire<?> wire;
if (target.getReference().isAutowire()) {
- wire = new SystemSourceAutowire(referenceName, interfaze, autowireContext);
+ wire = new SystemReferenceAutowire(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 SystemSourceWire(referenceName, targetName, interfaze);
+ wire = new SystemReferenceWire(referenceName, targetName, interfaze);
}
- systemContext.addSourceWire(wire);
+ systemContext.addReferenceWire(wire);
}
return systemContext;
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemCompositeContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemCompositeContextImpl.java?rev=410128&r1=410127&r2=410128&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemCompositeContextImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemCompositeContextImpl.java Mon May 29 10:32:03 2006
@@ -1,16 +1,9 @@
package org.apache.tuscany.core.system.context;
-import java.lang.reflect.Method;
-import java.util.List;
-import java.util.Map;
-
import org.apache.tuscany.core.context.AbstractCompositeContext;
import org.apache.tuscany.core.context.AutowireContext;
import org.apache.tuscany.core.context.AutowireResolutionException;
import org.apache.tuscany.spi.context.CompositeContext;
-import org.apache.tuscany.spi.wire.TargetInvoker;
-import org.apache.tuscany.spi.wire.SourceWire;
-import org.apache.tuscany.spi.wire.TargetWire;
/**
* Implements an composite context for system components. In addition, it implements an autowire policy A
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org