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/08/10 00:06:42 UTC

svn commit: r430152 - in /incubator/tuscany/java/sca: core/src/main/java/org/apache/tuscany/core/builder/ core/src/main/java/org/apache/tuscany/core/implementation/java/ core/src/main/java/org/apache/tuscany/core/wire/jdk/ core/src/test/java/org/apache...

Author: jmarino
Date: Wed Aug  9 15:06:41 2006
New Revision: 430152

URL: http://svn.apache.org/viewvc?rev=430152&view=rev
Log:
move wiring of components and refences to wire service; service wiring still to be done

Modified:
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilder.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireService.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/builder/BuilderRegistryTestCase.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/component/CallbackInvocationTestCase.java
    incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/component/Reference.java
    incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java
    incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireService.java

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java?rev=430152&r1=430151&r2=430152&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java Wed Aug  9 15:06:41 2006
@@ -31,6 +31,7 @@
 import org.apache.tuscany.spi.builder.ComponentBuilder;
 import org.apache.tuscany.spi.component.Component;
 import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.Reference;
 import org.apache.tuscany.spi.component.SCAObject;
 import org.apache.tuscany.spi.component.ScopeRegistry;
 import org.apache.tuscany.spi.deployer.DeploymentContext;
@@ -40,6 +41,9 @@
 import org.apache.tuscany.spi.model.ComponentDefinition;
 import org.apache.tuscany.spi.model.ComponentType;
 import org.apache.tuscany.spi.model.Implementation;
+import org.apache.tuscany.spi.wire.WireService;
+
+import org.apache.tuscany.core.implementation.system.component.SystemAtomicComponent;
 
 /**
  * The default builder registry in the runtime
@@ -49,7 +53,7 @@
 @Scope("MODULE")
 public class BuilderRegistryImpl implements BuilderRegistry {
 
-    //protected WireService wireService;
+    protected WireService wireService;
     protected ScopeRegistry scopeRegistry;
 
     private final Map<Class<? extends Implementation<?>>,
@@ -75,6 +79,11 @@
         this.scopeRegistry = scopeRegistry;
     }
 
+    @Autowire
+    public void setWireService(WireService wireService) {
+        this.wireService = wireService;
+    }
+
     public <I extends Implementation<?>> void register(Class<I> implClass, ComponentBuilder<I> builder) {
         componentBuilders.put(implClass, builder);
     }
@@ -99,6 +108,10 @@
         Component<?> component = componentBuilder.build(parent, componentDefinition, deploymentContext);
         ComponentType<?, ?, ?> componentType = componentDefinition.getImplementation().getComponentType();
         assert componentType != null : "Component type must be set";
+        // create wires for the component
+        if (wireService != null && !(component instanceof SystemAtomicComponent)) {
+            wireService.createWires(component, componentDefinition);
+        }
         return component;
     }
 
@@ -138,6 +151,11 @@
                                                DeploymentContext deploymentContext) {
         Class<B> bindingClass = (Class<B>) boundReferenceDefinition.getBinding().getClass();
         BindingBuilder<B> bindingBuilder = (BindingBuilder<B>) bindingBuilders.get(bindingClass);
-        return bindingBuilder.build(parent, boundReferenceDefinition, deploymentContext);
+        SCAObject object = bindingBuilder.build(parent, boundReferenceDefinition, deploymentContext);
+        // create wires for the component
+        if (wireService != null) {
+            wireService.createWires((Reference) object);
+        }
+        return object;
     }
 }

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilder.java?rev=430152&r1=430151&r2=430152&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilder.java Wed Aug  9 15:06:41 2006
@@ -16,10 +16,8 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Member;
 import java.lang.reflect.Method;
-import java.util.Map;
 
 import org.apache.tuscany.spi.ObjectFactory;
-import org.apache.tuscany.spi.QualifiedName;
 import org.apache.tuscany.spi.annotation.Monitor;
 import org.apache.tuscany.spi.builder.BuilderConfigException;
 import org.apache.tuscany.spi.component.AtomicComponent;
@@ -27,13 +25,7 @@
 import org.apache.tuscany.spi.deployer.DeploymentContext;
 import org.apache.tuscany.spi.extension.ComponentBuilderExtension;
 import org.apache.tuscany.spi.model.ComponentDefinition;
-import org.apache.tuscany.spi.model.ReferenceTarget;
 import org.apache.tuscany.spi.model.Scope;
-import org.apache.tuscany.spi.model.ServiceContract;
-import org.apache.tuscany.spi.wire.InboundInvocationChain;
-import org.apache.tuscany.spi.wire.InboundWire;
-import org.apache.tuscany.spi.wire.OutboundInvocationChain;
-import org.apache.tuscany.spi.wire.OutboundWire;
 
 import org.apache.tuscany.core.implementation.ConstructorDefinition;
 import org.apache.tuscany.core.implementation.JavaMappedProperty;
@@ -44,7 +36,6 @@
 import org.apache.tuscany.core.injection.MethodEventInvoker;
 import org.apache.tuscany.core.injection.PojoObjectFactory;
 import org.apache.tuscany.core.policy.async.AsyncMonitor;
-import org.apache.tuscany.core.wire.InvokerInterceptor;
 
 /**
  * Builds a Java-based atomic context from a component definition
@@ -131,72 +122,8 @@
                 // Only if there is a callback reference in the service
                 configuration.addCallbackSite(service.getCallbackReferenceName(), service.getCallbackMember());
             }
-            component.addInboundWire(createWire(service));
-        }
-
-        for (ReferenceTarget reference : definition.getReferenceTargets().values()) {
-            Map<String, JavaMappedReference> references = componentType.getReferences();
-            JavaMappedReference mappedReference = references.get(reference.getReferenceName());
-            OutboundWire wire = createWire(reference, mappedReference);
-            component.addOutboundWire(wire);
         }
         return component;
-    }
-
-
-    @SuppressWarnings("unchecked")
-    private OutboundWire createWire(ReferenceTarget reference, JavaMappedReference def) {
-        //TODO multiplicity
-        if (reference.getTargets().size() != 1) {
-            throw new UnsupportedOperationException();
-        }
-        Class<?> interfaze = def.getServiceContract().getInterfaceClass();
-        OutboundWire wire = wireService.createOutboundWire();
-        wire.setTargetName(new QualifiedName(reference.getTargets().get(0).toString()));
-        wire.setBusinessInterface(interfaze);
-        wire.setReferenceName(reference.getReferenceName());
-        for (Method method : interfaze.getMethods()) {
-            //TODO handle policy
-            OutboundInvocationChain chain = wireService.createOutboundChain(method);
-            wire.addInvocationChain(method, chain);
-        }
-        // FIXME Using JavaServiceContract for now; this may be ok, but if it's not, then getCallbackClass
-        //       will need to be promoted to ServiceContract
-        ServiceContract contract = def.getServiceContract();
-        Class<?> callbackInterface = contract.getCallbackClass();
-        if (callbackInterface != null) {
-            wire.setCallbackInterface(callbackInterface);
-            for (Method callbackMethod : callbackInterface.getMethods()) {
-                InboundInvocationChain callbackTargetChain = wireService.createInboundChain(callbackMethod);
-                OutboundInvocationChain callbackSourceChain = wireService.createOutboundChain(callbackMethod);
-                // TODO handle policy
-                //TODO statement below could be cleaner
-                callbackTargetChain.addInterceptor(new InvokerInterceptor());
-                wire.addTargetCallbackInvocationChain(callbackMethod, callbackTargetChain);
-                wire.addSourceCallbackInvocationChain(callbackMethod, callbackSourceChain);
-            }
-        }
-        return wire;
-    }
-
-    @SuppressWarnings("unchecked")
-    private InboundWire createWire(JavaMappedService service) {
-        Class<?> interfaze = service.getServiceContract().getInterfaceClass();
-        InboundWire wire = wireService.createInboundWire();
-        wire.setBusinessInterface(interfaze);
-        wire.setServiceName(service.getName());
-        for (Method method : interfaze.getMethods()) {
-            InboundInvocationChain chain = wireService.createInboundChain(method);
-            // TODO handle policy
-            //TODO statement below could be cleaner
-            chain.addInterceptor(new InvokerInterceptor());
-            wire.addInvocationChain(method, chain);
-        }
-        String callbackReferenceName = service.getCallbackReferenceName();
-        if (callbackReferenceName != null) {
-            wire.setCallbackReferenceName(callbackReferenceName);
-        }
-        return wire;
     }
 
     protected Class<JavaImplementation> getImplementationType() {

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireService.java?rev=430152&r1=430151&r2=430152&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireService.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireService.java Wed Aug  9 15:06:41 2006
@@ -2,13 +2,25 @@
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
+import java.util.Map;
 
 import org.osoa.sca.annotations.Constructor;
 import org.osoa.sca.annotations.Init;
 import org.osoa.sca.annotations.Scope;
 
+import org.apache.tuscany.spi.QualifiedName;
 import org.apache.tuscany.spi.annotation.Autowire;
+import org.apache.tuscany.spi.component.Component;
+import org.apache.tuscany.spi.component.Reference;
+import org.apache.tuscany.spi.component.Service;
 import org.apache.tuscany.spi.component.WorkContext;
+import org.apache.tuscany.spi.model.ComponentDefinition;
+import org.apache.tuscany.spi.model.ComponentType;
+import org.apache.tuscany.spi.model.Implementation;
+import org.apache.tuscany.spi.model.ReferenceDefinition;
+import org.apache.tuscany.spi.model.ReferenceTarget;
+import org.apache.tuscany.spi.model.ServiceContract;
+import org.apache.tuscany.spi.model.ServiceDefinition;
 import org.apache.tuscany.spi.policy.PolicyBuilderRegistry;
 import org.apache.tuscany.spi.wire.InboundInvocationChain;
 import org.apache.tuscany.spi.wire.InboundWire;
@@ -21,6 +33,7 @@
 
 import org.apache.tuscany.core.wire.InboundInvocationChainImpl;
 import org.apache.tuscany.core.wire.InboundWireImpl;
+import org.apache.tuscany.core.wire.InvokerInterceptor;
 import org.apache.tuscany.core.wire.OutboundInvocationChainImpl;
 import org.apache.tuscany.core.wire.OutboundWireImpl;
 
@@ -107,6 +120,105 @@
 
     public InboundInvocationChain createInboundChain(Method operation) {
         return new InboundInvocationChainImpl(operation);
+    }
+
+
+    public void createWires(Component component, ComponentDefinition<?> definition) {
+        Implementation<?> implementation = definition.getImplementation();
+        ComponentType<?, ?, ?> componentType = implementation.getComponentType();
+        for (ServiceDefinition service : componentType.getServices().values()) {
+            component.addInboundWire(createWire(service));
+        }
+
+        for (ReferenceTarget reference : definition.getReferenceTargets().values()) {
+            Map<String, ? extends ReferenceDefinition> references = componentType.getReferences();
+            ReferenceDefinition mappedReference = references.get(reference.getReferenceName());
+            OutboundWire wire = createWire(reference, mappedReference);
+            component.addOutboundWire(wire);
+        }
+    }
+
+    public void createWires(Reference<?> reference) {
+        InboundWire wire = createInboundWire();
+        Class interfaze = reference.getInterface();
+        wire.setBusinessInterface(interfaze);
+        for (Method method : interfaze.getMethods()) {
+            InboundInvocationChain chain = createInboundChain(method);
+            chain.addInterceptor(new InvokerInterceptor());
+            wire.addInvocationChain(method, chain);
+        }
+        reference.setInboundWire(wire);
+    }
+
+    public void createWires(Service<?> service) {
+        InboundWire inboundWire = createInboundWire();
+        OutboundWire outboundWire = createOutboundWire();
+        Class interfaze = service.getInterface();
+        inboundWire.setBusinessInterface(interfaze);
+        outboundWire.setBusinessInterface(interfaze);
+        for (Method method : interfaze.getMethods()) {
+            InboundInvocationChain inboundChain = createInboundChain(method);
+            inboundWire.addInvocationChain(method, inboundChain);
+            OutboundInvocationChain outboundChain = createOutboundChain(method);
+            outboundWire.addInvocationChain(method, outboundChain);
+        }
+        service.setInboundWire(inboundWire);
+        service.setOutboundWire(outboundWire);
+    }
+
+
+    @SuppressWarnings("unchecked")
+    public OutboundWire createWire(ReferenceTarget reference, ReferenceDefinition def) {
+        //TODO multiplicity
+        if (reference.getTargets().size() != 1) {
+            throw new UnsupportedOperationException();
+        }
+        Class<?> interfaze = def.getServiceContract().getInterfaceClass();
+        OutboundWire wire = createOutboundWire();
+        wire.setTargetName(new QualifiedName(reference.getTargets().get(0).toString()));
+        wire.setBusinessInterface(interfaze);
+        wire.setReferenceName(reference.getReferenceName());
+        for (Method method : interfaze.getMethods()) {
+            //TODO handle policy
+            OutboundInvocationChain chain = createOutboundChain(method);
+            wire.addInvocationChain(method, chain);
+        }
+        ServiceContract contract = def.getServiceContract();
+        Class<?> callbackInterface = contract.getCallbackClass();
+        if (callbackInterface != null) {
+            wire.setCallbackInterface(callbackInterface);
+            for (Method callbackMethod : callbackInterface.getMethods()) {
+                InboundInvocationChain callbackTargetChain = createInboundChain(callbackMethod);
+                OutboundInvocationChain callbackSourceChain = createOutboundChain(callbackMethod);
+// TODO handle policy
+//TODO statement below could be cleaner
+                callbackTargetChain.addInterceptor(new InvokerInterceptor());
+                wire.addTargetCallbackInvocationChain(callbackMethod, callbackTargetChain);
+                wire.addSourceCallbackInvocationChain(callbackMethod, callbackSourceChain);
+            }
+        }
+        return wire;
+    }
+
+    @SuppressWarnings("unchecked")
+    public InboundWire createWire(ServiceDefinition service) {
+        Class<?> interfaze = service.getServiceContract().getInterfaceClass();
+        InboundWire wire = createInboundWire();
+        wire.setBusinessInterface(interfaze);
+        wire.setServiceName(service.getName());
+        for (Method method : interfaze.getMethods()) {
+            InboundInvocationChain chain = createInboundChain(method);
+// TODO handle policy
+//TODO statement below could be cleaner
+            chain.addInterceptor(new InvokerInterceptor());
+            wire.addInvocationChain(method, chain);
+        }
+        ServiceContract contract = service.getServiceContract();
+        Class<?> callbackInterface = contract.getCallbackClass();
+        if (callbackInterface != null) {
+            wire.setCallbackReferenceName(service.getCallbackReferenceName());
+        }
+        return wire;
     }
 
 }

Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/builder/BuilderRegistryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/builder/BuilderRegistryTestCase.java?rev=430152&r1=430151&r2=430152&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/builder/BuilderRegistryTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/builder/BuilderRegistryTestCase.java Wed Aug  9 15:06:41 2006
@@ -16,9 +16,6 @@
  */
 package org.apache.tuscany.core.builder;
 
-import junit.framework.TestCase;
-
-import org.apache.tuscany.core.deployer.RootDeploymentContext;
 import org.apache.tuscany.spi.builder.BuilderConfigException;
 import org.apache.tuscany.spi.builder.ComponentBuilder;
 import org.apache.tuscany.spi.component.Component;
@@ -27,6 +24,11 @@
 import org.apache.tuscany.spi.model.ComponentDefinition;
 import org.apache.tuscany.spi.model.CompositeComponentType;
 import org.apache.tuscany.spi.model.CompositeImplementation;
+import org.apache.tuscany.spi.wire.WireService;
+
+import junit.framework.TestCase;
+import org.apache.tuscany.core.deployer.RootDeploymentContext;
+import org.easymock.EasyMock;
 
 /**
  * @version $Rev$ $Date$
@@ -47,6 +49,8 @@
     protected void setUp() throws Exception {
         super.setUp();
         registry = new BuilderRegistryImpl();
+        WireService service = EasyMock.createNiceMock(WireService.class);
+        registry.setWireService(service);
         deploymentContext = new RootDeploymentContext(null, null, null, null);
     }
 

Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/component/CallbackInvocationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/component/CallbackInvocationTestCase.java?rev=430152&r1=430151&r2=430152&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/component/CallbackInvocationTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/component/CallbackInvocationTestCase.java Wed Aug  9 15:06:41 2006
@@ -15,6 +15,7 @@
 import org.apache.tuscany.spi.model.Scope;
 import org.apache.tuscany.spi.model.ServiceContract;
 import org.apache.tuscany.spi.services.work.WorkScheduler;
+import org.apache.tuscany.spi.wire.WireService;
 
 import junit.framework.TestCase;
 import org.apache.tuscany.core.builder.ConnectorImpl;
@@ -47,6 +48,7 @@
     private ScopeContainer container;
     private DeploymentContext context;
     private JavaComponentBuilder builder;
+    private WireService wireService;
 
     /**
      * Verifies callback wires are built and callback invocations are handled properly
@@ -55,6 +57,7 @@
         ComponentDefinition<JavaImplementation> targetDefinition = createTarget();
         JavaAtomicComponent<Foo> fooComponent =
             (JavaAtomicComponent<Foo>) builder.build(null, targetDefinition, context);
+        wireService.createWires(fooComponent, targetDefinition);
         container.register(fooComponent);
 
         CompositeComponent parent = createMock(CompositeComponent.class);
@@ -65,6 +68,7 @@
         ComponentDefinition<JavaImplementation> sourceDefinition = createSource("fooClient");
         JavaAtomicComponent<FooClient> clientComponent =
             (JavaAtomicComponent<FooClient>) builder.build(parent, sourceDefinition, context);
+        wireService.createWires(clientComponent, sourceDefinition);
         container.register(clientComponent);
 
         Connector connector = new ConnectorImpl();
@@ -82,6 +86,7 @@
         ComponentDefinition<JavaImplementation> targetDefinition = createTarget();
         JavaAtomicComponent<Foo> fooComponent =
             (JavaAtomicComponent<Foo>) builder.build(null, targetDefinition, context);
+        wireService.createWires(fooComponent, targetDefinition);
         container.register(fooComponent);
 
         CompositeComponent parent = createMock(CompositeComponent.class);
@@ -93,9 +98,11 @@
         ComponentDefinition<JavaImplementation> sourceDefinition2 = createSource("fooCleint2");
         JavaAtomicComponent<FooClient> clientComponent1 =
             (JavaAtomicComponent<FooClient>) builder.build(parent, sourceDefinition1, context);
+        wireService.createWires(clientComponent1, sourceDefinition1);
         container.register(clientComponent1);
         JavaAtomicComponent<FooClient> clientComponent2 =
             (JavaAtomicComponent<FooClient>) builder.build(parent, sourceDefinition2, context);
+        wireService.createWires(clientComponent2, sourceDefinition2);
         container.register(clientComponent2);
 
         Connector connector = new ConnectorImpl();
@@ -205,6 +212,7 @@
 
     protected void setUp() throws Exception {
         super.setUp();
+        wireService = new JDKWireService();
         container = new ModuleScopeContainer();
         container.start();
         context = createMock(DeploymentContext.class);

Modified: incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/component/Reference.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/component/Reference.java?rev=430152&r1=430151&r2=430152&view=diff
==============================================================================
--- incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/component/Reference.java (original)
+++ incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/component/Reference.java Wed Aug  9 15:06:41 2006
@@ -32,9 +32,19 @@
     InboundWire<T> getInboundWire();
 
     /**
+     * Sets the inbound wire for flowing a request through the reference
+     */
+    void setInboundWire(InboundWire<T> wire);
+
+    /**
      * Returns the outbound wire used by the reference to connect to a target
      */
     OutboundWire<T> getOutboundWire();
+
+    /**
+     * Sets the outbound wire used by the reference to connect to a target
+     */
+    void setOutboundWire(OutboundWire<T> wire);
 
     /**
      * Callback to create a {@link org.apache.tuscany.spi.wire.TargetInvoker} which dispatches to the target service of

Modified: incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java?rev=430152&r1=430151&r2=430152&view=diff
==============================================================================
--- incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java (original)
+++ incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java Wed Aug  9 15:06:41 2006
@@ -100,12 +100,12 @@
     public Service getService(String name) {
         SCAObject ctx = children.get(name);
         if (ctx == null) {
-            ComponentNotFoundException e = new ComponentNotFoundException("ServiceDefinition context not found");
+            ComponentNotFoundException e = new ComponentNotFoundException("Service not found");
             e.setIdentifier(name);
             e.addContextName(getName());
             throw e;
         } else if (!(ctx instanceof Service)) {
-            ComponentNotFoundException e = new ComponentNotFoundException("SCAObject not a service context");
+            ComponentNotFoundException e = new ComponentNotFoundException("SCAObject not a service");
             e.setIdentifier(name);
             e.addContextName(getName());
             throw e;

Modified: incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireService.java?rev=430152&r1=430151&r2=430152&view=diff
==============================================================================
--- incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireService.java (original)
+++ incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireService.java Wed Aug  9 15:06:41 2006
@@ -2,6 +2,14 @@
 
 import java.lang.reflect.Method;
 
+import org.apache.tuscany.spi.component.Component;
+import org.apache.tuscany.spi.component.Reference;
+import org.apache.tuscany.spi.component.Service;
+import org.apache.tuscany.spi.model.ComponentDefinition;
+import org.apache.tuscany.spi.model.ReferenceDefinition;
+import org.apache.tuscany.spi.model.ReferenceTarget;
+import org.apache.tuscany.spi.model.ServiceDefinition;
+
 /**
  * Creates proxies that implement Java interfaces and invocation handlers for fronting wires
  *
@@ -26,5 +34,14 @@
 
     InboundInvocationChain createInboundChain(Method operation);
 
+    InboundWire createWire(ServiceDefinition service);
+
+    OutboundWire createWire(ReferenceTarget reference, ReferenceDefinition def);
+
+    void createWires(Component component, ComponentDefinition<?> definition);
+
+    void createWires(Reference<?> reference);
+
+    void createWires(Service<?> service);
 
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org