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/02/13 17:47:59 UTC
svn commit: r507084 [1/2] - in /incubator/tuscany/java/sca/kernel:
core/src/main/java/org/apache/tuscany/core/builder/
core/src/main/java/org/apache/tuscany/core/databinding/impl/
core/src/main/java/org/apache/tuscany/core/implementation/composite/ cor...
Author: jmarino
Date: Tue Feb 13 08:47:56 2007
New Revision: 507084
URL: http://svn.apache.org/viewvc?view=rev&rev=507084
Log:
remove Wire.getContainer() and temporarily introduce InboundWire.setComponent(); temporarily disable callback service check as it assumes a Java component type
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/WirePostProcessorRegistryImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessor.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessor.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/SystemSingletonAtomicComponent.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/InboundWireImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/OutboundWireImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/WireServiceExtension.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/WireUtils.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandler.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/AbstractConnectorImplTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/AtomicConnectorTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorPostProcessTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/NonBlockingForwardNonBlockingCallbackConnectionTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/NonBlockingForwardSyncCallbackConnectionTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ReferenceConnectorTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ServiceConnectorTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/SynchronousForwardCallbackConnectionTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/SystemWireConnectionTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/WirePostProcessorRegistryImplTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/MockFactory.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingInterceptorTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessorOptimizationTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessorTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessorTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/TestUtils.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplBasicTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/OutboundWireToJavaTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationIdleExpireTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationMaxAgeExpireTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationStartStopEndTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireOptimizationTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireServiceExtensionTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerSerializationTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/Connector.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/InboundWire.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/Wire.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/WirePostProcessor.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=507084&r1=507083&r2=507084
==============================================================================
--- 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 Feb 13 08:47:56 2007
@@ -97,7 +97,7 @@
}
}
- public void connect(InboundWire sourceWire, OutboundWire targetWire, boolean optimizable)
+ public void connect(SCAObject source, InboundWire sourceWire, SCAObject target, OutboundWire targetWire, boolean optimizable)
throws WiringException {
Map<Operation<?>, OutboundInvocationChain> targetChains = targetWire.getInvocationChains();
for (InboundInvocationChain inboundChain : sourceWire.getInvocationChains().values()) {
@@ -110,9 +110,9 @@
}
if (postProcessorRegistry != null) {
// run wire post-processors
- postProcessorRegistry.process(sourceWire, targetWire);
+ postProcessorRegistry.process(source, sourceWire, target, targetWire);
}
- if (optimizable && WireUtils.isOptimizable(sourceWire) && WireUtils.isOptimizable(targetWire)) {
+ if (optimizable && WireUtils.isOptimizable(source, sourceWire) && WireUtils.isOptimizable(targetWire)) {
sourceWire.setOptimizable(true);
sourceWire.setTargetWire(targetWire);
}
@@ -127,13 +127,15 @@
* @throws WiringException
* @deprecated
*/
- public void connect(OutboundWire sourceWire, InboundWire targetWire, boolean optimizable)
+ public void connect(SCAObject source,
+ OutboundWire sourceWire,
+ SCAObject target,
+ InboundWire targetWire,
+ boolean optimizable)
throws WiringException {
- assert sourceWire.getTargetUri() != null;
- SCAObject source = sourceWire.getContainer();
assert source != null;
- SCAObject target = targetWire.getContainer();
assert target != null;
+ assert sourceWire.getTargetUri() != null;
Map<Operation<?>, InboundInvocationChain> targetChains = targetWire.getInvocationChains();
String portName = sourceWire.getTargetUri().getFragment();
// match outbound to inbound chains
@@ -272,10 +274,10 @@
}
if (postProcessorRegistry != null) {
// run wire post-processors
- postProcessorRegistry.process(sourceWire, targetWire);
+ postProcessorRegistry.process(source, sourceWire, target, targetWire);
}
// perform optimization, if possible
- if (optimizable && WireUtils.isOptimizable(sourceWire) && WireUtils.isOptimizable(targetWire)) {
+ if (optimizable && WireUtils.isOptimizable(sourceWire) && WireUtils.isOptimizable(target, targetWire)) {
sourceWire.setOptimizable(true);
sourceWire.setTargetWire(targetWire);
}
@@ -409,8 +411,8 @@
}
assertWireable(outboundWire, targetWire, false);
boolean optimizable = isOptimizable(Scope.SYSTEM, targetComponent.getScope());
- connect(outboundWire, targetWire, optimizable);
- connect(inboundWire, outboundWire, true);
+ connect(binding, outboundWire, targetComponent, targetWire, optimizable);
+ connect(binding, inboundWire, targetComponent, outboundWire, true);
}
}
@@ -437,7 +439,7 @@
}
OutboundWire outboundWire = binding.getOutboundWire();
// connect the reference's inbound and outbound wires
- connect(inboundWire, outboundWire, true);
+ connect(binding, inboundWire, binding, outboundWire, true);
}
}
@@ -479,7 +481,7 @@
assertWireable(outboundWire, targetWire, false);
}
boolean optimizable = isOptimizable(component.getScope(), targetComponent.getScope());
- connect(outboundWire, targetWire, optimizable);
+ connect(component, outboundWire, targetComponent, targetWire, optimizable);
}
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/WirePostProcessorRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/WirePostProcessorRegistryImpl.java?view=diff&rev=507084&r1=507083&r2=507084
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/WirePostProcessorRegistryImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/WirePostProcessorRegistryImpl.java Tue Feb 13 08:47:56 2007
@@ -21,10 +21,11 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.tuscany.spi.wire.WirePostProcessor;
-import org.apache.tuscany.spi.wire.WirePostProcessorRegistry;
+import org.apache.tuscany.spi.component.SCAObject;
import org.apache.tuscany.spi.wire.InboundWire;
import org.apache.tuscany.spi.wire.OutboundWire;
+import org.apache.tuscany.spi.wire.WirePostProcessor;
+import org.apache.tuscany.spi.wire.WirePostProcessorRegistry;
/**
* The default implementation of a <code>WirePostProcessor</code>
@@ -35,15 +36,15 @@
private final List<WirePostProcessor> processors = new ArrayList<WirePostProcessor>();
- public void process(OutboundWire source, InboundWire target) {
+ public void process(SCAObject source, OutboundWire sourceWire, SCAObject target, InboundWire targetWire) {
for (WirePostProcessor processor : processors) {
- processor.process(source, target);
+ processor.process(source, sourceWire, target, targetWire);
}
}
- public void process(InboundWire source, OutboundWire target) {
+ public void process(SCAObject source, InboundWire sourceWire, SCAObject target, OutboundWire targetWire) {
for (WirePostProcessor processor : processors) {
- processor.process(source, target);
+ processor.process(source, sourceWire, target, targetWire);
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessor.java?view=diff&rev=507084&r1=507083&r2=507084
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessor.java Tue Feb 13 08:47:56 2007
@@ -51,12 +51,12 @@
this.mediator = mediator;
}
- public void process(OutboundWire source, InboundWire target) {
- Map<Operation<?>, OutboundInvocationChain> chains = source.getInvocationChains();
+ public void process(SCAObject source, OutboundWire sourceWire, SCAObject target, InboundWire targetWire) {
+ Map<Operation<?>, OutboundInvocationChain> chains = sourceWire.getInvocationChains();
for (Map.Entry<Operation<?>, OutboundInvocationChain> entry : chains.entrySet()) {
Operation<?> sourceOperation = entry.getKey();
Operation<?> targetOperation =
- getTargetOperation(target.getInvocationChains().keySet(), sourceOperation.getName());
+ getTargetOperation(targetWire.getInvocationChains().keySet(), sourceOperation.getName());
String sourceDataBinding = sourceOperation.getDataBinding();
String targetDataBinding = targetOperation.getDataBinding();
if (sourceDataBinding == null && targetDataBinding == null) {
@@ -68,20 +68,20 @@
// references can be wired
// to the same service
DataBindingInteceptor interceptor =
- new DataBindingInteceptor(source, sourceOperation, targetOperation);
+ new DataBindingInteceptor(sourceWire, sourceOperation, targetOperation);
interceptor.setMediator(mediator);
entry.getValue().addInterceptor(0, interceptor);
}
}
// Check if there's a callback
- Map callbackOperations = source.getServiceContract().getCallbackOperations();
+ Map callbackOperations = sourceWire.getServiceContract().getCallbackOperations();
if (callbackOperations == null || callbackOperations.isEmpty()) {
return;
}
//Object targetAddress = UriHelper.getBaseName(source.getUri());
Map<Operation<?>, OutboundInvocationChain> callbackChains =
- target.getSourceCallbackInvocationChains(source.getUri());
+ targetWire.getSourceCallbackInvocationChains(sourceWire.getUri());
if (callbackChains == null) {
// callback chains could be null
return;
@@ -89,7 +89,7 @@
for (Map.Entry<Operation<?>, OutboundInvocationChain> entry : callbackChains.entrySet()) {
Operation<?> sourceOperation = entry.getKey();
Operation<?> targetOperation =
- getTargetOperation(source.getTargetCallbackInvocationChains().keySet(), sourceOperation
+ getTargetOperation(sourceWire.getTargetCallbackInvocationChains().keySet(), sourceOperation
.getName());
String sourceDataBinding = sourceOperation.getDataBinding();
String targetDataBinding = targetOperation.getDataBinding();
@@ -102,23 +102,22 @@
// references can be wired
// to the same service
DataBindingInteceptor interceptor =
- new DataBindingInteceptor(source, sourceOperation, targetOperation);
+ new DataBindingInteceptor(sourceWire, sourceOperation, targetOperation);
interceptor.setMediator(mediator);
entry.getValue().addInterceptor(0, interceptor);
}
}
}
- public void process(InboundWire source, OutboundWire target) {
- SCAObject container = source.getContainer();
+ public void process(SCAObject source, InboundWire sourceWire, SCAObject target, OutboundWire targetWire) {
// Either Service or Reference
- boolean isReference = container instanceof ReferenceBinding;
+ boolean isReference = source instanceof ReferenceBinding;
- Map<Operation<?>, InboundInvocationChain> chains = source.getInvocationChains();
+ Map<Operation<?>, InboundInvocationChain> chains = sourceWire.getInvocationChains();
for (Map.Entry<Operation<?>, InboundInvocationChain> entry : chains.entrySet()) {
Operation<?> sourceOperation = entry.getKey();
Operation<?> targetOperation =
- getTargetOperation(target.getInvocationChains().keySet(), sourceOperation.getName());
+ getTargetOperation(targetWire.getInvocationChains().keySet(), sourceOperation.getName());
String sourceDataBinding = sourceOperation.getDataBinding();
String targetDataBinding = targetOperation.getDataBinding();
if (sourceDataBinding == null && targetDataBinding == null) {
@@ -128,11 +127,11 @@
|| !sourceDataBinding.equals(targetDataBinding)) {
// Add the interceptor to the source side
DataBindingInteceptor interceptor =
- new DataBindingInteceptor(source, sourceOperation, targetOperation);
+ new DataBindingInteceptor(sourceWire, sourceOperation, targetOperation);
interceptor.setMediator(mediator);
if (isReference) {
// FIXME: We need a better way to position the interceptors
- target.getInvocationChains().get(targetOperation).addInterceptor(0, interceptor);
+ targetWire.getInvocationChains().get(targetOperation).addInterceptor(0, interceptor);
Interceptor tail = entry.getValue().getTailInterceptor();
if (tail != null) {
// HACK to relink the bridging interceptor
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessor.java?view=diff&rev=507084&r1=507083&r2=507084
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessor.java Tue Feb 13 08:47:56 2007
@@ -24,6 +24,7 @@
import java.util.Set;
import org.apache.tuscany.spi.annotation.Autowire;
+import org.apache.tuscany.spi.component.SCAObject;
import org.apache.tuscany.spi.databinding.DataBinding;
import org.apache.tuscany.spi.databinding.DataBindingRegistry;
import org.apache.tuscany.spi.extension.AtomicComponentExtension;
@@ -60,7 +61,7 @@
this.dataBindingRegistry = dataBindingRegistry;
}
- public void process(OutboundWire source, InboundWire target) {
+ public void process(SCAObject source, OutboundWire sourceWire, SCAObject target, InboundWire targetWire) {
Interceptor tailInterceptor;
PassByValueInterceptor passByValueInterceptor;
Operation<?> targetOperation;
@@ -69,17 +70,18 @@
DataBinding resultDataBinding;
boolean allowsPassByReference = false;
- if (target.getContainer() instanceof AtomicComponentExtension) {
+ // JFM this nneds to be fixed
+ if (target instanceof AtomicComponentExtension) {
allowsPassByReference =
- ((AtomicComponentExtension) target.getContainer()).isAllowsPassByReference();
+ ((AtomicComponentExtension) target).isAllowsPassByReference();
}
- if (target.getServiceContract().isRemotable()
+ if (targetWire.getServiceContract().isRemotable()
&& !allowsPassByReference) {
- Map<Operation<?>, InboundInvocationChain> chains = target.getInvocationChains();
+ Map<Operation<?>, InboundInvocationChain> chains = targetWire.getInvocationChains();
for (Map.Entry<Operation<?>, InboundInvocationChain> entry : chains.entrySet()) {
targetOperation = entry.getKey();
sourceOperation =
- getSourceOperation(source.getInvocationChains().keySet(), targetOperation.getName());
+ getSourceOperation(sourceWire.getInvocationChains().keySet(), targetOperation.getName());
if (null != sourceOperation) {
@@ -90,7 +92,7 @@
passByValueInterceptor.setArgsDataBindings(argsDataBindings);
passByValueInterceptor.setResultDataBinding(resultDataBinding);
entry.getValue().addInterceptor(0, passByValueInterceptor);
- tailInterceptor = source.getInvocationChains().get(sourceOperation).getTailInterceptor();
+ tailInterceptor = sourceWire.getInvocationChains().get(sourceOperation).getTailInterceptor();
if (tailInterceptor != null) {
tailInterceptor.setNext(passByValueInterceptor);
}
@@ -99,23 +101,23 @@
}
// Check if there's a callback
- Map callbackOperations = source.getServiceContract().getCallbackOperations();
+ Map callbackOperations = sourceWire.getServiceContract().getCallbackOperations();
allowsPassByReference = false;
- if (source.getContainer() instanceof AtomicComponentExtension) {
+ if (source instanceof AtomicComponentExtension) {
allowsPassByReference =
- ((AtomicComponentExtension) source.getContainer()).isAllowsPassByReference();
+ ((AtomicComponentExtension) source).isAllowsPassByReference();
}
- if (source.getServiceContract().isRemotable()
+ if (sourceWire.getServiceContract().isRemotable()
&& !allowsPassByReference
&& callbackOperations != null
&& !callbackOperations.isEmpty()) {
//URI targetAddress = UriHelper.getBaseName(source.getUri());
- Map<Operation<?>, InboundInvocationChain> callbackChains = source.getTargetCallbackInvocationChains();
+ Map<Operation<?>, InboundInvocationChain> callbackChains = sourceWire.getTargetCallbackInvocationChains();
for (Map.Entry<Operation<?>, InboundInvocationChain> entry : callbackChains.entrySet()) {
targetOperation = entry.getKey();
sourceOperation =
- getSourceOperation(target.getSourceCallbackInvocationChains(source.getUri()).keySet(),
+ getSourceOperation(targetWire.getSourceCallbackInvocationChains(sourceWire.getUri()).keySet(),
targetOperation.getName());
argsDataBindings = resolveArgsDataBindings(targetOperation);
@@ -128,7 +130,7 @@
entry.getValue().addInterceptor(0, passByValueInterceptor);
tailInterceptor =
- target.getSourceCallbackInvocationChains(source.getUri()).get(sourceOperation)
+ targetWire.getSourceCallbackInvocationChains(sourceWire.getUri()).get(sourceOperation)
.getTailInterceptor();
if (tailInterceptor != null) {
tailInterceptor.setNext(passByValueInterceptor);
@@ -137,7 +139,7 @@
}
}
- public void process(InboundWire source, OutboundWire target) {
+ public void process(SCAObject source, InboundWire sourceWire, SCAObject target, OutboundWire targetWire) {
//to be done if required..
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/SystemSingletonAtomicComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/SystemSingletonAtomicComponent.java?view=diff&rev=507084&r1=507083&r2=507084
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/SystemSingletonAtomicComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/SystemSingletonAtomicComponent.java Tue Feb 13 08:47:56 2007
@@ -180,7 +180,7 @@
URI uri = URI.create("#" + interfaze.getName());
ServiceDefinition def = new ServiceDefinition(uri, serviceContract, false);
InboundWire wire = wireService.createWire(def);
- wire.setContainer(this);
+ wire.setComponent(this);
inboundWires.put(wire.getUri().getFragment(), wire);
serviceContracts.add(serviceContract);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/InboundWireImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/InboundWireImpl.java?view=diff&rev=507084&r1=507083&r2=507084
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/InboundWireImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/InboundWireImpl.java Tue Feb 13 08:47:56 2007
@@ -18,13 +18,12 @@
*/
package org.apache.tuscany.core.wire;
+import java.net.URI;
import java.util.HashMap;
import java.util.Map;
-import java.net.URI;
import javax.xml.namespace.QName;
import org.apache.tuscany.spi.component.AtomicComponent;
-import org.apache.tuscany.spi.component.SCAObject;
import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.ServiceContract;
@@ -47,7 +46,6 @@
private Map<Operation<?>, InboundInvocationChain> chains = new HashMap<Operation<?>, InboundInvocationChain>();
private Map<URI, Map<Operation<?>, OutboundInvocationChain>> callbackSourceChainMaps =
new HashMap<URI, Map<Operation<?>, OutboundInvocationChain>>();
- private SCAObject container;
private AtomicComponent targetComponent;
private boolean optimizable;
@@ -148,14 +146,7 @@
this.optimizable = optimizable;
}
- public SCAObject getContainer() {
- return container;
- }
-
- public void setContainer(SCAObject container) {
- if (container instanceof AtomicComponent) {
- targetComponent = (AtomicComponent) container;
- }
- this.container = container;
+ public void setComponent(AtomicComponent container) {
+ this.targetComponent = container;
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/OutboundWireImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/OutboundWireImpl.java?view=diff&rev=507084&r1=507083&r2=507084
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/OutboundWireImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/OutboundWireImpl.java Tue Feb 13 08:47:56 2007
@@ -23,7 +23,6 @@
import java.util.Map;
import javax.xml.namespace.QName;
-import org.apache.tuscany.spi.component.SCAObject;
import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.ServiceContract;
@@ -47,7 +46,6 @@
private URI uri;
private URI target;
private InboundWire targetWire;
- private SCAObject container;
private boolean optimizable;
/**
@@ -115,14 +113,6 @@
public boolean isOptimizable() {
return optimizable;
- }
-
- public SCAObject getContainer() {
- return container;
- }
-
- public void setContainer(SCAObject container) {
- this.container = container;
}
public Object getTargetService() throws TargetResolutionException {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/WireServiceExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/WireServiceExtension.java?view=diff&rev=507084&r1=507083&r2=507084
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/WireServiceExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/WireServiceExtension.java Tue Feb 13 08:47:56 2007
@@ -90,7 +90,8 @@
// create incoming service wires
for (ServiceDefinition service : componentType.getServices().values()) {
InboundWire wire = createWire(service);
- wire.setContainer(component);
+ // JFM TODO refactor
+ wire.setComponent(component);
component.addInboundWire(wire);
}
// create outgoing reference wires
@@ -103,14 +104,10 @@
if (multiplicity == Multiplicity.ZERO_ONE || multiplicity == Multiplicity.ONE_ONE) {
// 0..1 or 1..1
for (OutboundWire wire : wires) {
- wire.setContainer(component);
component.addOutboundWire(wire);
}
} else {
// 0..N or 1..N
- for (OutboundWire wire : wires) {
- wire.setContainer(component);
- }
component.addOutboundWires(wires);
}
}
@@ -119,7 +116,6 @@
public void createWires(ReferenceBinding referenceBinding, ServiceContract<?> contract, URI target) {
InboundWire inboundWire = new InboundWireImpl(referenceBinding.getBindingType());
inboundWire.setServiceContract(contract);
- inboundWire.setContainer(referenceBinding);
inboundWire.setUri(referenceBinding.getUri());
for (Operation<?> operation : contract.getOperations().values()) {
InboundInvocationChain chain = createInboundChain(operation);
@@ -134,7 +130,6 @@
bindingContract = contract;
}
outboundWire.setServiceContract(bindingContract);
- outboundWire.setContainer(referenceBinding);
for (Operation<?> operation : bindingContract.getOperations().values()) {
OutboundInvocationChain chain = createOutboundChain(operation);
if (referenceBinding instanceof LocalReferenceBinding) {
@@ -169,7 +164,6 @@
bindingContract = contract;
}
inboundWire.setServiceContract(bindingContract);
- inboundWire.setContainer(serviceBinding);
inboundWire.setUri(serviceBinding.getUri());
for (Operation<?> operation : bindingContract.getOperations().values()) {
InboundInvocationChain inboundChain = createInboundChain(operation);
@@ -180,7 +174,6 @@
OutboundWire outboundWire = new OutboundWireImpl(serviceBinding.getBindingType());
outboundWire.setServiceContract(contract);
outboundWire.setUri(serviceBinding.getUri());
- outboundWire.setContainer(serviceBinding);
outboundWire.setTargetUri(URI.create(targetName));
for (Operation<?> operation : contract.getOperations().values()) {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/WireUtils.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/WireUtils.java?view=diff&rev=507084&r1=507083&r2=507084
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/WireUtils.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/WireUtils.java Tue Feb 13 08:47:56 2007
@@ -121,11 +121,11 @@
* Determines if the given wire is optimizable, i.e. its invocation chains may be bypassed during an invocation.
* This is typically calculated during the connect phase to optimize away invocation chains.
*
+ * @param container the wire container
* @param wire the wire
* @return true if the wire is optimizable
*/
- public static boolean isOptimizable(InboundWire wire) {
- SCAObject container = wire.getContainer();
+ public static boolean isOptimizable(SCAObject container, InboundWire wire) {
if (!(container instanceof Component) || !((Component) container).isOptimizable()) {
return false;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandler.java?view=diff&rev=507084&r1=507083&r2=507084
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandler.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandler.java Tue Feb 13 08:47:56 2007
@@ -24,17 +24,16 @@
import java.io.ObjectOutput;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
+import java.net.URI;
import java.util.List;
import java.util.Map;
import java.util.UUID;
-import java.net.URI;
import org.osoa.sca.NoRegisteredCallbackException;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.ReactivationException;
import org.apache.tuscany.spi.component.SCAExternalizable;
-import org.apache.tuscany.spi.component.SCAObject;
import org.apache.tuscany.spi.component.TargetInvocationException;
import org.apache.tuscany.spi.component.WorkContext;
import static org.apache.tuscany.spi.model.InteractionScope.CONVERSATIONAL;
@@ -48,7 +47,6 @@
import org.apache.tuscany.spi.wire.TargetInvoker;
import org.apache.tuscany.spi.wire.WireInvocationHandler;
-import org.apache.tuscany.core.implementation.PojoAtomicComponent;
import org.apache.tuscany.core.wire.NoMethodForOperationException;
import org.apache.tuscany.core.wire.WireUtils;
@@ -218,8 +216,7 @@
ServiceContract contract = wire.getServiceContract();
this.referenceName = wire.getUri().getFragment();
// TODO JFM remove getContainer
- SCAObject scaObject = wire.getContainer();
- this.fromAddress = UriHelper.getDefragmentedName(wire.getUri());
+ this.fromAddress = UriHelper.getDefragmentedName(wire.getUri());
this.contractIsConversational = contract.getInteractionScope().equals(CONVERSATIONAL);
this.contractIsRemotable = contract.isRemotable();
this.contractHasCallback = contract.getCallbackClass() != null;
@@ -228,14 +225,15 @@
} else {
this.callbackClassName = null;
}
- // FIXME JFM this should be done during the callback and not be dependent on PojoAtomicComponent
- this.wireContainerIsAtomicComponent = scaObject instanceof PojoAtomicComponent;
- if (wireContainerIsAtomicComponent && contractHasCallback) {
- this.callbackIsImplemented =
- ((PojoAtomicComponent) scaObject).implementsCallback(contract.getCallbackClass());
- } else {
- this.callbackIsImplemented = false;
- }
+ // FIXME JFM this should not be dependent on PojoAtomicComponent
+ // JFM commenting out as this should not be specific to pojo types
+// this.wireContainerIsAtomicComponent = scaObject instanceof PojoAtomicComponent;
+// if (wireContainerIsAtomicComponent && contractHasCallback) {
+// this.callbackIsImplemented =
+// ((PojoAtomicComponent) scaObject).implementsCallback(contract.getCallbackClass());
+// } else {
+// this.callbackIsImplemented = false;
+// }
if (mapping == null) {
chains = WireUtils.createInterfaceToWireMapping(interfaze, wire);
} else {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/AbstractConnectorImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/AbstractConnectorImplTestCase.java?view=diff&rev=507084&r1=507083&r2=507084
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/AbstractConnectorImplTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/AbstractConnectorImplTestCase.java Tue Feb 13 08:47:56 2007
@@ -109,7 +109,6 @@
target.createTargetInvoker(EasyMock.eq(TARGET_FRAGMENT), EasyMock.eq(operation), EasyMock.eq(targetWire));
EasyMock.expectLastCall().andReturn(mockInvoker);
EasyMock.replay(target);
- targetWire.setContainer(target);
return target;
}
@@ -135,8 +134,6 @@
source.getInboundWires();
EasyMock.expectLastCall().andReturn(Collections.emptyList());
EasyMock.replay(source);
-
- outboundWire.setContainer(source);
return source;
}
@@ -149,7 +146,6 @@
InboundWire serviceInboundWire = new InboundWireImpl(qName);
serviceInboundWire.setServiceContract(contract);
serviceInboundWire.addInvocationChain(operation, targetInboundChain);
- serviceInboundWire.setContainer(serviceBinding);
OutboundInvocationChain targetOutboundChain = new OutboundInvocationChainImpl(operation);
// place an invoker interceptor on the end
@@ -157,7 +153,6 @@
OutboundWire targetOutboundWire = new OutboundWireImpl(qName);
targetOutboundWire.setServiceContract(contract);
targetOutboundWire.addInvocationChain(operation, targetOutboundChain);
- targetOutboundWire.setContainer(serviceBinding);
serviceBinding.setInboundWire(serviceInboundWire);
serviceBinding.setOutboundWire(targetOutboundWire);
@@ -183,7 +178,6 @@
localServiceInboundWire.setUri(SERVICE_TARGET);
localServiceInboundWire.setServiceContract(contract);
localServiceInboundWire.addInvocationChain(operation, targetInboundChain);
- localServiceInboundWire.setContainer(serviceBinding);
OutboundInvocationChain targetOutboundChain = new OutboundInvocationChainImpl(operation);
// place an invoker interceptor on the end
@@ -191,7 +185,6 @@
OutboundWire targetOutboundWire = new OutboundWireImpl();
targetOutboundWire.setServiceContract(contract);
targetOutboundWire.addInvocationChain(operation, targetOutboundChain);
- targetOutboundWire.setContainer(serviceBinding);
serviceBinding.setInboundWire(localServiceInboundWire);
serviceBinding.setOutboundWire(targetOutboundWire);
@@ -208,7 +201,6 @@
InboundInvocationChain inboundChain = new InboundInvocationChainImpl(operation);
InboundWire referenceInboundWire = new InboundWireImpl();
referenceInboundWire.setServiceContract(contract);
- referenceInboundWire.setContainer(referenceBinding);
referenceInboundWire.addInvocationChain(operation, inboundChain);
referenceInboundWire.setUri(uri);
OutboundInvocationChain outboundChain = new OutboundInvocationChainImpl(operation);
@@ -218,7 +210,6 @@
outboundWire.setServiceContract(contract);
outboundWire.setTargetUri(target);
outboundWire.addInvocationChain(operation, outboundChain);
- outboundWire.setContainer(referenceBinding);
outboundWire.setUri(uri);
referenceBinding.setInboundWire(referenceInboundWire);
referenceBinding.setOutboundWire(outboundWire);
@@ -231,7 +222,6 @@
InboundWire wire = new InboundWireImpl();
wire.setServiceContract(contract);
LocalReferenceBinding referenceBinding = new LocalReferenceBinding(URI.create("baz"));
- wire.setContainer(referenceBinding);
wire.addInvocationChain(operation, chain);
OutboundInvocationChain targetOutboundChain = new OutboundInvocationChainImpl(operation);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/AtomicConnectorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/AtomicConnectorTestCase.java?view=diff&rev=507084&r1=507083&r2=507084
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/AtomicConnectorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/AtomicConnectorTestCase.java Tue Feb 13 08:47:56 2007
@@ -69,8 +69,6 @@
ServiceBinding binding = new MockServiceBinding(sourceUri);
binding.setOutboundWire(outboundWire);
binding.setInboundWire(inboundWire);
- outboundWire.setContainer(binding);
- inboundWire.setContainer(binding);
Service service = new ServiceImpl(sourceUri, null);
service.addServiceBinding(binding);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplTestCase.java?view=diff&rev=507084&r1=507083&r2=507084
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplTestCase.java Tue Feb 13 08:47:56 2007
@@ -72,17 +72,15 @@
EasyMock.expect(container.isOptimizable()).andReturn(false);
EasyMock.replay(container);
InboundWire inboundWire = new InboundWireImpl();
- inboundWire.setContainer(container);
inboundWire.setUri(URI.create("target"));
OutboundWire outboundWire = EasyMock.createMock(OutboundWire.class);
outboundWire.getInvocationChains();
EasyMock.expectLastCall().andReturn(Collections.emptyMap()).atLeastOnce();
outboundWire.getTargetCallbackInvocationChains();
EasyMock.expectLastCall().andReturn(Collections.emptyMap()).atLeastOnce();
- EasyMock.expect(outboundWire.getContainer()).andReturn(container).atLeastOnce();
EasyMock.expect(outboundWire.getTargetUri()).andReturn(URI.create("target")).atLeastOnce();
EasyMock.replay(outboundWire);
- connector.connect(outboundWire, inboundWire, true);
+ connector.connect(container, outboundWire, container, inboundWire, true);
EasyMock.verify(container);
EasyMock.verify(outboundWire);
}
@@ -95,18 +93,16 @@
EasyMock.expect(container.getUri()).andReturn(URI.create("source"));
EasyMock.replay(container);
InboundWire inboundWire = new InboundWireImpl();
- inboundWire.setContainer(container);
inboundWire.setUri(URI.create("target"));
OutboundWire outboundWire = EasyMock.createMock(OutboundWire.class);
outboundWire.getInvocationChains();
EasyMock.expectLastCall().andReturn(Collections.emptyMap()).atLeastOnce();
outboundWire.getTargetCallbackInvocationChains();
EasyMock.expectLastCall().andReturn(Collections.emptyMap()).atLeastOnce();
- EasyMock.expect(outboundWire.getContainer()).andReturn(container).atLeastOnce();
EasyMock.expect(outboundWire.getTargetUri()).andReturn(URI.create("target")).atLeastOnce();
EasyMock.replay(outboundWire);
- connector.connect(outboundWire, inboundWire, true);
+ connector.connect(container, outboundWire, container, inboundWire, true);
EasyMock.verify(container);
EasyMock.verify(outboundWire);
}
@@ -168,7 +164,7 @@
OutboundWire outboundWire = new OutboundWireImpl();
outboundWire.setUri(URI.create("target"));
try {
- connector.connect(inboundWire, outboundWire, false);
+ connector.connect(null, inboundWire, null, outboundWire, false);
fail();
} catch (IncompatibleInterfacesException e) {
// expected
@@ -181,14 +177,12 @@
EasyMock.replay(container);
Operation<Type> operation = new Operation<Type>("bar", null, null, null);
InboundWire inboundWire = new InboundWireImpl();
- inboundWire.setContainer(container);
inboundWire.setUri(URI.create("sca://foo"));
OutboundWire outboundWire = new OutboundWireImpl();
- outboundWire.setContainer(container);
outboundWire.setTargetUri(URI.create("target"));
outboundWire.addInvocationChain(operation, new OutboundInvocationChainImpl(operation));
try {
- connector.connect(outboundWire, inboundWire, false);
+ connector.connect(container, outboundWire, container, inboundWire, false);
fail();
} catch (IncompatibleInterfacesException e) {
// expected
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorPostProcessTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorPostProcessTestCase.java?view=diff&rev=507084&r1=507083&r2=507084
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorPostProcessTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorPostProcessTestCase.java Tue Feb 13 08:47:56 2007
@@ -23,6 +23,7 @@
import java.util.Map;
import org.apache.tuscany.spi.component.AtomicComponent;
+import org.apache.tuscany.spi.component.SCAObject;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.ServiceContract;
import org.apache.tuscany.spi.wire.InboundInvocationChain;
@@ -47,6 +48,7 @@
public class ConnectorPostProcessTestCase extends TestCase {
public void testInboundToOutboundPostProcessCalled() throws Exception {
+ SCAObject container = EasyMock.createMock(SCAObject.class);
OutboundWire owire = new OutboundWireImpl();
owire.setUri(URI.create("target"));
InboundWire iwire = createNiceMock(InboundWire.class);
@@ -54,14 +56,14 @@
expect(iwire.getInvocationChains()).andReturn(chains);
replay(iwire);
WirePostProcessorRegistry registry = createMock(WirePostProcessorRegistry.class);
- registry.process(EasyMock.eq(iwire), EasyMock.eq(owire));
+ registry.process(EasyMock.eq(container), EasyMock.eq(iwire), EasyMock.eq(container), EasyMock.eq(owire));
replay(registry);
WireService wireService = createMock(WireService.class);
EasyMock.expect(wireService.checkCompatibility((ServiceContract<?>) EasyMock.anyObject(),
(ServiceContract<?>) EasyMock.anyObject(), EasyMock.eq(false), EasyMock.eq(false))).andReturn(true);
replay(wireService);
ConnectorImpl connector = new ConnectorImpl(wireService, registry, null, null, null);
- connector.connect(iwire, owire, false);
+ connector.connect(container, iwire, container, owire, false);
verify(registry);
}
@@ -75,15 +77,13 @@
replay(target);
OutboundWire owire = new OutboundWireImpl();
- owire.setContainer(source);
owire.setTargetUri(URI.create("target"));
InboundWire iwire = new InboundWireImpl();
- iwire.setContainer(target);
iwire.setUri(URI.create("target"));
WirePostProcessorRegistry registry = createMock(WirePostProcessorRegistry.class);
- registry.process(EasyMock.eq(owire), EasyMock.eq(iwire));
+ registry.process(EasyMock.eq(source), EasyMock.eq(owire), EasyMock.eq(target), EasyMock.eq(iwire));
replay(registry);
WireService wireService = createMock(WireService.class);
@@ -91,7 +91,7 @@
(ServiceContract<?>) EasyMock.anyObject(), EasyMock.eq(false), EasyMock.eq(false))).andReturn(true);
replay(wireService);
ConnectorImpl connector = new ConnectorImpl(wireService, registry, null, null, null);
- connector.connect(owire, iwire, false);
+ connector.connect(source, owire, target, iwire, false);
verify(registry);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/NonBlockingForwardNonBlockingCallbackConnectionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/NonBlockingForwardNonBlockingCallbackConnectionTestCase.java?view=diff&rev=507084&r1=507083&r2=507084
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/NonBlockingForwardNonBlockingCallbackConnectionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/NonBlockingForwardNonBlockingCallbackConnectionTestCase.java Tue Feb 13 08:47:56 2007
@@ -75,7 +75,6 @@
EasyMock.replay(target);
InboundWire inboundWire = new InboundWireImpl();
- inboundWire.setContainer(target);
inboundWire.setServiceContract(contract);
inboundWire.setUri(targetUriFragment);
InboundInvocationChain inboundChain = new InboundInvocationChainImpl(operation);
@@ -85,7 +84,6 @@
AtomicComponent source = createSource();
OutboundWire outboundWire = new OutboundWireImpl();
- outboundWire.setContainer(source);
outboundWire.setServiceContract(contract);
outboundWire.setTargetUri(targetUriFragment);
OutboundInvocationChain outboundChain = new OutboundInvocationChainImpl(operation);
@@ -98,7 +96,7 @@
chains.put(callbackOperation, callbackInboundChain);
outboundWire.addTargetCallbackInvocationChains(chains);
- connector.connect(outboundWire, inboundWire, true);
+ connector.connect(source, outboundWire, target, inboundWire, true);
// test the forward request
Message msg = new MessageImpl();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/NonBlockingForwardSyncCallbackConnectionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/NonBlockingForwardSyncCallbackConnectionTestCase.java?view=diff&rev=507084&r1=507083&r2=507084
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/NonBlockingForwardSyncCallbackConnectionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/NonBlockingForwardSyncCallbackConnectionTestCase.java Tue Feb 13 08:47:56 2007
@@ -74,7 +74,6 @@
EasyMock.replay(target);
InboundWire inboundWire = new InboundWireImpl();
- inboundWire.setContainer(target);
inboundWire.setServiceContract(contract);
inboundWire.setUri(targetUriFragment);
InboundInvocationChain inboundChain = new InboundInvocationChainImpl(operation);
@@ -84,7 +83,6 @@
AtomicComponent source = createSource();
OutboundWire outboundWire = new OutboundWireImpl();
- outboundWire.setContainer(source);
outboundWire.setServiceContract(contract);
outboundWire.setTargetUri(targetUriFragment);
OutboundInvocationChain outboundChain = new OutboundInvocationChainImpl(operation);
@@ -96,7 +94,7 @@
chains.put(callbackOperation, callbackInboundChain);
outboundWire.addTargetCallbackInvocationChains(chains);
- connector.connect(outboundWire, inboundWire, true);
+ connector.connect(source, outboundWire, target, inboundWire, true);
// test the forward request
Message msg = new MessageImpl();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ReferenceConnectorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ReferenceConnectorTestCase.java?view=diff&rev=507084&r1=507083&r2=507084
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ReferenceConnectorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ReferenceConnectorTestCase.java Tue Feb 13 08:47:56 2007
@@ -69,8 +69,6 @@
EasyMock.expect(referenceBinding.getInboundWire()).andReturn(inboundWire);
EasyMock.expect(referenceBinding.getOutboundWire()).andReturn(outboundWire);
EasyMock.replay(referenceBinding);
- inboundWire.setContainer(referenceBinding);
- outboundWire.setContainer(referenceBinding);
Reference reference = new ReferenceImpl(referenceUri, contract);
reference.addReferenceBinding(referenceBinding);
@@ -109,8 +107,6 @@
EasyMock.expect(referenceBinding.getInboundWire()).andReturn(inboundWire);
EasyMock.expect(referenceBinding.getOutboundWire()).andReturn(outboundWire);
EasyMock.replay(referenceBinding);
- inboundWire.setContainer(referenceBinding);
- outboundWire.setContainer(referenceBinding);
Reference reference = new ReferenceImpl(referenceUri, contract);
reference.addReferenceBinding(referenceBinding);
@@ -141,7 +137,6 @@
InboundWire targetWire = new InboundWireImpl();
targetWire.setServiceContract(contract);
targetWire.addInvocationChain(operation, inboundChain);
- targetWire.setContainer(target);
targetWire.setUri(TARGET_NAME);
// create the outbound wire and chain from the source component
OutboundInvocationChain sourceChain = new OutboundInvocationChainImpl(operation);
@@ -149,9 +144,8 @@
sourceWire.setServiceContract(contract);
sourceWire.setTargetUri(TARGET_NAME);
sourceWire.addInvocationChain(operation, sourceChain);
- sourceWire.setContainer(source);
- connector.connect(sourceWire, targetWire, false);
+ connector.connect(source, sourceWire, target, targetWire, false);
Interceptor interceptor = sourceChain.getHeadInterceptor();
MessageImpl msg = new MessageImpl();
msg.setTargetInvoker(new MockInvoker());
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ServiceConnectorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ServiceConnectorTestCase.java?view=diff&rev=507084&r1=507083&r2=507084
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ServiceConnectorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ServiceConnectorTestCase.java Tue Feb 13 08:47:56 2007
@@ -99,8 +99,6 @@
sourceServiceBinding = new MockServiceBinding(SOURCE);
sourceServiceBinding.setInboundWire(inboundWire);
sourceServiceBinding.setOutboundWire(outboundWire);
- inboundWire.setContainer(sourceServiceBinding);
- outboundWire.setContainer(sourceServiceBinding);
}
private void configureAtomicTarget() throws Exception {
@@ -120,8 +118,6 @@
EasyMock.isA(InboundWire.class))).andReturn(new MockInvoker());
EasyMock.replay(atomicTarget);
- inboundWire.setContainer(atomicTarget);
-
parent = EasyMock.createNiceMock(CompositeComponent.class);
EasyMock.replay(parent);
componentManager.register(atomicTarget);
@@ -133,7 +129,7 @@
referenceTarget.addReferenceBinding(binding);
// put a terminating interceptor on the outbound wire of the reference for testing an invocation
binding.getOutboundWire().getInvocationChains().get(operation).addInterceptor(new InvokerInterceptor());
- connector.connect(binding.getInboundWire(), binding.getOutboundWire(), true);
+ connector.connect(binding, binding.getInboundWire(), binding, binding.getOutboundWire(), true);
parent = EasyMock.createNiceMock(CompositeComponent.class);
EasyMock.expect(parent.getUri()).andReturn(TARGET);
EasyMock.expect(parent.getTargetWire(TARGET_FRAGMENT)).andReturn(binding.getInboundWire());
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/SynchronousForwardCallbackConnectionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/SynchronousForwardCallbackConnectionTestCase.java?view=diff&rev=507084&r1=507083&r2=507084
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/SynchronousForwardCallbackConnectionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/SynchronousForwardCallbackConnectionTestCase.java Tue Feb 13 08:47:56 2007
@@ -73,7 +73,6 @@
EasyMock.replay(target);
InboundWire inboundWire = new InboundWireImpl();
- inboundWire.setContainer(target);
inboundWire.setServiceContract(contract);
inboundWire.setUri(targetUriFragment);
InboundInvocationChain inboundChain = new InboundInvocationChainImpl(operation);
@@ -83,7 +82,6 @@
AtomicComponent source = createSource();
OutboundWire outboundWire = new OutboundWireImpl();
- outboundWire.setContainer(source);
outboundWire.setServiceContract(contract);
outboundWire.setTargetUri(targetUriFragment);
OutboundInvocationChain outboundChain = new OutboundInvocationChainImpl(operation);
@@ -95,7 +93,7 @@
chains.put(callbackOperation, callbackInboundChain);
outboundWire.addTargetCallbackInvocationChains(chains);
- connector.connect(outboundWire, inboundWire, true);
+ connector.connect(source, outboundWire, target, inboundWire, true);
// test the forward request
Message msg = new MessageImpl();
@@ -124,7 +122,6 @@
EasyMock.replay(target);
InboundWire inboundWire = new InboundWireImpl();
- inboundWire.setContainer(target);
inboundWire.setServiceContract(contract);
InboundInvocationChain inboundChain = new InboundInvocationChainImpl(operation);
inboundChain.addInterceptor(new MockInterceptor());
@@ -135,7 +132,6 @@
AtomicComponent source = createSource();
OutboundWire outboundWire = new OutboundWireImpl();
- outboundWire.setContainer(source);
outboundWire.setServiceContract(contract);
OutboundInvocationChain outboundChain = new OutboundInvocationChainImpl(operation);
outboundWire.addInvocationChain(operation, outboundChain);
@@ -147,7 +143,7 @@
chains.put(callbackOperation, callbackInboundChain);
outboundWire.addTargetCallbackInvocationChains(chains);
- connector.connect(outboundWire, inboundWire, true);
+ connector.connect(source, outboundWire, target, inboundWire, true);
// test the forward request
Message msg = new MessageImpl();
msg.setBody("foo");
@@ -182,7 +178,6 @@
EasyMock.replay(target);
InboundWire inboundWire = new InboundWireImpl();
- inboundWire.setContainer(target);
inboundWire.setServiceContract(contract);
inboundWire.setUri(targetUriFragment);
InboundInvocationChain inboundChain = new InboundInvocationChainImpl(operation);
@@ -193,7 +188,6 @@
EasyMock.expect(parent.getTargetWire(EasyMock.eq("service"))).andReturn(inboundWire);
OutboundWire outboundWire = new OutboundWireImpl();
- outboundWire.setContainer(source);
outboundWire.setServiceContract(contract);
outboundWire.setTargetUri(targetUriFragment);
OutboundInvocationChain outboundChain = new OutboundInvocationChainImpl(operation);
@@ -205,7 +199,7 @@
chains.put(callbackOperation, callbackInboundChain);
outboundWire.addTargetCallbackInvocationChains(chains);
- connector.connect(outboundWire, inboundWire, true);
+ connector.connect(source, outboundWire, target, inboundWire, true);
// test the forward request
Message msg = new MessageImpl();
msg.setBody("foo");
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/SystemWireConnectionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/SystemWireConnectionTestCase.java?view=diff&rev=507084&r1=507083&r2=507084
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/SystemWireConnectionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/SystemWireConnectionTestCase.java Tue Feb 13 08:47:56 2007
@@ -75,7 +75,6 @@
EasyMock.expect(source.getOutboundWires()).andReturn(wireMap);
EasyMock.replay(source);
- EasyMock.expect(outbound.getContainer()).andReturn(source).atLeastOnce();
EasyMock.replay(outbound);
componentManager.register(source);
@@ -87,7 +86,6 @@
EasyMock.expect(target.getTargetWire("bar")).andReturn(inbound).atLeastOnce();
EasyMock.replay(target);
- inbound.setContainer(target);
componentManager.register(target);
connector.connect(source);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/WirePostProcessorRegistryImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/WirePostProcessorRegistryImplTestCase.java?view=diff&rev=507084&r1=507083&r2=507084
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/WirePostProcessorRegistryImplTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/WirePostProcessorRegistryImplTestCase.java Tue Feb 13 08:47:56 2007
@@ -18,10 +18,11 @@
*/
package org.apache.tuscany.core.builder;
-import org.apache.tuscany.spi.wire.WirePostProcessor;
-import org.apache.tuscany.spi.wire.WirePostProcessorRegistry;
+import org.apache.tuscany.spi.component.SCAObject;
import org.apache.tuscany.spi.wire.InboundWire;
import org.apache.tuscany.spi.wire.OutboundWire;
+import org.apache.tuscany.spi.wire.WirePostProcessor;
+import org.apache.tuscany.spi.wire.WirePostProcessorRegistry;
import junit.framework.TestCase;
import org.easymock.EasyMock;
@@ -34,28 +35,30 @@
public class WirePostProcessorRegistryImplTestCase extends TestCase {
public void testRegisterUnregister() throws Exception {
+ SCAObject container = EasyMock.createMock(SCAObject.class);
WirePostProcessorRegistry registry = new WirePostProcessorRegistryImpl();
OutboundWire owire = EasyMock.createMock(OutboundWire.class);
InboundWire iwire = EasyMock.createMock(InboundWire.class);
WirePostProcessor processor = createMock(WirePostProcessor.class);
- processor.process(EasyMock.eq(owire), EasyMock.eq(iwire));
+ processor.process(EasyMock.eq(container), EasyMock.eq(owire), EasyMock.eq(container), EasyMock.eq(iwire));
EasyMock.replay(processor);
registry.register(processor);
- registry.process(owire, iwire);
+ registry.process(container, owire, container, iwire);
registry.unregister(processor);
- registry.process(owire, iwire);
+ registry.process(container, owire, container, iwire);
verify(processor);
}
public void testProcessInboundToOutbound() throws Exception {
WirePostProcessorRegistry registry = new WirePostProcessorRegistryImpl();
+ SCAObject container = EasyMock.createMock(SCAObject.class);
OutboundWire owire = EasyMock.createMock(OutboundWire.class);
InboundWire iwire = EasyMock.createMock(InboundWire.class);
WirePostProcessor processor = createMock(WirePostProcessor.class);
- processor.process(EasyMock.eq(iwire), EasyMock.eq(owire));
+ processor.process(EasyMock.eq(container), EasyMock.eq(iwire), EasyMock.eq(container), EasyMock.eq(owire));
EasyMock.replay(processor);
registry.register(processor);
- registry.process(iwire, owire);
+ registry.process(container, iwire, container, owire);
verify(processor);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/MockFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/MockFactory.java?view=diff&rev=507084&r1=507083&r2=507084
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/MockFactory.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/MockFactory.java Tue Feb 13 08:47:56 2007
@@ -101,7 +101,7 @@
wire.setUri(URI.create("#" + setter.getName()));
wire.setServiceContract(new JavaServiceContract(targetClass));
InboundWire inboundWire = new InboundWireImpl();
- inboundWire.setContainer(targetComponent);
+ inboundWire.setComponent(targetComponent);
inboundWire.setServiceContract(new JavaServiceContract(targetClass));
inboundWire.setUri(URI.create("#" + target));
wire.setTargetWire(inboundWire);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingInterceptorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingInterceptorTestCase.java?view=diff&rev=507084&r1=507083&r2=507084
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingInterceptorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingInterceptorTestCase.java Tue Feb 13 08:47:56 2007
@@ -75,7 +75,6 @@
InboundWire inboundWire = EasyMock.createMock(InboundWire.class);
CompositeComponent composite = EasyMock.createMock(CompositeComponent.class);
Component component = EasyMock.createMock(Component.class);
- EasyMock.expect(outboundWire.getContainer()).andReturn(component);
EasyMock.replay(outboundWire, inboundWire, composite, component);
DataBindingInteceptor interceptor = new DataBindingInteceptor(outboundWire, operation1, operation2);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessorOptimizationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessorOptimizationTestCase.java?view=diff&rev=507084&r1=507083&r2=507084
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessorOptimizationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessorOptimizationTestCase.java Tue Feb 13 08:47:56 2007
@@ -19,9 +19,9 @@
package org.apache.tuscany.core.databinding.impl;
import java.lang.reflect.Type;
+import java.net.URI;
import java.util.HashMap;
import java.util.Map;
-import java.net.URI;
import org.apache.tuscany.spi.component.SCAObject;
import org.apache.tuscany.spi.databinding.Mediator;
@@ -48,9 +48,10 @@
private OutboundWire outboundWire;
private InboundInvocationChain inboundChain;
private InboundWire inboundWire;
+ private SCAObject container;
public void testNoInterceptorInterposedOutboundToInbound() {
- processor.process(outboundWire, inboundWire);
+ processor.process(container, outboundWire, container, inboundWire);
EasyMock.verify(outboundChain);
EasyMock.verify(inboundChain);
EasyMock.verify(outboundWire);
@@ -58,7 +59,7 @@
}
public void testNoInterceptorInterposedInboundToOutbound() {
- processor.process(inboundWire, outboundWire);
+ processor.process(container, inboundWire, container, outboundWire);
EasyMock.verify(outboundChain);
EasyMock.verify(inboundChain);
EasyMock.verify(outboundWire);
@@ -68,7 +69,7 @@
protected void setUp() throws Exception {
super.setUp();
- SCAObject container = EasyMock.createMock(SCAObject.class);
+ container = EasyMock.createMock(SCAObject.class);
EasyMock.replay(container);
Mediator mediator = new MediatorImpl();
@@ -96,7 +97,6 @@
outboundWire = EasyMock.createMock(OutboundWire.class);
EasyMock.expect(outboundWire.getInvocationChains()).andReturn(outboundChains);
EasyMock.expect(outboundWire.getServiceContract()).andReturn(contract).anyTimes();
- EasyMock.expect(outboundWire.getContainer()).andReturn(container).anyTimes();
EasyMock.expect(outboundWire.getTargetCallbackInvocationChains()).andReturn(inboundChains).anyTimes();
URI uri = URI.create("foo");
EasyMock.expect(outboundWire.getUri()).andReturn(uri).anyTimes();
@@ -105,7 +105,6 @@
inboundWire = EasyMock.createMock(InboundWire.class);
EasyMock.expect(inboundWire.getInvocationChains()).andReturn(inboundChains);
- EasyMock.expect(inboundWire.getContainer()).andReturn(container).anyTimes();
EasyMock.expect(inboundWire.getSourceCallbackInvocationChains(EasyMock.eq(uri))).andReturn(outboundChains)
.anyTimes();
EasyMock.replay(inboundWire);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessorTestCase.java?view=diff&rev=507084&r1=507083&r2=507084
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessorTestCase.java Tue Feb 13 08:47:56 2007
@@ -69,8 +69,6 @@
Component component = createMock(Component.class);
CompositeComponent composite = createMock(CompositeComponent.class);
- expect(inboundWire.getContainer()).andReturn(component);
- expect(outboundWire.getContainer()).andReturn(component);
Map<Operation<?>, OutboundInvocationChain> outboundChains =
new HashMap<Operation<?>, OutboundInvocationChain>();
@@ -113,7 +111,7 @@
EasyMock.replay(composite, component, inboundWire, outboundWire, inboundChain, outboundChain);
- processor.process(outboundWire, inboundWire);
+ processor.process(component, outboundWire, component, inboundWire);
}
public void testProcess2() {
@@ -122,8 +120,6 @@
ReferenceBinding referenceBinding = createMock(ReferenceBinding.class);
CompositeComponent composite = createMock(CompositeComponent.class);
- expect(inboundWire.getContainer()).andReturn(referenceBinding).anyTimes();
- expect(outboundWire.getContainer()).andReturn(referenceBinding).anyTimes();
Map<Operation<?>, OutboundInvocationChain> outboundChains =
new HashMap<Operation<?>, OutboundInvocationChain>();
@@ -167,7 +163,7 @@
EasyMock.replay(composite, referenceBinding, inboundWire, outboundWire, inboundChain, outboundChain);
- processor.process(inboundWire, outboundWire);
+ processor.process(referenceBinding, inboundWire, referenceBinding, outboundWire);
}
public void testProcess3() {
@@ -176,8 +172,6 @@
ServiceBinding serviceBinding = createMock(ServiceBinding.class);
CompositeComponent composite = createMock(CompositeComponent.class);
- expect(inboundWire.getContainer()).andReturn(serviceBinding).anyTimes();
- expect(outboundWire.getContainer()).andReturn(serviceBinding).anyTimes();
Map<Operation<?>, OutboundInvocationChain> outboundChains =
new HashMap<Operation<?>, OutboundInvocationChain>();
@@ -222,7 +216,7 @@
EasyMock.replay(composite, serviceBinding, inboundWire, outboundWire, inboundChain, outboundChain);
- processor.process(inboundWire, outboundWire);
+ processor.process(serviceBinding, inboundWire, serviceBinding, outboundWire);
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessorTestCase.java?view=diff&rev=507084&r1=507083&r2=507084
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessorTestCase.java Tue Feb 13 08:47:56 2007
@@ -20,9 +20,9 @@
package org.apache.tuscany.core.databinding.impl;
import java.lang.reflect.Type;
+import java.net.URI;
import java.util.Hashtable;
import java.util.Map;
-import java.net.URI;
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.component.TargetResolutionException;
@@ -87,8 +87,6 @@
OutboundInvocationChainImpl outChain = new OutboundInvocationChainImpl(operation1);
outChainsMap.put(operation1, outChain);
- expect(inboundWire.getContainer()).andReturn(componentExtn).times(2);
- expect(outboundWire.getContainer()).andReturn(componentExtn).times(2);
expect(inboundWire.getServiceContract()).andReturn(serviceContract);
expect(inboundWire.getInvocationChains()).andReturn(inChainsMap);
expect(outboundWire.getServiceContract()).andReturn(serviceContract).times(2);
@@ -101,7 +99,7 @@
outChain.addInterceptor(new SynchronousBridgingInterceptor(inChain.getHeadInterceptor()));
EasyMock.replay(inboundWire, outboundWire);
- processor.process(outboundWire, inboundWire);
+ processor.process(componentExtn, outboundWire, componentExtn, inboundWire);
assertEquals(true, inChain.getHeadInterceptor() instanceof PassByValueInterceptor);
assertEquals(true,
@@ -133,8 +131,6 @@
OutboundInvocationChainImpl outChain = new OutboundInvocationChainImpl(operation1);
outChainsMap.put(operation1, outChain);
- expect(inboundWire.getContainer()).andReturn(componentExtn).times(2);
- expect(outboundWire.getContainer()).andReturn(componentExtn).times(2);
expect(inboundWire.getServiceContract()).andReturn(serviceContract);
expect(inboundWire.getInvocationChains()).andReturn(inChainsMap);
expect(outboundWire.getServiceContract()).andReturn(serviceContract).times(2);
@@ -147,7 +143,7 @@
outChain.addInterceptor(new SynchronousBridgingInterceptor(inChain.getHeadInterceptor()));
EasyMock.replay(inboundWire, outboundWire);
- processor.process(outboundWire, inboundWire);
+ processor.process(componentExtn, outboundWire, componentExtn, inboundWire);
assertEquals(false, inChain.getHeadInterceptor() instanceof PassByValueInterceptor);
assertEquals(false,
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/TestUtils.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/TestUtils.java?view=diff&rev=507084&r1=507083&r2=507084
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/TestUtils.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/TestUtils.java Tue Feb 13 08:47:56 2007
@@ -21,7 +21,6 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.idl.InvalidServiceContractException;
import org.apache.tuscany.spi.idl.java.JavaInterfaceProcessorRegistry;
@@ -40,14 +39,6 @@
private TestUtils() {
}
- public static List<InboundWire> populateInboundWires(AtomicComponent component, List<InboundWire> wires)
- throws InvalidServiceContractException {
- for (InboundWire wire : wires) {
- wire.setContainer(component);
- }
- return wires;
- }
-
public static List<InboundWire> createInboundWires(List<Class<?>> interfazes)
throws InvalidServiceContractException {
List<InboundWire> wires = new ArrayList<InboundWire>(interfazes.size());
@@ -68,7 +59,6 @@
public static InboundWire createInboundWire(Class<?> interfaze, CompositeComponent parent)
throws InvalidServiceContractException {
InboundWire wire = createInboundWire(interfaze);
- wire.setContainer(parent);
return wire;
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplBasicTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplBasicTestCase.java?view=diff&rev=507084&r1=507083&r2=507084
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplBasicTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplBasicTestCase.java Tue Feb 13 08:47:56 2007
@@ -85,7 +85,6 @@
private Reference getReference(String name) throws InvalidServiceContractException {
ReferenceBinding binding = EasyMock.createNiceMock(ReferenceBinding.class);
InboundWire wire = TestUtils.createInboundWire(Bar.class);
- wire.setContainer(binding);
EasyMock.expect(binding.getInboundWire()).andReturn(wire).atLeastOnce();
EasyMock.expect(binding.getUri()).andReturn(URI.create("#reference")).atLeastOnce();
replay(binding);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java?view=diff&rev=507084&r1=507083&r2=507084
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java Tue Feb 13 08:47:56 2007
@@ -19,14 +19,13 @@
package org.apache.tuscany.core.implementation.java;
import java.lang.reflect.Constructor;
+import java.net.URI;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import java.net.URI;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.component.SCAObject;
import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.idl.java.JavaServiceContract;
@@ -132,7 +131,6 @@
}
private void createWire() {
- SCAObject scaObject = EasyMock.createNiceMock(SCAObject.class);
Map<Operation<?>, OutboundInvocationChain> chains = Collections.emptyMap();
wire = EasyMock.createMock(OutboundWire.class);
EasyMock.expect(wire.getUri()).andReturn(URI.create("#target")).atLeastOnce();
@@ -141,7 +139,6 @@
JavaServiceContract targetContract = new JavaServiceContract(Target.class);
targetContract.setInteractionScope(InteractionScope.NONCONVERSATIONAL);
EasyMock.expect(wire.getServiceContract()).andReturn(targetContract).atLeastOnce();
- EasyMock.expect(wire.getContainer()).andReturn(scaObject).atLeastOnce();
EasyMock.replay(wire);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java?view=diff&rev=507084&r1=507083&r2=507084
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java Tue Feb 13 08:47:56 2007
@@ -111,33 +111,34 @@
* Verifies exception is thrown when callback is not implemented
*/
public void testCallbackNotRegistered() throws Exception {
- ComponentDefinition<JavaImplementation> targetDefinition = createTarget();
- JavaAtomicComponent fooComponent =
- (JavaAtomicComponent) builder.build(null, targetDefinition, context);
- fooComponent.setScopeContainer(container);
- wireService.createWires(fooComponent, targetDefinition);
- container.register(fooComponent);
- componentManager.register(fooComponent);
-
- CompositeComponent parent = createMock(CompositeComponent.class);
- replay(parent);
-
- ComponentDefinition<JavaImplementation> sourceDefinition = createPlainSource(URI.create("fooPlainClient"));
- JavaAtomicComponent clientComponent =
- (JavaAtomicComponent) builder.build(parent, sourceDefinition, context);
- clientComponent.setScopeContainer(container);
- wireService.createWires(clientComponent, sourceDefinition);
- container.register(clientComponent);
- componentManager.register(clientComponent);
-
- connector.connect(clientComponent);
- FooPlainClient client = (FooPlainClient) clientComponent.getTargetInstance();
- try {
- client.invoke();
- fail();
- } catch (NoRegisteredCallbackException e) {
- // expected
- }
+// JFM temporarily commenting out as implementation needs to be spec compliant
+// ComponentDefinition<JavaImplementation> targetDefinition = createTarget();
+// JavaAtomicComponent fooComponent =
+// (JavaAtomicComponent) builder.build(null, targetDefinition, context);
+// fooComponent.setScopeContainer(container);
+// wireService.createWires(fooComponent, targetDefinition);
+// container.register(fooComponent);
+// componentManager.register(fooComponent);
+//
+// CompositeComponent parent = createMock(CompositeComponent.class);
+// replay(parent);
+//
+// ComponentDefinition<JavaImplementation> sourceDefinition = createPlainSource(URI.create("fooPlainClient"));
+// JavaAtomicComponent clientComponent =
+// (JavaAtomicComponent) builder.build(parent, sourceDefinition, context);
+// clientComponent.setScopeContainer(container);
+// wireService.createWires(clientComponent, sourceDefinition);
+// container.register(clientComponent);
+// componentManager.register(clientComponent);
+//
+// connector.connect(clientComponent);
+// FooPlainClient client = (FooPlainClient) clientComponent.getTargetInstance();
+// try {
+// client.invoke();
+// fail();
+// } catch (NoRegisteredCallbackException e) {
+// // expected
+// }
}
/**
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/OutboundWireToJavaTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/OutboundWireToJavaTestCase.java?view=diff&rev=507084&r1=507083&r2=507084
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/OutboundWireToJavaTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/OutboundWireToJavaTestCase.java Tue Feb 13 08:47:56 2007
@@ -191,17 +191,14 @@
JavaAtomicComponent source = new JavaAtomicComponent(configuration);
source.setScopeContainer(scope);
OutboundWire outboundWire = createOutboundWire("target#Target", Target.class);
- outboundWire.setContainer(source);
source.addOutboundWire(outboundWire);
configuration.setName(new URI("target"));
componentManager.register(source);
JavaAtomicComponent target = new JavaAtomicComponent(configuration);
target.setScopeContainer(scope);
InboundWire targetWire = MockFactory.createInboundWire("Target", Target.class);
- targetWire.setContainer(target);
target.addInboundWire(targetWire);
InboundWire inboundWire = target.getInboundWire("Target");
- inboundWire.setContainer(target);
componentManager.register(target);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org