You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2007/03/13 11:59:36 UTC

svn commit: r517644 - in /incubator/tuscany/java/sca/kernel/core/src: main/java/org/apache/tuscany/core/builder/ test/java/org/apache/tuscany/core/builder/ test/java/org/apache/tuscany/core/implementation/java/integration/ test/resources/org/apache/tus...

Author: jmarino
Date: Tue Mar 13 03:59:31 2007
New Revision: 517644

URL: http://svn.apache.org/viewvc?view=rev&rev=517644
Log:
enable wire attacher registry

Modified:
    incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
    incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/AtomicConnectorTestCase.java
    incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplWireTestCase.java
    incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java
    incubator/tuscany/java/sca/kernel/core/src/test/resources/org/apache/tuscany/core/deployer/boot2.scdl

Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java?view=diff&rev=517644&r1=517643&r2=517644
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java Tue Mar 13 03:59:31 2007
@@ -30,6 +30,7 @@
 import org.apache.tuscany.spi.builder.Connector;
 import org.apache.tuscany.spi.builder.WiringException;
 import org.apache.tuscany.spi.builder.interceptor.InterceptorBuilderRegistry;
+import org.apache.tuscany.spi.builder.physical.WireAttacherRegistry;
 import org.apache.tuscany.spi.component.AtomicComponent;
 import org.apache.tuscany.spi.component.Component;
 import org.apache.tuscany.spi.component.Invocable;
@@ -77,6 +78,7 @@
     private WorkContext workContext;
     private WorkScheduler scheduler;
     private InterceptorBuilderRegistry interceptorBuilderRegistry;
+    private WireAttacherRegistry attacherRegistry;
 
     public ConnectorImpl(ComponentManager componentManager) {
         this.componentManager = componentManager;
@@ -85,10 +87,12 @@
     @Constructor
     public ConnectorImpl(
         @org.osoa.sca.annotations.Reference InterceptorBuilderRegistry interceptorBuilderRegistry,
+        @org.osoa.sca.annotations.Reference WireAttacherRegistry attacherRegistry,
         @org.osoa.sca.annotations.Reference WirePostProcessorRegistry processorRegistry,
         @org.osoa.sca.annotations.Reference ComponentManager componentManager,
         @org.osoa.sca.annotations.Reference WorkScheduler scheduler,
         @org.osoa.sca.annotations.Reference WorkContext workContext) {
+        this.attacherRegistry = attacherRegistry;
         this.interceptorBuilderRegistry = interceptorBuilderRegistry;
         this.postProcessorRegistry = processorRegistry;
         this.componentManager = componentManager;

Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/AtomicConnectorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/AtomicConnectorTestCase.java?view=diff&rev=517644&r1=517643&r2=517644
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/AtomicConnectorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/AtomicConnectorTestCase.java Tue Mar 13 03:59:31 2007
@@ -188,7 +188,7 @@
     protected void setUp() throws Exception {
         super.setUp();
         manager = new ComponentManagerImpl();
-        connector = new ConnectorImpl(null, null, manager, null, null);
+        connector = new ConnectorImpl(null, null, null, manager, null, null);
         JavaInterfaceProcessorRegistry registry = new JavaInterfaceProcessorRegistryImpl();
         contract = registry.introspect(Foo.class);
     }

Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplWireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplWireTestCase.java?view=diff&rev=517644&r1=517643&r2=517644
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplWireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplWireTestCase.java Tue Mar 13 03:59:31 2007
@@ -77,7 +77,7 @@
     protected void setUp() throws Exception {
         super.setUp();
         manager = new ComponentManagerImpl();
-        connector = new ConnectorImpl(null, null, manager, null, null);
+        connector = new ConnectorImpl(null, null, null, manager, null, null);
         JavaInterfaceProcessorRegistry registry = new JavaInterfaceProcessorRegistryImpl();
         contract = registry.introspect(Foo.class);
     }

Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java?view=diff&rev=517644&r1=517643&r2=517644
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java Tue Mar 13 03:59:31 2007
@@ -320,7 +320,7 @@
     protected void setUp() throws Exception {
         super.setUp();
         componentManager = new ComponentManagerImpl();
-        connector = new ConnectorImpl(null, null, componentManager, scheduler, workContext);
+        connector = new ConnectorImpl(null, null, null, componentManager, scheduler, workContext);
         container = new CompositeScopeContainer(null);
         container.start();
         context = createMock(DeploymentContext.class);

Modified: incubator/tuscany/java/sca/kernel/core/src/test/resources/org/apache/tuscany/core/deployer/boot2.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/resources/org/apache/tuscany/core/deployer/boot2.scdl?view=diff&rev=517644&r1=517643&r2=517644
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/resources/org/apache/tuscany/core/deployer/boot2.scdl (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/resources/org/apache/tuscany/core/deployer/boot2.scdl Tue Mar 13 03:59:31 2007
@@ -86,6 +86,11 @@
             class="org.apache.tuscany.core.builder.interceptor.InterceptorBuilderRegistryImpl"/>
     </component>
 
+    <component name="wireAttacherRegistry">
+        <system:implementation.system
+            class="org.apache.tuscany.core.builder.physical.WireAttacherRegistryImpl"/>
+    </component>
+
     <component name="wirePostProcess">
         <system:implementation.system class="org.apache.tuscany.core.builder.WirePostProcessorRegistryImpl"/>
     </component>



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