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/12/30 22:42:28 UTC
svn commit: r491325 [6/6] - in /incubator/tuscany/java/sca:
kernel/core/src/main/java/org/apache/tuscany/core/binding/
kernel/core/src/main/java/org/apache/tuscany/core/binding/local/
kernel/core/src/main/java/org/apache/tuscany/core/builder/ kernel/co...
Modified: incubator/tuscany/java/sca/services/containers/container.ruby/src/test/java/org/apache/tuscany/container/ruby/ScriptInvokeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.ruby/src/test/java/org/apache/tuscany/container/ruby/ScriptInvokeTestCase.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.ruby/src/test/java/org/apache/tuscany/container/ruby/ScriptInvokeTestCase.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.ruby/src/test/java/org/apache/tuscany/container/ruby/ScriptInvokeTestCase.java Sat Dec 30 13:42:22 2006
@@ -37,9 +37,9 @@
public void testBasicScriptInvocation() throws Exception {
// ModuleScopeContainer scope = new ModuleScopeContainer(null);
// scope.start();
-// List<Class<?>> services = new ArrayList<Class<?>>();
-// services.add(Greeting.class);
-// RubyComponent<Greeting> context = new RubyComponent<Greeting>("source", rhinoScript, services, new HashMap<String, Object>(),
+// List<Class<?>> serviceBindings = new ArrayList<Class<?>>();
+// serviceBindings.add(Greeting.class);
+// RubyComponent<Greeting> context = new RubyComponent<Greeting>("source", rhinoScript, serviceBindings, new HashMap<String, Object>(),
// null, scope, ArtifactFactory.createWireService(), null);
// scope.register(context);
// Greeting object = (Greeting) context.getServiceInstance();
Modified: incubator/tuscany/java/sca/services/containers/container.ruby/src/test/java/org/apache/tuscany/container/ruby/WireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.ruby/src/test/java/org/apache/tuscany/container/ruby/WireTestCase.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.ruby/src/test/java/org/apache/tuscany/container/ruby/WireTestCase.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.ruby/src/test/java/org/apache/tuscany/container/ruby/WireTestCase.java Sat Dec 30 13:42:22 2006
@@ -61,9 +61,9 @@
// ModuleScopeContainer scope = new ModuleScopeContainer(null);
// scope.start();
//
- // List<Class<?>> services = new ArrayList<Class<?>>();
- // services.add(Greeting.class);
- // JavaScriptComponent<Greeting> context = new JavaScriptComponent<Greeting>("source", implClass1, services, properties, null, scope,
+ // List<Class<?>> serviceBindings = new ArrayList<Class<?>>();
+ // serviceBindings.add(Greeting.class);
+ // JavaScriptComponent<Greeting> context = new JavaScriptComponent<Greeting>("source", implClass1, serviceBindings, properties, null, scope,
// ArtifactFactory.createWireService(), null);
// OutboundWire<?> wire = ArtifactFactory.createOutboundWire("wire", Greeting.class);
// ArtifactFactory.terminateWire(wire);
Modified: incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponent.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponent.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponent.java Sat Dec 30 13:42:22 2006
@@ -52,7 +52,7 @@
@SuppressWarnings("unchecked")
public Object createInstance() throws ObjectCreationException {
- return factory.getInstance(); //(services, context);
+ return factory.getInstance(); //(serviceBindings, context);
}
public TargetInvoker createTargetInvoker(String targetName, Operation operation, InboundWire callbackWire) {
Modified: incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponentBuilder.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptComponentBuilder.java Sat Dec 30 13:42:22 2006
@@ -55,7 +55,7 @@
ScriptImplementation implementation = componentDefinition.getImplementation();
ScriptComponentType componentType = implementation.getComponentType();
- // get list of services provided by this component
+ // get list of serviceBindings provided by this component
Collection<ServiceDefinition> collection = componentType.getServices().values();
List<Class<?>> services = new ArrayList<Class<?>>(collection.size());
for (ServiceDefinition serviceDefinition : collection) {
Modified: incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptInstanceFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptInstanceFactory.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptInstanceFactory.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.script/src/main/java/org/apache/tuscany/container/script/ScriptInstanceFactory.java Sat Dec 30 13:42:22 2006
@@ -58,7 +58,7 @@
*
* @return a RhinoScriptInstance
*/
- //public ScriptInstanceImpl createInstance(List<Class<?>> services, Map<String, Object> context) {
+ //public ScriptInstanceImpl createInstance(List<Class<?>> serviceBindings, Map<String, Object> context) {
public ScriptInstance getInstance() throws ObjectCreationException {
try {
Modified: incubator/tuscany/java/sca/services/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/impl/SpringCompositeBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/impl/SpringCompositeBuilder.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/impl/SpringCompositeBuilder.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/impl/SpringCompositeBuilder.java Sat Dec 30 13:42:22 2006
@@ -26,9 +26,9 @@
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.Reference;
import org.apache.tuscany.spi.component.Service;
+import org.apache.tuscany.spi.component.ServiceBinding;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.ComponentBuilderExtension;
-import org.apache.tuscany.spi.model.BindingDefinition;
import org.apache.tuscany.spi.model.BoundReferenceDefinition;
import org.apache.tuscany.spi.model.BoundServiceDefinition;
import org.apache.tuscany.spi.model.ComponentDefinition;
@@ -60,18 +60,22 @@
// We need to set the target invoker as opposed to having the connector do it since the
// Spring context is "opaque" to the wiring fabric. In other words, the Spring context does not expose
- // its beans as SCA components to the connector to wire the services to
- for (BoundServiceDefinition<? extends BindingDefinition> serviceDefinition : componentType.getServices().values()) {
- // call back into builder registry to handle building of services
- Service service = (Service) builderRegistry.build(parent, serviceDefinition, deploymentContext);
- // wire serviceDefinition to bean invokers
- InboundWire wire = service.getInboundWire();
- QualifiedName targetName = new QualifiedName(serviceDefinition.getTarget().getPath());
- for (InboundInvocationChain chain : wire.getInvocationChains().values()) {
- // FIXME this should go to the connector and get policy and be invoked from SpringComposite.prepare()
- chain.addInterceptor(new SpringInterceptor());
- chain.setTargetInvoker(component.createTargetInvoker(targetName.getPartName(), chain.getOperation(),
- null));
+ // its beans as SCA components to the connector to wire the serviceBindings to
+ for (BoundServiceDefinition serviceDefinition : componentType.getServices().values()) {
+ // call back into builder registry to handle building of serviceBindings
+ Service service = builderRegistry.build(parent, serviceDefinition, deploymentContext);
+ for (ServiceBinding binding : service.getServiceBindings()) {
+ // wire service to bean invokers
+ InboundWire wire = binding.getInboundWire();
+ QualifiedName targetName = new QualifiedName(serviceDefinition.getTarget().getPath());
+ for (InboundInvocationChain chain : wire.getInvocationChains().values()) {
+ // FIXME this should go to the connector and get policy and be invoked from
+ // SpringComposite.prepare()
+ chain.addInterceptor(new SpringInterceptor());
+ chain.setTargetInvoker(component.createTargetInvoker(targetName.getPartName(),
+ chain.getOperation(),
+ null));
+ }
}
try {
component.register(service);
Modified: incubator/tuscany/java/sca/services/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/impl/SpringCompositeComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/impl/SpringCompositeComponent.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/impl/SpringCompositeComponent.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/impl/SpringCompositeComponent.java Sat Dec 30 13:42:22 2006
@@ -30,7 +30,7 @@
import org.apache.tuscany.spi.component.Reference;
import org.apache.tuscany.spi.component.SCAObject;
import org.apache.tuscany.spi.component.ScopeContainer;
-import org.apache.tuscany.spi.component.Service;
+import org.apache.tuscany.spi.component.ServiceBinding;
import org.apache.tuscany.spi.extension.CompositeComponentExtension;
import static org.apache.tuscany.spi.idl.java.JavaIDLUtils.findMethod;
import org.apache.tuscany.spi.model.Operation;
@@ -175,14 +175,14 @@
throw new BeanNotOfRequiredTypeException(name, requiredType, type);
}
return wireService.createProxy(type, reference.getInboundWire());
- } else if (object instanceof Service) {
- Service service = (Service) object;
- type = service.getInboundWire().getServiceContract().getInterfaceClass();
+ } else if (object instanceof ServiceBinding) {
+ ServiceBinding serviceBinding = (ServiceBinding) object;
+ type = serviceBinding.getInboundWire().getServiceContract().getInterfaceClass();
if (requiredType != null && requiredType.isAssignableFrom(type)) {
// need null check since Spring may pass in a null
throw new BeanNotOfRequiredTypeException(name, requiredType, type);
}
- return wireService.createProxy(type, service.getInboundWire());
+ return wireService.createProxy(type, serviceBinding.getInboundWire());
} else {
throw new AssertionError("Illegal object type [" + name + "]");
}
Modified: incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/SpringTestUtils.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/SpringTestUtils.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/SpringTestUtils.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/SpringTestUtils.java Sat Dec 30 13:42:22 2006
@@ -19,15 +19,14 @@
package org.apache.tuscany.container.spring;
import org.apache.tuscany.spi.QualifiedName;
-import org.apache.tuscany.spi.idl.InvalidServiceContractException;
import org.apache.tuscany.spi.builder.Connector;
import org.apache.tuscany.spi.builder.WiringException;
import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.component.Service;
-import org.apache.tuscany.spi.extension.ServiceExtension;
+import org.apache.tuscany.spi.component.ServiceBinding;
+import org.apache.tuscany.spi.extension.ServiceBindingExtension;
+import org.apache.tuscany.spi.idl.InvalidServiceContractException;
import org.apache.tuscany.spi.wire.InboundWire;
import org.apache.tuscany.spi.wire.OutboundWire;
-import org.apache.tuscany.spi.wire.WireService;
import org.apache.tuscany.container.spring.mock.TestBeanImpl;
import org.apache.tuscany.test.ArtifactFactory;
@@ -43,22 +42,22 @@
private SpringTestUtils() {
}
- public static <T> Service createService(String name,
- Class<T> serviceInterface,
- CompositeComponent parent,
- WireService wireService)
+ public static <T> ServiceBinding createService(String name,
+ Class<T> serviceInterface,
+ CompositeComponent parent)
throws InvalidServiceContractException, WiringException {
- Service service = new ServiceExtension(name, parent);
+ ServiceBinding serviceBinding = new ServiceBindingExtension(name, parent) {
+ };
InboundWire inboundWire = ArtifactFactory.createInboundWire(name, serviceInterface);
OutboundWire outboundWire = ArtifactFactory.createOutboundWire(name, serviceInterface);
ArtifactFactory.terminateWire(outboundWire);
- service.setInboundWire(inboundWire);
- service.setOutboundWire(outboundWire);
+ serviceBinding.setInboundWire(inboundWire);
+ serviceBinding.setOutboundWire(outboundWire);
outboundWire.setTargetName(new QualifiedName("foo"));
Connector connector = ArtifactFactory.createConnector();
- connector.connect(service);
+ connector.connect(serviceBinding);
ArtifactFactory.terminateWire(inboundWire);
- return service;
+ return serviceBinding;
}
Modified: incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/impl/ServiceInvocationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/impl/ServiceInvocationTestCase.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/impl/ServiceInvocationTestCase.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/impl/ServiceInvocationTestCase.java Sat Dec 30 13:42:22 2006
@@ -21,7 +21,8 @@
import org.apache.tuscany.spi.QualifiedName;
import org.apache.tuscany.spi.builder.Connector;
import org.apache.tuscany.spi.component.Service;
-import org.apache.tuscany.spi.extension.ServiceExtension;
+import org.apache.tuscany.spi.component.ServiceBinding;
+import org.apache.tuscany.spi.extension.ServiceBindingExtension;
import org.apache.tuscany.spi.wire.InboundInvocationChain;
import org.apache.tuscany.spi.wire.InboundWire;
import org.apache.tuscany.spi.wire.OutboundWire;
@@ -50,19 +51,23 @@
OutboundWire outboundWire = ArtifactFactory.createOutboundWire("fooService", TestBean.class);
outboundWire.setTargetName(new QualifiedName("foo"));
ArtifactFactory.terminateWire(outboundWire);
- Service service =
- new ServiceExtension("fooService", composite);
- service.setInboundWire(inboundWire);
- service.setOutboundWire(outboundWire);
+ ServiceBinding serviceBinding =
+ new ServiceBindingExtension("fooService", composite) {
+ };
+
+ serviceBinding.setInboundWire(inboundWire);
+ serviceBinding.setOutboundWire(outboundWire);
+ Service service = ArtifactFactory.createService("fooService", composite, outboundWire.getServiceContract());
+ service.addServiceBinding(serviceBinding);
Connector connector = ArtifactFactory.createConnector();
- outboundWire.setContainer(service);
- inboundWire.setContainer(service);
+ outboundWire.setContainer(serviceBinding);
+ inboundWire.setContainer(serviceBinding);
connector.connect(inboundWire, outboundWire, true);
for (InboundInvocationChain chain : inboundWire.getInvocationChains().values()) {
chain.setTargetInvoker(composite.createTargetInvoker("foo", chain.getOperation(), null));
}
composite.register(service);
- InboundWire wire = composite.getService("fooService").getInboundWire();
+ InboundWire wire = composite.getService("fooService").getServiceBindings().get(0).getInboundWire();
TestBean serviceInstance = wireService.createProxy(TestBean.class, wire);
assertEquals("bar", serviceInstance.echo("bar"));
}
@@ -81,4 +86,6 @@
super.setUp();
wireService = ArtifactFactory.createWireService();
}
+
+
}
Modified: incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/impl/SpringCompositeBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/impl/SpringCompositeBuilderTestCase.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/impl/SpringCompositeBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/impl/SpringCompositeBuilderTestCase.java Sat Dec 30 13:42:22 2006
@@ -26,8 +26,9 @@
import org.apache.tuscany.spi.builder.Connector;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.Service;
+import org.apache.tuscany.spi.component.ServiceBinding;
import org.apache.tuscany.spi.deployer.DeploymentContext;
-import org.apache.tuscany.spi.extension.ServiceExtension;
+import org.apache.tuscany.spi.extension.ServiceBindingExtension;
import org.apache.tuscany.spi.model.BoundServiceDefinition;
import org.apache.tuscany.spi.model.ComponentDefinition;
import org.apache.tuscany.spi.model.Property;
@@ -57,25 +58,28 @@
private ComponentDefinition<SpringImplementation> definition;
/**
- * Verifies that the builder calls back into the registry to load services and wires them to bean targets when no
- * <code>sca:service</code> tag is specified in the Spring application.xml
+ * Verifies that the builder calls back into the registry to load serviceBindings and wires them to bean targets
+ * when no <code>sca:service</code> tag is specified in the Spring application.xml
*/
@SuppressWarnings("unchecked")
public void testImplicitServiceWiring() throws Exception {
// Create a service instance that the mock builder registry will return
WireService wireService = ArtifactFactory.createWireService();
- ServiceExtension service =
- new ServiceExtension("fooService", null);
- InboundWire inboundWire = ArtifactFactory.createInboundWire("fooService", TestBean.class);
- OutboundWire outboundWire = ArtifactFactory.createOutboundWire("fooService", TestBean.class);
+ ServiceBindingExtension binding =
+ new ServiceBindingExtension("fooServiceBinding", null) {
+ };
+ InboundWire inboundWire = ArtifactFactory.createInboundWire("fooServiceBinding", TestBean.class);
+ OutboundWire outboundWire = ArtifactFactory.createOutboundWire("fooServiceBinding", TestBean.class);
ArtifactFactory.terminateWire(outboundWire);
- service.setInboundWire(inboundWire);
- service.setOutboundWire(outboundWire);
- inboundWire.setContainer(service);
- outboundWire.setContainer(service);
+ binding.setInboundWire(inboundWire);
+ binding.setOutboundWire(outboundWire);
+ inboundWire.setContainer(binding);
+ outboundWire.setContainer(binding);
Connector connector = ArtifactFactory.createConnector();
connector.connect(inboundWire, outboundWire, true);
+ Service service = ArtifactFactory.createService("fooServiceBinding", null, outboundWire.getServiceContract());
+ service.addServiceBinding(binding);
// Configure the mock builder registry
BuilderRegistry registry = createMock(BuilderRegistry.class);
expect(registry.build(isA(CompositeComponent.class),
@@ -91,8 +95,8 @@
DeploymentContext context = createNiceMock(DeploymentContext.class);
CompositeComponent component = (CompositeComponent) builder.build(parent, definition, context);
component.start();
- Service fooService = component.getService("fooService");
- TestBean bean = wireService.createProxy(TestBean.class, fooService.getInboundWire());
+ ServiceBinding fooServiceBinding = component.getService("fooServiceBinding").getServiceBindings().get(0);
+ TestBean bean = wireService.createProxy(TestBean.class, fooServiceBinding.getInboundWire());
assertEquals("call foo", bean.echo("call foo"));
verify(registry);
}
@@ -108,9 +112,9 @@
private SpringComponentType<Property<?>> createComponentType() {
SpringComponentType<Property<?>> componentType = new SpringComponentType<Property<?>>();
- BoundServiceDefinition<TestBindingDefinition> serviceDefinition = new BoundServiceDefinition<TestBindingDefinition>();
+ BoundServiceDefinition serviceDefinition = new BoundServiceDefinition();
serviceDefinition.setName("fooService");
- serviceDefinition.setBinding(new TestBindingDefinition());
+ serviceDefinition.addBinding(new TestBindingDefinition());
try {
serviceDefinition.setTarget(new URI("testBean"));
} catch (URISyntaxException e) {
Modified: incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/impl/SpringCompositeComponentTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/impl/SpringCompositeComponentTestCase.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/impl/SpringCompositeComponentTestCase.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/impl/SpringCompositeComponentTestCase.java Sat Dec 30 13:42:22 2006
@@ -22,7 +22,7 @@
// public void testChildStart() {
// AbstractApplicationContext appContext = EasyMock.createNiceMock(AbstractApplicationContext.class);
// replay(appContext);
-// Service service = EasyMock.createMock(Service.class);
+// ServiceBinding service = EasyMock.createMock(ServiceBinding.class);
// EasyMock.expect(service.getName()).andReturn("foo").anyTimes();
// service.start();
// service.getInterface();
Modified: incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/integration/BootstrapTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/integration/BootstrapTestCase.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/integration/BootstrapTestCase.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/integration/BootstrapTestCase.java Sat Dec 30 13:42:22 2006
@@ -3,6 +3,7 @@
import org.osoa.sca.CompositeContext;
import org.osoa.sca.CurrentCompositeContext;
+import org.apache.tuscany.spi.component.ServiceBinding;
import org.apache.tuscany.spi.component.Service;
import org.apache.tuscany.spi.wire.WireService;
@@ -26,7 +27,8 @@
public void testDemoBoot() throws Exception {
SpringCompositeComponent comp = (SpringCompositeComponent) component.getChild("Spring");
Service service = (Service) comp.getChild("fooService");
- TestBean bean = wireService.createProxy(TestBean.class, service.getInboundWire());
+ ServiceBinding binding = service.getServiceBindings().get(0);
+ TestBean bean = wireService.createProxy(TestBean.class, binding.getInboundWire());
bean.echo("foo");
bean.getBean().echo("foo");
}
Modified: incubator/tuscany/java/sca/services/maven/src/test/java/org/apache/tuscany/services/maven/MavenArtifactRepositoryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/maven/src/test/java/org/apache/tuscany/services/maven/MavenArtifactRepositoryTestCase.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/maven/src/test/java/org/apache/tuscany/services/maven/MavenArtifactRepositoryTestCase.java (original)
+++ incubator/tuscany/java/sca/services/maven/src/test/java/org/apache/tuscany/services/maven/MavenArtifactRepositoryTestCase.java Sat Dec 30 13:42:22 2006
@@ -45,7 +45,7 @@
}
/*
- * Test method for 'org.apache.tuscany.services.maven.MavenArtifactRepository.resolve(Artifact)'
+ * Test method for 'org.apache.tuscany.serviceBindings.maven.MavenArtifactRepository.resolve(Artifact)'
*/
public void testResolveArtifact() throws Exception {
Modified: incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/ArtifactFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/ArtifactFactory.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/ArtifactFactory.java (original)
+++ incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/ArtifactFactory.java Sat Dec 30 13:42:22 2006
@@ -22,6 +22,8 @@
import java.util.Map;
import org.apache.tuscany.spi.builder.Connector;
+import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Service;
import org.apache.tuscany.spi.idl.InvalidServiceContractException;
import org.apache.tuscany.spi.idl.java.JavaInterfaceProcessorRegistry;
import org.apache.tuscany.spi.model.Operation;
@@ -35,6 +37,7 @@
import org.apache.tuscany.core.builder.ConnectorImpl;
import org.apache.tuscany.core.component.WorkContextImpl;
import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
+import org.apache.tuscany.core.implementation.composite.ServiceImpl;
import org.apache.tuscany.core.wire.InboundInvocationChainImpl;
import org.apache.tuscany.core.wire.InboundWireImpl;
import org.apache.tuscany.core.wire.InvokerInterceptor;
@@ -61,10 +64,14 @@
return new JDKWireService(new WorkContextImpl(), null);
}
+ public static Service createService(String name, CompositeComponent parent, ServiceContract<?> contract) {
+ return new ServiceImpl(name, parent, contract);
+ }
+
/**
* Creates an inbound wire. After a wire is returned, client code must call {@link
- * #terminateWire(org.apache.tuscany.spi.wire.InboundWire)}. These two methods have been separated to allow wires
- * to be decorated with interceptors or handlers prior to their completion
+ * #terminateWire(org.apache.tuscany.spi.wire.InboundWire)}. These two methods have been separated to allow wires to
+ * be decorated with interceptors or handlers prior to their completion
*
* @param serviceName the service name associated with the wire
* @param interfaze the interface associated with the wire
@@ -82,8 +89,8 @@
/**
* Creates an outbound wire. After a wire is returned, client code must call {@link
- * #terminateWire(org.apache.tuscany.spi.wire.OutboundWire)}. These two methods have been separated to allow
- * wires to be decorated with interceptors or handlers prior to their completion
+ * #terminateWire(org.apache.tuscany.spi.wire.OutboundWire)}. These two methods have been separated to allow wires
+ * to be decorated with interceptors or handlers prior to their completion
*
* @param refName the reference name the wire is associated with on the client
* @param interfaze the interface associated with the wire
@@ -103,14 +110,14 @@
/**
* Finalizes the target wire
*/
- public static <T> void terminateWire(InboundWire wire) {
+ public static void terminateWire(InboundWire wire) {
for (InboundInvocationChain chain : wire.getInvocationChains().values()) {
// add tail interceptor
chain.addInterceptor(new InvokerInterceptor());
}
}
- public static <T> void terminateWire(OutboundWire wire) {
+ public static void terminateWire(OutboundWire wire) {
for (OutboundInvocationChain chain : wire.getInvocationChains().values()) {
// add tail interceptor
chain.addInterceptor(new InvokerInterceptor());
Modified: incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingBuilder.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingBuilder.java (original)
+++ incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingBuilder.java Sat Dec 30 13:42:22 2006
@@ -20,11 +20,11 @@
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.Reference;
-import org.apache.tuscany.spi.component.Service;
+import org.apache.tuscany.spi.component.ServiceBinding;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.BindingBuilderExtension;
-import org.apache.tuscany.spi.model.BoundServiceDefinition;
import org.apache.tuscany.spi.model.BoundReferenceDefinition;
+import org.apache.tuscany.spi.model.BoundServiceDefinition;
/**
* @version $Rev$ $Date$
@@ -32,15 +32,16 @@
public class TestBindingBuilder extends BindingBuilderExtension<TestBindingDefinition> {
@SuppressWarnings("unchecked")
- public Service build(CompositeComponent parent,
- BoundServiceDefinition<TestBindingDefinition> definition,
- DeploymentContext context) {
- return new TestBindingService(definition.getName(), parent);
+ public ServiceBinding build(CompositeComponent parent,
+ BoundServiceDefinition definition,
+ TestBindingDefinition bindingDefinition,
+ DeploymentContext ctx) {
+ return new TestBindingServiceBinding(definition.getName(), parent);
}
public Reference build(CompositeComponent parent,
- BoundReferenceDefinition<TestBindingDefinition> definition,
- DeploymentContext context) {
+ BoundReferenceDefinition<TestBindingDefinition> definition,
+ DeploymentContext ctx) {
String name = definition.getName();
return new TestBindingReference(name, parent);
}
Copied: incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingServiceBinding.java (from r490460, incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingService.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingServiceBinding.java?view=diff&rev=491325&p1=incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingService.java&r1=490460&p2=incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingServiceBinding.java&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingService.java (original)
+++ incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingServiceBinding.java Sat Dec 30 13:42:22 2006
@@ -20,13 +20,13 @@
import org.apache.tuscany.spi.CoreRuntimeException;
import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.extension.ServiceExtension;
+import org.apache.tuscany.spi.extension.ServiceBindingExtension;
/**
* @version $Rev$ $Date$
*/
-public class TestBindingService extends ServiceExtension {
- public TestBindingService(String name, CompositeComponent parent) throws CoreRuntimeException {
+public class TestBindingServiceBinding extends ServiceBindingExtension {
+ public TestBindingServiceBinding(String name, CompositeComponent parent) throws CoreRuntimeException {
super(name, parent);
// do nothing, but this could register with the host environment
}
Propchange: incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingServiceBinding.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingServiceBinding.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingBuilder.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingBuilder.java (original)
+++ incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingBuilder.java Sat Dec 30 13:42:22 2006
@@ -2,7 +2,7 @@
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.Reference;
-import org.apache.tuscany.spi.component.Service;
+import org.apache.tuscany.spi.component.ServiceBinding;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.BindingBuilderExtension;
import org.apache.tuscany.spi.model.BoundReferenceDefinition;
@@ -13,16 +13,17 @@
*/
public class TestSocketBindingBuilder extends BindingBuilderExtension<TestSocketBindingDefinition> {
- public Service build(CompositeComponent parent,
- BoundServiceDefinition<TestSocketBindingDefinition> definition,
- DeploymentContext context) {
- int port = definition.getBinding().getPort();
- return new TestSocketBindingService(definition.getName(), port, parent);
+ public ServiceBinding build(CompositeComponent parent,
+ BoundServiceDefinition definition,
+ TestSocketBindingDefinition bindingDefinition,
+ DeploymentContext ctx) {
+ int port = bindingDefinition.getPort();
+ return new TestSocketBindingServiceBinding(definition.getName(), port, parent);
}
public Reference build(CompositeComponent parent,
BoundReferenceDefinition<TestSocketBindingDefinition> definition,
- DeploymentContext context) {
+ DeploymentContext ctx) {
String name = definition.getName();
int port = definition.getBinding().getPort();
String host = definition.getBinding().getHost();
Copied: incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingServiceBinding.java (from r490460, incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingService.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingServiceBinding.java?view=diff&rev=491325&p1=incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingService.java&r1=490460&p2=incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingServiceBinding.java&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingService.java (original)
+++ incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingServiceBinding.java Sat Dec 30 13:42:22 2006
@@ -11,25 +11,25 @@
import org.apache.tuscany.spi.CoreRuntimeException;
import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.extension.ServiceExtension;
+import org.apache.tuscany.spi.extension.ServiceBindingExtension;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.wire.InboundInvocationChain;
import org.apache.tuscany.spi.wire.Message;
import org.apache.tuscany.spi.wire.MessageImpl;
/**
- * Implements a very simple remote, socket-based binding for test purposes. This binding exposes services using a socket
+ * Implements a very simple remote, socket-based binding for test purposes. This binding exposes serviceBindings using a socket
* on a given port. Service operations must take only one paramter that is <code>Serializable</code>.
*
* @version $Rev$ $Date$
*/
-public class TestSocketBindingService extends ServiceExtension {
+public class TestSocketBindingServiceBinding extends ServiceBindingExtension {
private int port;
private ServerSocket socket;
private ExecutorService executor;
- private TestSocketBindingService.ServerRunnable runnable;
+ private TestSocketBindingServiceBinding.ServerRunnable runnable;
- public TestSocketBindingService(String name, int port, CompositeComponent parent) throws CoreRuntimeException {
+ public TestSocketBindingServiceBinding(String name, int port, CompositeComponent parent) throws CoreRuntimeException {
super(name, parent);
this.port = port;
}
Propchange: incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingServiceBinding.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingServiceBinding.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/system.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/system.scdl?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/system.scdl (original)
+++ incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/system.scdl Sat Dec 30 13:42:22 2006
@@ -151,4 +151,13 @@
<!-- Logging formatters -->
<include name="org.apache.tuscany.launcher.Formatters" scdlResource="org/apache/tuscany/core/formatters.scdl"/>
+ <!-- the local binding -->
+ <component name="localBindingLoader">
+ <system:implementation.system class="org.apache.tuscany.core.binding.local.LocalBindingLoader"/>
+ </component>
+
+ <component name="localBindingBuilder">
+ <system:implementation.system class="org.apache.tuscany.core.binding.local.LocalBindingBuilder"/>
+ </component>
+
</composite>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org