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 12:14:33 UTC
svn commit: r517646 - in /incubator/tuscany/java/sca/kernel:
core/src/main/java/org/apache/tuscany/core/builder/
core/src/main/java/org/apache/tuscany/core/builder/physical/
core/src/main/java/org/apache/tuscany/core/implementation/java/
core/src/test/...
Author: jmarino
Date: Tue Mar 13 04:14:26 2007
New Revision: 517646
URL: http://svn.apache.org/viewvc?view=rev&rev=517646
Log:
update WireAttacher signature to take a wire
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/physical/WireAttacherRegistryImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaPhysicalComponentBuilder.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/builder/physical/WireAttacherRegistryTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/physical/WireAttacher.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/physical/WireAttacherRegistry.java
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=517646&r1=517645&r2=517646
==============================================================================
--- 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 04:14:26 2007
@@ -115,7 +115,6 @@
assert targetUri != null;
URI baseSourceUri = UriHelper.getDefragmentedName(sourceUri);
URI baseTargetUri = UriHelper.getDefragmentedName(targetUri);
- String targetFragment = targetUri.getFragment();
Component source = componentManager.getComponent(baseSourceUri);
if (source == null) {
throw new ComponentNotFoundException("Wire source component not found", baseSourceUri);
@@ -125,11 +124,8 @@
throw new ComponentNotFoundException("Wire target component not found", baseTargetUri);
}
Wire wire = createWire(definition);
- try {
- attachInvokers(targetFragment, wire, source, target);
- } catch (TargetInvokerCreationException e) {
- throw new WireCreationException("Error creating invoker", sourceUri, targetUri, e);
- }
+ attacherRegistry.attach(source, wire, definition.getSource());
+ attacherRegistry.attach(source, wire, definition.getTarget());
}
public void connect(ComponentDefinition<? extends Implementation<?>> definition) throws WiringException {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/physical/WireAttacherRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/physical/WireAttacherRegistryImpl.java?view=diff&rev=517646&r1=517645&r2=517646
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/physical/WireAttacherRegistryImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/physical/WireAttacherRegistryImpl.java Tue Mar 13 04:14:26 2007
@@ -27,6 +27,7 @@
import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.model.physical.PhysicalWireSourceDefinition;
import org.apache.tuscany.spi.model.physical.PhysicalWireTargetDefinition;
+import org.apache.tuscany.spi.wire.Wire;
/**
* @version $Rev$ $Date$
@@ -47,24 +48,28 @@
}
@SuppressWarnings("unchecked")
- public <C extends Component, PWSD extends PhysicalWireSourceDefinition> void attach(C component, PWSD source)
+ public <C extends Component, PWSD extends PhysicalWireSourceDefinition> void attach(C component,
+ Wire wire,
+ PWSD source)
throws WiringException {
Class<? extends Component> type = component.getClass();
WireAttacher attacher = attachers.get(type);
if (attacher == null) {
- throw new WireAttacherNotRegistered(type, component.getUri(), null);
+ throw new WireAttacherNotRegistered(type, component.getUri(), wire.getTargetUri());
}
- attacher.attach(component, source);
+ attacher.attach(component, wire, source);
}
@SuppressWarnings("unchecked")
- public <C extends Component, PWTD extends PhysicalWireTargetDefinition> void attach(C component, PWTD target)
+ public <C extends Component, PWTD extends PhysicalWireTargetDefinition> void attach(C component,
+ Wire wire,
+ PWTD target)
throws WiringException {
Class<? extends Component> type = component.getClass();
WireAttacher attacher = attachers.get(type);
if (attacher == null) {
throw new WireAttacherNotRegistered(type, component.getUri(), target.getUri());
}
- attacher.attach(component, target);
+ attacher.attach(component, wire, target);
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaPhysicalComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaPhysicalComponentBuilder.java?view=diff&rev=517646&r1=517645&r2=517646
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaPhysicalComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaPhysicalComponentBuilder.java Tue Mar 13 04:14:26 2007
@@ -30,6 +30,7 @@
import org.apache.tuscany.spi.component.ScopeRegistry;
import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.services.classloading.ClassLoaderRegistry;
+import org.apache.tuscany.spi.wire.Wire;
import org.apache.tuscany.core.component.InstanceFactoryProvider;
import org.apache.tuscany.core.model.physical.java.JavaPhysicalComponentDefinition;
@@ -131,10 +132,10 @@
* Attaches the source to the component.
*
* @param component Component.
+ * @param wire
* @param source Source.
*/
- public void attach(JavaComponent component, JavaPhysicalWireSourceDefinition source) {
-
+ public void attach(JavaComponent component, Wire wire, JavaPhysicalWireSourceDefinition source) {
}
@@ -142,9 +143,10 @@
* Attaches the target to the component.
*
* @param component Component.
+ * @param wire
* @param target Target.
*/
- public void attach(JavaComponent component, JavaPhysicalWireTargetDefinition target) {
+ public void attach(JavaComponent component, Wire wire, JavaPhysicalWireTargetDefinition target) {
}
}
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=517646&r1=517645&r2=517646
==============================================================================
--- 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 04:14:26 2007
@@ -21,6 +21,7 @@
import java.net.URI;
import org.apache.tuscany.spi.builder.Connector;
+import org.apache.tuscany.spi.builder.physical.WireAttacherRegistry;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.idl.java.JavaInterfaceProcessorRegistry;
import org.apache.tuscany.spi.model.ServiceContract;
@@ -54,8 +55,6 @@
AtomicComponent target = EasyMock.createMock(AtomicComponent.class);
EasyMock.expect(target.getUri()).andReturn(TARGET_URI).atLeastOnce();
- target.createTargetInvoker((String) EasyMock.isNull(), EasyMock.isA(PhysicalOperationDefinition.class));
- EasyMock.expectLastCall().andReturn(null);
EasyMock.replay(target);
manager.register(target);
@@ -77,7 +76,9 @@
protected void setUp() throws Exception {
super.setUp();
manager = new ComponentManagerImpl();
- connector = new ConnectorImpl(null, null, null, manager, null, null);
+ WireAttacherRegistry attacherRegistry = EasyMock.createNiceMock(WireAttacherRegistry.class);
+ EasyMock.replay(attacherRegistry);
+ connector = new ConnectorImpl(null, attacherRegistry, 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/physical/WireAttacherRegistryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/physical/WireAttacherRegistryTestCase.java?view=diff&rev=517646&r1=517645&r2=517646
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/physical/WireAttacherRegistryTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/physical/WireAttacherRegistryTestCase.java Tue Mar 13 04:14:26 2007
@@ -22,6 +22,7 @@
import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.model.physical.PhysicalWireSourceDefinition;
import org.apache.tuscany.spi.model.physical.PhysicalWireTargetDefinition;
+import org.apache.tuscany.spi.wire.Wire;
import junit.framework.TestCase;
import org.easymock.EasyMock;
@@ -36,11 +37,15 @@
public void testSourceAttachDispatch() throws Exception {
Component component = EasyMock.createMock(Component.class);
EasyMock.replay(component);
+ Wire wire = EasyMock.createMock(Wire.class);
+ EasyMock.replay(wire);
WireAttacher attacher = EasyMock.createMock(WireAttacher.class);
- attacher.attach(EasyMock.isA(Component.class), EasyMock.isA(PhysicalWireSourceDefinition.class));
+ attacher.attach(EasyMock.isA(Component.class),
+ EasyMock.isA(Wire.class),
+ EasyMock.isA(PhysicalWireSourceDefinition.class));
EasyMock.replay(attacher);
registry.register(component.getClass(), attacher);
- registry.attach(component, new PhysicalWireSourceDefinition());
+ registry.attach(component, wire, new PhysicalWireSourceDefinition());
EasyMock.verify(attacher);
}
@@ -48,12 +53,16 @@
public void testTargetAttachDispatch() throws Exception {
Component component = EasyMock.createMock(Component.class);
EasyMock.replay(component);
+ Wire wire = EasyMock.createMock(Wire.class);
+ EasyMock.replay(wire);
WireAttacher attacher = EasyMock.createMock(WireAttacher.class);
- attacher.attach(EasyMock.isA(Component.class), EasyMock.isA(PhysicalWireTargetDefinition.class));
+ attacher.attach(EasyMock.isA(Component.class),
+ EasyMock.isA(Wire.class),
+ EasyMock.isA(PhysicalWireTargetDefinition.class));
EasyMock.replay(attacher);
registry.register(component.getClass(), attacher);
- registry.attach(component, new PhysicalWireTargetDefinition());
+ registry.attach(component, wire, new PhysicalWireTargetDefinition());
EasyMock.verify(attacher);
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/physical/WireAttacher.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/physical/WireAttacher.java?view=diff&rev=517646&r1=517645&r2=517646
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/physical/WireAttacher.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/physical/WireAttacher.java Tue Mar 13 04:14:26 2007
@@ -23,6 +23,7 @@
import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.model.physical.PhysicalWireSourceDefinition;
import org.apache.tuscany.spi.model.physical.PhysicalWireTargetDefinition;
+import org.apache.tuscany.spi.wire.Wire;
/**
* Abstraction for the wire attacher.
@@ -37,16 +38,18 @@
* Attaches the source to the component.
*
* @param component Component.
+ * @param wire
* @param source Source.
*/
- void attach(C component, PWSD source) throws WiringException;
+ void attach(C component, Wire wire, PWSD source) throws WiringException;
/**
* Attaches the target to the component.
*
* @param component Component.
+ * @param wire
* @param target Target.
*/
- void attach(C component, PWTD target) throws WiringException;
+ void attach(C component, Wire wire, PWTD target) throws WiringException;
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/physical/WireAttacherRegistry.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/physical/WireAttacherRegistry.java?view=diff&rev=517646&r1=517645&r2=517646
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/physical/WireAttacherRegistry.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/physical/WireAttacherRegistry.java Tue Mar 13 04:14:26 2007
@@ -22,6 +22,7 @@
import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.model.physical.PhysicalWireSourceDefinition;
import org.apache.tuscany.spi.model.physical.PhysicalWireTargetDefinition;
+import org.apache.tuscany.spi.wire.Wire;
/**
* A registry for wire attachers
@@ -34,17 +35,19 @@
PWSD extends PhysicalWireSourceDefinition,
PWTD extends PhysicalWireTargetDefinition> void register(Class<?> clazz, WireAttacher<C, PWSD, PWTD> attacher);
- <C extends Component, PWSD extends PhysicalWireSourceDefinition> void attach(C component, PWSD source)
+ <C extends Component, PWSD extends PhysicalWireSourceDefinition> void attach(C component, Wire wire, PWSD source)
throws WiringException;
/**
* Attaches the wire to the target component.
*
* @param component Component.
- * @param definition Target wire definition.
- * @throws WiringException
+ * @param wire
+ * @param definition Target wire definition. @throws WiringException
*/
- <C extends Component, PWTD extends PhysicalWireTargetDefinition> void attach(C component, PWTD definition)
+ <C extends Component, PWTD extends PhysicalWireTargetDefinition> void attach(C component,
+ Wire wire,
+ PWTD definition)
throws WiringException;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org