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 2006/12/24 08:39:20 UTC
svn commit: r489998 - in
/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite:
CompositeReference.java CompositeReferenceTargetInvoker.java
CompositeService.java CompositeTargetInvoker.java
Author: jmarino
Date: Sat Dec 23 23:39:20 2006
New Revision: 489998
URL: http://svn.apache.org/viewvc?view=rev&rev=489998
Log:
rename class
Added:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeTargetInvoker.java (contents, props changed)
- copied, changed from r489928, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeReferenceTargetInvoker.java
Removed:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeReferenceTargetInvoker.java
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeReference.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeService.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeReference.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeReference.java?view=diff&rev=489998&r1=489997&r2=489998
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeReference.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeReference.java Sat Dec 23 23:39:20 2006
@@ -38,7 +38,7 @@
}
public TargetInvoker createTargetInvoker(ServiceContract contract, Operation operation) {
- return new CompositeReferenceTargetInvoker(operation, outboundWire);
+ return new CompositeTargetInvoker(operation, outboundWire);
}
public TargetInvoker createCallbackTargetInvoker(ServiceContract contract, Operation operation) {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeService.java?view=diff&rev=489998&r1=489997&r2=489998
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeService.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeService.java Sat Dec 23 23:39:20 2006
@@ -36,12 +36,12 @@
/**
* A service for a remote binding does not need a target invoker, but a bindless service does because it gets wired
- * localy from a reference (or from a parent service?!) We just reuse CompositeReferenceTargetInvoker for now since
+ * localy from a reference (or from a parent service?!) We just reuse CompositeTargetInvoker for now since
* it seems the target invoker we need does the same thing, if this is confirmed we should give it a common name
* FIXME !!! Notice that this method is not defined in the SPI !!!
*/
public TargetInvoker createTargetInvoker(ServiceContract contract, Operation operation) {
- return new CompositeReferenceTargetInvoker(operation, outboundWire);
+ return new CompositeTargetInvoker(operation, outboundWire);
}
/**
Copied: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeTargetInvoker.java (from r489928, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeReferenceTargetInvoker.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeTargetInvoker.java?view=diff&rev=489998&p1=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeReferenceTargetInvoker.java&r1=489928&p2=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeTargetInvoker.java&r2=489998
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeReferenceTargetInvoker.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeTargetInvoker.java Sat Dec 23 23:39:20 2006
@@ -27,33 +27,32 @@
import org.apache.tuscany.spi.wire.TargetInvoker;
/**
- * Dispatches an invocation through a composite reference
+ * Dispatches an invocation through a composite service or reference
*
* @version $Rev$ $Date$
*/
-public class CompositeReferenceTargetInvoker extends AbstractCompositeReferenceTargetInvoker {
+public class CompositeTargetInvoker extends AbstractCompositeReferenceTargetInvoker {
private OutboundInvocationChain chain;
private Object fromAddress;
private boolean contractHasCallback;
- public CompositeReferenceTargetInvoker(Operation operation,
- OutboundWire outboundWire) {
- assert operation != null : "Operation method cannot be null";
+ public CompositeTargetInvoker(Operation operation,
+ OutboundWire outboundWire) {
+ assert operation != null;
chain = outboundWire.getInvocationChains().get(operation);
fromAddress = (outboundWire.getContainer() == null) ? null : outboundWire.getContainer().getName();
contractHasCallback = outboundWire.getServiceContract().getCallbackClass() != null;
}
@Override
- public CompositeReferenceTargetInvoker clone() throws CloneNotSupportedException {
- return (CompositeReferenceTargetInvoker) super.clone();
+ public CompositeTargetInvoker clone() throws CloneNotSupportedException {
+ return (CompositeTargetInvoker) super.clone();
}
public Message invoke(Message msg) throws InvocationRuntimeException {
try {
TargetInvoker invoker = chain.getTargetInvoker();
-
// Pushing the from address only needs to happen in the outbound (forward) direction for callbacks
if (contractHasCallback) {
msg.pushFromAddress(fromAddress);
Propchange: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeTargetInvoker.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeTargetInvoker.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org