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 23:42:12 UTC
svn commit: r517918 - in /incubator/tuscany/java/sca/kernel:
core/src/main/java/org/apache/tuscany/core/builder/
core/src/main/java/org/apache/tuscany/core/implementation/java/
spi/src/main/java/org/apache/tuscany/spi/model/physical/
Author: jmarino
Date: Tue Mar 13 15:42:08 2007
New Revision: 517918
URL: http://svn.apache.org/viewvc?view=rev&rev=517918
Log:
have forward invocations and callbacks handled in the same attachment step
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/implementation/java/JavaPhysicalComponentBuilder.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalWireDefinition.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=517918&r1=517917&r2=517918
==============================================================================
--- 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 15:42:08 2007
@@ -126,11 +126,6 @@
Wire wire = createWire(definition);
attacherRegistry.attach(source, wire, definition.getSource());
attacherRegistry.attach(target, wire, definition.getTarget());
- if (!wire.getCallbackPhysicalInvocationChains().isEmpty()) {
- // attach callbacks
- attacherRegistry.attach(target, wire, definition.getCallbackSource());
- attacherRegistry.attach(source, wire, definition.getCallbackTarget());
- }
}
public void connect(ComponentDefinition<? extends Implementation<?>> definition) throws WiringException {
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=517918&r1=517917&r2=517918
==============================================================================
--- 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 15:42:08 2007
@@ -36,8 +36,8 @@
import org.apache.tuscany.spi.model.physical.PhysicalOperationDefinition;
import org.apache.tuscany.spi.services.classloading.ClassLoaderRegistry;
import org.apache.tuscany.spi.wire.InvocationChain;
-import org.apache.tuscany.spi.wire.Wire;
import org.apache.tuscany.spi.wire.ProxyService;
+import org.apache.tuscany.spi.wire.Wire;
import org.apache.tuscany.core.builder.physical.WireAttachException;
import org.apache.tuscany.core.component.InstanceFactoryProvider;
@@ -165,6 +165,9 @@
Class<?> type = component.getMemberType(wire.getSourceUri());
WireObjectFactory<?> factory = new WireObjectFactory(type, wire, proxyService);
component.setObjectFactory(wire.getSourceUri(), factory);
+ if (!wire.getCallbackInvocationChains().isEmpty()) {
+ // TODO handle callbacks
+ }
}
/**
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalWireDefinition.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalWireDefinition.java?view=diff&rev=517918&r1=517917&r2=517918
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalWireDefinition.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalWireDefinition.java Tue Mar 13 15:42:08 2007
@@ -32,17 +32,12 @@
* @version $Rev$ $Date$
*/
public class PhysicalWireDefinition extends ModelObject {
-
+
// Target definition
private PhysicalWireTargetDefinition target;
-
- // Source definition
- private PhysicalWireSourceDefinition source;
-
- private PhysicalWireTargetDefinition callbackTarget;
// Source definition
- private PhysicalWireSourceDefinition callbackSource;
+ private PhysicalWireSourceDefinition source;
// Collection of operations
private Set<PhysicalOperationDefinition> operations = new HashSet<PhysicalOperationDefinition>();
@@ -74,8 +69,8 @@
*/
public Set<PhysicalOperationDefinition> getNonCallbackOperations() {
Set<PhysicalOperationDefinition> nonCallbackOperations = new HashSet<PhysicalOperationDefinition>();
- for(PhysicalOperationDefinition operation : operations) {
- if(!operation.isCallback()) {
+ for (PhysicalOperationDefinition operation : operations) {
+ if (!operation.isCallback()) {
nonCallbackOperations.add(operation);
}
}
@@ -89,8 +84,8 @@
*/
public Set<PhysicalOperationDefinition> getCallbackOperations() {
Set<PhysicalOperationDefinition> callbackOperations = new HashSet<PhysicalOperationDefinition>();
- for(PhysicalOperationDefinition operation : operations) {
- if(operation.isCallback()) {
+ for (PhysicalOperationDefinition operation : operations) {
+ if (operation.isCallback()) {
callbackOperations.add(operation);
}
}
@@ -99,6 +94,7 @@
/**
* Gets the Wire source URI.
+ *
* @return Wire source URI.
*/
public URI getSourceUri() {
@@ -107,6 +103,7 @@
/**
* Gets the Wire target URI.
+ *
* @return Wire target URI.
*/
public URI getTargetUri() {
@@ -115,6 +112,7 @@
/**
* Gets the wire source.
+ *
* @return Wire source.
*/
public PhysicalWireSourceDefinition getSource() {
@@ -123,6 +121,7 @@
/**
* Sets the wire source.
+ *
* @param source Wire source.
*/
public void setSource(PhysicalWireSourceDefinition source) {
@@ -131,6 +130,7 @@
/**
* Gets the wire target.
+ *
* @return Wire target.
*/
public PhysicalWireTargetDefinition getTarget() {
@@ -139,6 +139,7 @@
/**
* Sets the wire target.
+ *
* @param target Wire target.
*/
public void setTarget(PhysicalWireTargetDefinition target) {
@@ -146,19 +147,4 @@
}
- public PhysicalWireTargetDefinition getCallbackTarget() {
- return callbackTarget;
- }
-
- public void setCallbackTarget(PhysicalWireTargetDefinition callbackTarget) {
- this.callbackTarget = callbackTarget;
- }
-
- public PhysicalWireSourceDefinition getCallbackSource() {
- return callbackSource;
- }
-
- public void setCallbackSource(PhysicalWireSourceDefinition callbackSource) {
- this.callbackSource = callbackSource;
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org