Author: jboynes
Date: Mon Mar 19 11:22:17 2007
New Revision: 520033
URL: http://svn.apache.org/viewvc?view=rev&rev=520033
Log:
rename methods on WireAttacher for clarity
add source to attachToTarget method
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/main/java/org/apache/tuscany/core/implementation/system/builder/SystemPhysicalComponentBuilder.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/physical/WireAttacherRegistryTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/java/PhysicalBuilderTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/PhysicalBuilderTestCase.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=520033&r1=520032&r2=520033
==============================================================================
---
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
Mon Mar 19 11:22:17 2007
@@ -125,12 +125,12 @@
if (target == null) {
throw new ComponentNotFoundException("Wire target component
not found", baseTargetUri);
}
- attacherRegistry.attach(source, target, wire,
definition.getSource());
- attacherRegistry.attach(target, wire, definition.getTarget());
+ attacherRegistry.attachToSource(source, target, wire,
definition.getSource());
+ attacherRegistry.attachToTarget(source, target, wire,
definition.getTarget());
} else {
// bindings do not have a target
- attacherRegistry.attach(source, null, wire,
definition.getSource());
- attacherRegistry.attach(null, wire, definition.getTarget());
+ attacherRegistry.attachToSource(source, null, wire,
definition.getSource());
+ attacherRegistry.attachToTarget(source, null, wire,
definition.getTarget());
}
}
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=520033&r1=520032&r2=520033
==============================================================================
---
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
Mon Mar 19 11:22:17 2007
@@ -43,36 +43,30 @@
? extends PhysicalWireSourceDefinition,
? extends PhysicalWireTargetDefinition>>();
- public <C extends Component,
- PWSD extends PhysicalWireSourceDefinition,
- PWTD extends PhysicalWireTargetDefinition> void register(Class<?>
clazz, WireAttacher<C, PWSD, PWTD> attacher) {
+ public <C extends Component, PWSD extends PhysicalWireSourceDefinition,
PWTD extends PhysicalWireTargetDefinition>
+ void register(Class<?> clazz, WireAttacher<C, PWSD, PWTD> attacher) {
attachers.put(clazz, attacher);
}
@SuppressWarnings("unchecked")
- public <C extends Component, PWSD extends PhysicalWireSourceDefinition>
void attach(C source,
-
Component target,
-
Wire wire,
-
PWSD definition)
- throws WiringException {
+ public <C extends Component, PWSD extends PhysicalWireSourceDefinition>
+ void attachToSource(C source, Component target, Wire wire, PWSD
definition) throws WiringException {
Class<?> type = definition.getClass();
WireAttacher attacher = attachers.get(type);
if (attacher == null) {
throw new WireAttacherNotFound(type, source.getUri(),
wire.getTargetUri());
}
- attacher.attach(source, target, wire, definition);
+ attacher.attachToSource(source, target, wire, definition);
}
@SuppressWarnings("unchecked")
- public <C extends Component, PWTD extends PhysicalWireTargetDefinition>
void attach(C component,
-
Wire wire,
-
PWTD target)
- throws WiringException {
+ public <C extends Component, PWTD extends PhysicalWireTargetDefinition>
+ void attachToTarget(Component source, C component, Wire wire, PWTD target)
throws WiringException {
Class<?> type = target.getClass();
WireAttacher attacher = attachers.get(type);
if (attacher == null) {
throw new WireAttacherNotFound(type, component.getUri(),
target.getUri());
}
- attacher.attach(component, wire, target);
+ attacher.attachToTarget(source, 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=520033&r1=520032&r2=520033
==============================================================================
---
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
Mon Mar 19 11:22:17 2007
@@ -31,7 +31,6 @@
import
org.apache.tuscany.core.component.instancefactory.IFProviderBuilderRegistry;
import org.apache.tuscany.core.implementation.POJOPhysicalComponentBuilder;
import org.apache.tuscany.core.injection.CallbackWireObjectFactory2;
-import org.apache.tuscany.core.injection.InstanceObjectFactory;
import org.apache.tuscany.core.model.physical.instancefactory.InjectionSource;
import static
org.apache.tuscany.core.model.physical.instancefactory.InjectionSource.ValueSourceType.CALLBACK;
import static
org.apache.tuscany.core.model.physical.instancefactory.InjectionSource.ValueSourceType.REFERENCE;
@@ -111,7 +110,7 @@
* @param definition the attach metadata
*/
@SuppressWarnings({"unchecked"})
- public void attach(JavaComponent source,
+ public void attachToSource(JavaComponent source,
Component target,
Wire wire,
JavaPhysicalWireSourceDefinition definition) {
@@ -138,11 +137,12 @@
/**
* Attaches the target to the component.
*
+ * @param source
* @param component Component.
* @param wire the wire to attach
* @param target Target.
*/
- public void attach(JavaComponent component, Wire wire,
JavaPhysicalWireTargetDefinition target)
+ public void attachToTarget(Component source, JavaComponent component, Wire
wire, JavaPhysicalWireTargetDefinition target)
throws WireAttachException {
ScopeContainer scopeContainer = component.getScopeContainer();
Class<?> implementationClass = component.getImplementationClass();
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemPhysicalComponentBuilder.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemPhysicalComponentBuilder.java?view=diff&rev=520033&r1=520032&r2=520033
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemPhysicalComponentBuilder.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemPhysicalComponentBuilder.java
Mon Mar 19 11:22:17 2007
@@ -82,7 +82,7 @@
return new SystemComponent<T>(componentId, provider, scopeContainer,
groupId, initLevel, -1, -1);
}
- public void attach(SystemComponent source,
+ public void attachToSource(SystemComponent source,
Component target,
Wire wire,
SystemPhysicalWireSourceDefinition definition) throws
WiringException {
@@ -94,9 +94,9 @@
source.setObjectFactory(referenceSource, factory);
}
- public void attach(SystemComponent component,
- Wire wire,
- SystemPhysicalWireTargetDefinition definition) throws
WiringException {
+ public void attachToTarget(Component source, SystemComponent component,
+ Wire wire,
+ SystemPhysicalWireTargetDefinition definition)
throws WiringException {
// nothing to do here as the wire will always be optimized
}
}
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=520033&r1=520032&r2=520033
==============================================================================
---
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
Mon Mar 19 11:22:17 2007
@@ -32,47 +32,43 @@
*/
public class WireAttacherRegistryTestCase extends TestCase {
WireAttacherRegistryImpl registry;
+ private Component source;
+ private Component target;
+ private Wire wire;
+ private WireAttacher attacher;
@SuppressWarnings("unchecked")
public void testSourceAttachDispatch() throws Exception {
- Component source = EasyMock.createMock(Component.class);
- EasyMock.replay(source);
- Component target = EasyMock.createMock(Component.class);
- EasyMock.replay(target);
-
- Wire wire = EasyMock.createMock(Wire.class);
- EasyMock.replay(wire);
- WireAttacher attacher = EasyMock.createMock(WireAttacher.class);
- attacher.attach(EasyMock.isA(Component.class),
- EasyMock.isA(Component.class),
- EasyMock.isA(Wire.class),
- EasyMock.isA(PhysicalWireSourceDefinition.class));
+ PhysicalWireSourceDefinition pwsd = new PhysicalWireSourceDefinition();
+ attacher.attachToSource(source, target, wire, pwsd);
EasyMock.replay(attacher);
+
registry.register(PhysicalWireSourceDefinition.class, attacher);
- registry.attach(source, target, wire, new
PhysicalWireSourceDefinition());
+ registry.attachToSource(source, target, wire, pwsd);
EasyMock.verify(attacher);
}
@SuppressWarnings("unchecked")
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(Wire.class),
- EasyMock.isA(PhysicalWireTargetDefinition.class));
+ PhysicalWireTargetDefinition pwtd = new PhysicalWireTargetDefinition();
+ attacher.attachToTarget(source, target, wire, pwtd);
EasyMock.replay(attacher);
registry.register(PhysicalWireTargetDefinition.class, attacher);
- registry.attach(component, wire, new PhysicalWireTargetDefinition());
+ registry.attachToTarget(source, target, wire, pwtd);
EasyMock.verify(attacher);
}
protected void setUp() throws Exception {
super.setUp();
+ source = EasyMock.createMock(Component.class);
+ EasyMock.replay(source);
+ target = EasyMock.createMock(Component.class);
+ EasyMock.replay(target);
+ wire = EasyMock.createMock(Wire.class);
+ EasyMock.replay(wire);
+ attacher = EasyMock.createMock(WireAttacher.class);
+
registry = new WireAttacherRegistryImpl();
}
-
}
Modified:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/java/PhysicalBuilderTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/java/PhysicalBuilderTestCase.java?view=diff&rev=520033&r1=520032&r2=520033
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/java/PhysicalBuilderTestCase.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/java/PhysicalBuilderTestCase.java
Mon Mar 19 11:22:17 2007
@@ -38,7 +38,6 @@
import
org.apache.tuscany.core.model.physical.instancefactory.ReflectiveIFProviderDefinition;
import
org.apache.tuscany.core.model.physical.java.JavaPhysicalComponentDefinition;
import
org.apache.tuscany.core.model.physical.java.JavaPhysicalWireSourceDefinition;
-import
org.apache.tuscany.core.model.physical.java.JavaPhysicalWireTargetDefinition;
import org.apache.tuscany.spi.component.InstanceWrapper;
import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.component.ScopeRegistry;
@@ -73,7 +72,7 @@
*/
JavaComponent<?> sourceComponent = builder.build(source);
JavaComponent<?> targetComponent = builder.build(target);
- builder.attach(sourceComponent, targetComponent, null, wireSource);
+ builder.attachToSource(sourceComponent, targetComponent, null,
wireSource);
sourceComponent.start();
targetComponent.start();
Modified:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/PhysicalBuilderTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/PhysicalBuilderTestCase.java?view=diff&rev=520033&r1=520032&r2=520033
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/PhysicalBuilderTestCase.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/PhysicalBuilderTestCase.java
Mon Mar 19 11:22:17 2007
@@ -70,8 +70,8 @@
SystemComponent<?> sourceComponent = builder.build(source);
SystemComponent<?> targetComponent = builder.build(target);
- builder.attach(sourceComponent, targetComponent, null, wireSource);
- builder.attach(targetComponent, null, wireTarget);
+ builder.attachToSource(sourceComponent, targetComponent, null,
wireSource);
+ builder.attachToTarget(sourceComponent, targetComponent, null,
wireTarget);
sourceComponent.start();
targetComponent.start();
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=520033&r1=520032&r2=520033
==============================================================================
---
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
Mon Mar 19 11:22:17 2007
@@ -39,22 +39,22 @@
* Attaches a wire to a source component.
*
* @param source the source component
- * @param target the component.
+ * @param target the target component
* @param wire the wire
- * @param definition metadata for performing the attach. @throws
WiringException if an exception occurs during the
- * attach operation
+ * @param definition metadata for performing the attach.
* @throws WiringException if an exception occurs during the attach
operation
*/
- void attach(C source, Component target, Wire wire, PWSD definition) throws
WiringException;
+ void attachToSource(C source, Component target, Wire wire, PWSD
definition) throws WiringException;
/**
* Attaches a wire to a target component.
*
- * @param component the component.
+ * @param source the source component
+ * @param target the target component
* @param wire the wire
* @param definition metadata for performing the attach.
* @throws WiringException if an exception occurs during the attach
operation
*/
- void attach(C component, Wire wire, PWTD definition) throws
WiringException;
+ void attachToTarget(Component source, C target, Wire wire, PWTD
definition) 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=520033&r1=520032&r2=520033
==============================================================================
---
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
Mon Mar 19 11:22:17 2007
@@ -35,23 +35,28 @@
PWSD extends PhysicalWireSourceDefinition,
PWTD extends PhysicalWireTargetDefinition> void register(Class<?>
clazz, WireAttacher<C, PWSD, PWTD> attacher);
- <C extends Component, PWSD extends PhysicalWireSourceDefinition> void
attach(C source,
-
Component target,
-
Wire wire,
-
PWSD definition)
- throws WiringException;
+ /**
+ * Attaches a wire to a source component.
+ *
+ * @param source the source component
+ * @param target the target component
+ * @param wire the wire
+ * @param definition metadata for performing the attach.
+ * @throws WiringException if an exception occurs during the attach
operation
+ */
+ <C extends Component, PWSD extends PhysicalWireSourceDefinition>
+ void attachToSource(C source, Component target, Wire wire, PWSD
definition) throws WiringException;
/**
- * Attaches the wire to the target component.
+ * Attaches a wire to a target component.
*
- * @param component Component.
+ * @param source the source component
+ * @param target the target component
* @param wire the wire
- * @param definition Target wire definition. @throws WiringException
- * @throws WiringException if an error is encountered during the attach
operation
+ * @param definition metadata for performing the attach.
+ * @throws WiringException if an exception occurs during the attach
operation
*/
- <C extends Component, PWTD extends PhysicalWireTargetDefinition> void
attach(C component,
-
Wire wire,
-
PWTD definition)
- throws WiringException;
+ <C extends Component, PWTD extends PhysicalWireTargetDefinition>
+ void attachToTarget(Component source, C target, Wire wire, PWTD
definition) throws WiringException;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
