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/06 19:01:33 UTC
svn commit: r515232 - in /incubator/tuscany/java/sca:
kernel/core/src/main/java/org/apache/tuscany/core/builder/
kernel/core/src/test/java/org/apache/tuscany/core/builder/
kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integratio...
Author: jmarino
Date: Tue Mar 6 10:01:32 2007
New Revision: 515232
URL: http://svn.apache.org/viewvc?view=rev&rev=515232
Log:
configure connector with interceptor builder 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
incubator/tuscany/java/sca/runtime/itest/plugin/src/main/resources/META-INF/tuscany/embeddedMaven.scdl
incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/resources/META-INF/tuscany/webapp.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=515232&r1=515231&r2=515232
==============================================================================
--- 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 6 10:01:32 2007
@@ -28,6 +28,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.component.AtomicComponent;
import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.Invocable;
@@ -71,6 +72,7 @@
private ComponentManager componentManager;
private WorkContext workContext;
private WorkScheduler scheduler;
+ private InterceptorBuilderRegistry interceptorBuilderRegistry;
public ConnectorImpl(ComponentManager componentManager) {
this.componentManager = componentManager;
@@ -78,10 +80,12 @@
@Constructor
public ConnectorImpl(
+ @org.osoa.sca.annotations.Reference InterceptorBuilderRegistry interceptorBuilderRegistry,
@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.interceptorBuilderRegistry = interceptorBuilderRegistry;
this.postProcessorRegistry = processorRegistry;
this.componentManager = componentManager;
this.scheduler = scheduler;
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=515232&r1=515231&r2=515232
==============================================================================
--- 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 6 10:01:32 2007
@@ -188,7 +188,7 @@
protected void setUp() throws Exception {
super.setUp();
manager = new ComponentManagerImpl();
- connector = new ConnectorImpl(null, manager, null, null);
+ connector = new ConnectorImpl(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=515232&r1=515231&r2=515232
==============================================================================
--- 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 6 10:01:32 2007
@@ -42,7 +42,7 @@
protected void setUp() throws Exception {
super.setUp();
manager = new ComponentManagerImpl();
- connector = new ConnectorImpl(null, manager, null, null);
+ connector = new ConnectorImpl(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=515232&r1=515231&r2=515232
==============================================================================
--- 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 6 10:01:32 2007
@@ -320,7 +320,7 @@
protected void setUp() throws Exception {
super.setUp();
componentManager = new ComponentManagerImpl();
- connector = new ConnectorImpl(null, componentManager, scheduler, workContext);
+ connector = new ConnectorImpl(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=515232&r1=515231&r2=515232
==============================================================================
--- 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 6 10:01:32 2007
@@ -81,6 +81,11 @@
<system:implementation.system class="org.apache.tuscany.core.builder.ConnectorImpl"/>
</component>
+ <component name="interceptorBuilderRegistry">
+ <system:implementation.system
+ class="org.apache.tuscany.core.builder.interceptor.InterceptorBuilderRegistryImpl"/>
+ </component>
+
<component name="wirePostProcess">
<system:implementation.system class="org.apache.tuscany.core.builder.WirePostProcessorRegistryImpl"/>
</component>
Modified: incubator/tuscany/java/sca/runtime/itest/plugin/src/main/resources/META-INF/tuscany/embeddedMaven.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/itest/plugin/src/main/resources/META-INF/tuscany/embeddedMaven.scdl?view=diff&rev=515232&r1=515231&r2=515232
==============================================================================
--- incubator/tuscany/java/sca/runtime/itest/plugin/src/main/resources/META-INF/tuscany/embeddedMaven.scdl (original)
+++ incubator/tuscany/java/sca/runtime/itest/plugin/src/main/resources/META-INF/tuscany/embeddedMaven.scdl Tue Mar 6 10:01:32 2007
@@ -67,6 +67,11 @@
<system:implementation.system class="org.apache.tuscany.core.builder.ConnectorImpl"/>
</component>
+ <component name="interceptorBuilderRegistry">
+ <system:implementation.system
+ class="org.apache.tuscany.core.builder.interceptor.InterceptorBuilderRegistryImpl"/>
+ </component>
+
<component name="wirePostProcessorRegistry">
<system:implementation.system class="org.apache.tuscany.core.builder.WirePostProcessorRegistryImpl"/>
</component>
Modified: incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/resources/META-INF/tuscany/webapp.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/resources/META-INF/tuscany/webapp.scdl?view=diff&rev=515232&r1=515231&r2=515232
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/resources/META-INF/tuscany/webapp.scdl (original)
+++ incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/resources/META-INF/tuscany/webapp.scdl Tue Mar 6 10:01:32 2007
@@ -67,6 +67,11 @@
<system:implementation.system class="org.apache.tuscany.core.builder.ConnectorImpl"/>
</component>
+ <component name="interceptorBuilderRegistry">
+ <system:implementation.system
+ class="org.apache.tuscany.core.builder.interceptor.InterceptorBuilderRegistryImpl"/>
+ </component>
+
<component name="wirePostProcessorRegistry">
<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