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/01/08 16:12:42 UTC
svn commit: r494091 - in /incubator/tuscany/java/sca/kernel:
core/src/main/java/org/apache/tuscany/core/binding/local/
core/src/main/java/org/apache/tuscany/core/builder/
core/src/main/java/org/apache/tuscany/core/implementation/system/component/
core/...
Author: jmarino
Date: Mon Jan 8 07:12:41 2007
New Revision: 494091
URL: http://svn.apache.org/viewvc?view=rev&rev=494091
Log:
remove ReferenceBinding.createCallbackTargetInvoker(..) and merge with createTargetInvoker(..)
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/binding/local/LocalReferenceBinding.java
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/system/component/SystemReferenceBinding.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/CallbackConnectionTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireServiceExtensionTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ReferenceBinding.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceBindingExtension.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/binding/local/LocalReferenceBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/binding/local/LocalReferenceBinding.java?view=diff&rev=494091&r1=494090&r2=494091
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/binding/local/LocalReferenceBinding.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/binding/local/LocalReferenceBinding.java Mon Jan 8 07:12:41 2007
@@ -21,7 +21,11 @@
public TargetInvoker createTargetInvoker(ServiceContract contract, Operation operation)
throws TargetInvokerCreationException {
- return new LocalTargetInvoker(operation, outboundWire);
+ if (operation.isCallback()) {
+ return new LocalCallbackTargetInvoker(operation, inboundWire);
+ } else {
+ return new LocalTargetInvoker(operation, outboundWire);
+ }
}
public TargetInvoker createCallbackTargetInvoker(ServiceContract contract, Operation operation)
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=494091&r1=494090&r2=494091
==============================================================================
--- 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 Jan 8 07:12:41 2007
@@ -257,7 +257,7 @@
ServiceContract sourceContract = sourceWire.getServiceContract();
TargetInvoker invoker;
try {
- invoker = binding.createCallbackTargetInvoker(sourceContract, operation);
+ invoker = binding.createTargetInvoker(sourceContract, operation);
} catch (TargetInvokerCreationException e) {
throw new WireConnectException("Error connecting source and target",
sourceWire,
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemReferenceBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemReferenceBinding.java?view=diff&rev=494091&r1=494090&r2=494091
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemReferenceBinding.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/component/SystemReferenceBinding.java Mon Jan 8 07:12:41 2007
@@ -71,10 +71,6 @@
throw new UnsupportedOperationException();
}
- public TargetInvoker createCallbackTargetInvoker(ServiceContract contract, Operation operation) {
- throw new UnsupportedOperationException();
- }
-
public TargetInvoker createAsyncTargetInvoker(OutboundWire wire, Operation operation) {
throw new UnsupportedOperationException();
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/CallbackConnectionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/CallbackConnectionTestCase.java?view=diff&rev=494091&r1=494090&r2=494091
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/CallbackConnectionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/CallbackConnectionTestCase.java Mon Jan 8 07:12:41 2007
@@ -83,7 +83,7 @@
ReferenceBinding binding = EasyMock.createMock(ReferenceBinding.class);
EasyMock.expect(binding.isSystem()).andReturn(false).anyTimes();
EasyMock.expect(binding.getName()).andReturn("source").atLeastOnce();
- EasyMock.expect(binding.createCallbackTargetInvoker(EasyMock.isA(ServiceContract.class),
+ EasyMock.expect(binding.createTargetInvoker(EasyMock.isA(ServiceContract.class),
EasyMock.isA(Operation.class))).andReturn(EasyMock.createNiceMock(TargetInvoker.class));
EasyMock.replay(binding);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireServiceExtensionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireServiceExtensionTestCase.java?view=diff&rev=494091&r1=494090&r2=494091
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireServiceExtensionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireServiceExtensionTestCase.java Mon Jan 8 07:12:41 2007
@@ -296,11 +296,6 @@
return null;
}
- public TargetInvoker createCallbackTargetInvoker(ServiceContract contract, Operation operation)
- throws TargetInvokerCreationException {
- return null;
- }
-
public Scope getScope() {
return null;
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ReferenceBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ReferenceBinding.java?view=diff&rev=494091&r1=494090&r2=494091
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ReferenceBinding.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/ReferenceBinding.java Mon Jan 8 07:12:41 2007
@@ -70,19 +70,9 @@
throws TargetInvokerCreationException;
/**
- * Creates a target invoker for callbacks
+ * Returns the service contract for the binding
*
- * @param contract the service contract to invoke on
- * @param operation the operation to invoke
- * @throws TargetInvokerCreationException
- */
- TargetInvoker createCallbackTargetInvoker(ServiceContract contract, Operation operation)
- throws TargetInvokerCreationException;
-
- /**
- * Get the ServiceContract for the binding
- *
- * @return
+ * @return the service contract for the binding
*/
ServiceContract<?> getBindingServiceContract();
@@ -91,7 +81,7 @@
* Set the ServiceContract for the binding. This contract will be used for the outbound wire. If not set, it will be
* the same as the ServideContract from the interface.
*
- * @param serviceContract
+ * @param serviceContract the service contract
*/
void setBindingServiceContract(ServiceContract<?> serviceContract);
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceBindingExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceBindingExtension.java?view=diff&rev=494091&r1=494090&r2=494091
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceBindingExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceBindingExtension.java Mon Jan 8 07:12:41 2007
@@ -20,15 +20,12 @@
import org.apache.tuscany.spi.component.AbstractSCAObject;
import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.component.ReferenceBinding;
-import org.apache.tuscany.spi.component.TargetInvokerCreationException;
import org.apache.tuscany.spi.component.Reference;
-import org.apache.tuscany.spi.model.Operation;
+import org.apache.tuscany.spi.component.ReferenceBinding;
import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.model.ServiceContract;
import org.apache.tuscany.spi.wire.InboundWire;
import org.apache.tuscany.spi.wire.OutboundWire;
-import org.apache.tuscany.spi.wire.TargetInvoker;
/**
* The default implementation of an SCA reference
@@ -67,11 +64,6 @@
public void setOutboundWire(OutboundWire outboundWire) {
this.outboundWire = outboundWire;
- }
-
- public TargetInvoker createCallbackTargetInvoker(ServiceContract contract, Operation operation)
- throws TargetInvokerCreationException {
- throw new UnsupportedOperationException();
}
public ServiceContract<?> getBindingServiceContract() {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org