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 21:17:00 UTC
svn commit: r507192 [1/2] - 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/databinding/impl/
core/src/main/...
Author: jmarino
Date: Tue Feb 13 12:16:54 2007
New Revision: 507192
URL: http://svn.apache.org/viewvc?view=rev&rev=507192
Log:
change Wire.get/setUri to Wire.get/setSourceUri
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/binding/local/LocalTargetInvoker.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/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/deployer/DeployerImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoAtomicComponent.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/jdk/JDKCallbackInvocationHandler.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInboundInvocationHandler.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/binding/local/LocalTargetInvokerTestCase.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/component/scope/MockFactory.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/implementation/java/JavaComponentBuilderReferenceTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.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/implementation/system/component/SystemAtomicComponentTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentWireInvocationTestCase.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/BasicReferenceInvocationHandlerTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/InboundInvocationErrorTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationErrorTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationHandlerTestCase.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/JDKCallbackInvocationHandlerSerializationTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKCallbackInvocationHandlerTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInboundInvocationHandlerSerializationTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInboundInvocationHandlerTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerProxyTestCase.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/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKProxyTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/Wire.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/binding/local/LocalTargetInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/binding/local/LocalTargetInvoker.java?view=diff&rev=507192&r1=507191&r2=507192
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/binding/local/LocalTargetInvoker.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/binding/local/LocalTargetInvoker.java Tue Feb 13 12:16:54 2007
@@ -43,8 +43,8 @@
assert operation != null;
chain = outboundWire.getInvocationChains().get(operation);
assert chain != null;
- if (outboundWire.getUri() != null) {
- fromAddress = URI.create(UriHelper.getBaseName(outboundWire.getUri()));
+ if (outboundWire.getSourceUri() != null) {
+ fromAddress = URI.create(UriHelper.getBaseName(outboundWire.getSourceUri()));
}
contractHasCallback = outboundWire.getServiceContract().getCallbackClass() != null;
}
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=507192&r1=507191&r2=507192
==============================================================================
--- 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 12:16:54 2007
@@ -108,7 +108,7 @@
// match invocation chains
OutboundInvocationChain outboundChain = targetChains.get(inboundChain.getOperation());
if (outboundChain == null) {
- throw new IncompatibleInterfacesException(sourceWire.getUri(), targetWire.getTargetUri());
+ throw new IncompatibleInterfacesException(sourceWire.getSourceUri(), targetWire.getTargetUri());
}
connect(inboundChain, outboundChain);
}
@@ -147,7 +147,7 @@
Operation<?> operation = outboundChain.getOperation();
InboundInvocationChain inboundChain = targetChains.get(operation);
if (inboundChain == null) {
- throw new IncompatibleInterfacesException(sourceWire.getUri(), targetWire.getUri());
+ throw new IncompatibleInterfacesException(sourceWire.getSourceUri(), targetWire.getSourceUri());
}
Operation<?> inboundOperation = inboundChain.getOperation();
boolean isOneWayOperation = operation.isNonBlocking();
@@ -157,8 +157,8 @@
try {
invoker = component.createTargetInvoker(portName, inboundOperation, targetWire);
} catch (TargetInvokerCreationException e) {
- URI sourceUri = sourceWire.getUri();
- URI targetUri = targetWire.getUri();
+ URI sourceUri = sourceWire.getSourceUri();
+ URI targetUri = targetWire.getSourceUri();
throw new WireConnectException("Error connecting source and target", sourceUri, targetUri, e);
}
} else if (target instanceof ReferenceBinding) {
@@ -166,9 +166,9 @@
try {
invoker = referenceBinding.createTargetInvoker(targetWire.getServiceContract(), inboundOperation);
} catch (TargetInvokerCreationException e) {
- URI targetName = targetWire.getUri();
+ URI targetName = targetWire.getSourceUri();
throw new WireConnectException("Error processing inbound wire",
- sourceWire.getUri(),
+ sourceWire.getSourceUri(),
targetName,
e);
}
@@ -177,9 +177,9 @@
try {
invoker = binding.createTargetInvoker(targetWire.getServiceContract(), inboundChain.getOperation());
} catch (TargetInvokerCreationException e) {
- URI targetName = targetWire.getUri();
+ URI targetName = targetWire.getSourceUri();
throw new WireConnectException("Error processing inbound wire",
- sourceWire.getUri(),
+ sourceWire.getSourceUri(),
targetName,
e);
}
@@ -218,8 +218,8 @@
String opName = operation.getName();
throw new IllegalCallbackException("Source callback chain should not exist for operation",
opName,
- sourceWire.getUri(),
- targetWire.getUri());
+ sourceWire.getSourceUri(),
+ targetWire.getSourceUri());
}
ServiceContract<?> targetContract = targetWire.getServiceContract();
@@ -235,8 +235,8 @@
try {
invoker = component.createTargetInvoker(targetOp.getName(), operation, null);
} catch (TargetInvokerCreationException e) {
- URI sourceUri = sourceWire.getUri();
- URI targetUri = targetWire.getUri();
+ URI sourceUri = sourceWire.getSourceUri();
+ URI targetUri = targetWire.getSourceUri();
throw new WireConnectException("Error connecting source and target", sourceUri, targetUri, e);
}
boolean isOneWayOperation = targetOp.isNonBlocking();
@@ -253,8 +253,8 @@
try {
invoker = binding.createTargetInvoker(sourceContract, operation);
} catch (TargetInvokerCreationException e) {
- URI sourceUri = sourceWire.getUri();
- URI targetUri = targetWire.getUri();
+ URI sourceUri = sourceWire.getSourceUri();
+ URI targetUri = targetWire.getSourceUri();
throw new WireConnectException("Error connecting source and target", sourceUri, targetUri, e);
}
connect(outboundChain, inboundChain, invoker, false);
@@ -265,9 +265,9 @@
try {
invoker = binding.createTargetInvoker(sourceContract, operation);
} catch (TargetInvokerCreationException e) {
- URI targetName = sourceWire.getUri();
+ URI targetName = sourceWire.getSourceUri();
throw new WireConnectException("Error processing callback wire",
- sourceWire.getUri(),
+ sourceWire.getSourceUri(),
targetName,
e);
}
@@ -336,7 +336,7 @@
Class<?> targetInterface = targetWire.getServiceContract().getInterfaceClass();
if (!sourceInterface.isAssignableFrom(targetInterface)) {
if (!silent) {
- throw new IncompatibleInterfacesException(sourceWire.getUri(), targetWire.getUri());
+ throw new IncompatibleInterfacesException(sourceWire.getSourceUri(), targetWire.getSourceUri());
} else {
return false;
}
@@ -347,8 +347,8 @@
ServiceContract targetContract = targetWire.getServiceContract();
wireService.checkCompatibility(sourceContract, targetContract, false, silent);
} catch (IncompatibleServiceContractException e) {
- URI sourceUri = sourceWire.getUri();
- URI targetUri = targetWire.getUri();
+ URI sourceUri = sourceWire.getSourceUri();
+ URI targetUri = targetWire.getSourceUri();
if (!silent) {
throw new IncompatibleInterfacesException(sourceUri, targetUri, e);
} else {
@@ -401,7 +401,7 @@
for (ServiceBinding binding : service.getServiceBindings()) {
InboundWire inboundWire = binding.getInboundWire();
OutboundWire outboundWire = binding.getOutboundWire();
- URI sourceUri = outboundWire.getUri();
+ URI sourceUri = outboundWire.getSourceUri();
URI targetUri = outboundWire.getTargetUri();
String fragment = targetUri.getFragment();
URI defragUri = UriHelper.getDefragmentedName(targetUri);
@@ -432,7 +432,7 @@
try {
invoker = binding.createTargetInvoker(contract, operation);
} catch (TargetInvokerCreationException e) {
- URI targetName = inboundWire.getUri();
+ URI targetName = inboundWire.getSourceUri();
throw new WireConnectException("Error processing inbound wire",
reference.getUri(),
targetName,
@@ -452,11 +452,11 @@
for (List<OutboundWire> referenceWires : component.getOutboundWires().values()) {
for (OutboundWire outboundWire : referenceWires) {
if (outboundWire.getTargetUri() == null) {
- URI source = outboundWire.getUri();
+ URI source = outboundWire.getSourceUri();
URI target = outboundWire.getTargetUri();
throw new MissingWireTargetException("Target name was null", source, target);
}
- URI sourceUri = outboundWire.getUri();
+ URI sourceUri = outboundWire.getSourceUri();
URI targetUri = outboundWire.getTargetUri();
String fragment = targetUri.getFragment();
URI defragUri = UriHelper.getDefragmentedName(targetUri);
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=507192&r1=507191&r2=507192
==============================================================================
--- 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 12:16:54 2007
@@ -81,7 +81,7 @@
}
//Object targetAddress = UriHelper.getBaseName(source.getUri());
Map<Operation<?>, OutboundInvocationChain> callbackChains =
- targetWire.getSourceCallbackInvocationChains(sourceWire.getUri());
+ targetWire.getSourceCallbackInvocationChains(sourceWire.getSourceUri());
if (callbackChains == null) {
// callback chains could be null
return;
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=507192&r1=507191&r2=507192
==============================================================================
--- 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 12:16:54 2007
@@ -117,7 +117,7 @@
for (Map.Entry<Operation<?>, InboundInvocationChain> entry : callbackChains.entrySet()) {
targetOperation = entry.getKey();
sourceOperation =
- getSourceOperation(targetWire.getSourceCallbackInvocationChains(sourceWire.getUri()).keySet(),
+ getSourceOperation(targetWire.getSourceCallbackInvocationChains(sourceWire.getSourceUri()).keySet(),
targetOperation.getName());
argsDataBindings = resolveArgsDataBindings(targetOperation);
@@ -130,7 +130,7 @@
entry.getValue().addInterceptor(0, passByValueInterceptor);
tailInterceptor =
- targetWire.getSourceCallbackInvocationChains(sourceWire.getUri()).get(sourceOperation)
+ targetWire.getSourceCallbackInvocationChains(sourceWire.getSourceUri()).get(sourceOperation)
.getTailInterceptor();
if (tailInterceptor != null) {
tailInterceptor.setNext(passByValueInterceptor);
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java?view=diff&rev=507192&r1=507191&r2=507192
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java Tue Feb 13 12:16:54 2007
@@ -202,7 +202,7 @@
for (InboundWire inboundWire : component.getInboundWires()) {
for (InboundInvocationChain chain : inboundWire.getInvocationChains().values()) {
Operation<?> operation = chain.getOperation();
- String serviceName = inboundWire.getUri().getFragment();
+ String serviceName = inboundWire.getSourceUri().getFragment();
TargetInvoker invoker;
try {
invoker = component.createTargetInvoker(serviceName, operation, null);
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoAtomicComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoAtomicComponent.java?view=diff&rev=507192&r1=507191&r2=507192
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoAtomicComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoAtomicComponent.java Tue Feb 13 12:16:54 2007
@@ -29,6 +29,15 @@
import org.osoa.sca.ComponentContext;
+import org.apache.tuscany.spi.ObjectCreationException;
+import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.spi.component.TargetDestructionException;
+import org.apache.tuscany.spi.component.TargetInitializationException;
+import org.apache.tuscany.spi.component.TargetResolutionException;
+import org.apache.tuscany.spi.extension.AtomicComponentExtension;
+import org.apache.tuscany.spi.model.Scope;
+import org.apache.tuscany.spi.wire.OutboundWire;
+
import org.apache.tuscany.core.injection.ArrayMultiplicityObjectFactory;
import org.apache.tuscany.core.injection.ConversationIDObjectFactory;
import org.apache.tuscany.core.injection.EventInvoker;
@@ -41,14 +50,6 @@
import org.apache.tuscany.core.injection.NoMultiplicityTypeException;
import org.apache.tuscany.core.injection.ObjectCallbackException;
import org.apache.tuscany.core.injection.PojoObjectFactory;
-import org.apache.tuscany.spi.ObjectCreationException;
-import org.apache.tuscany.spi.ObjectFactory;
-import org.apache.tuscany.spi.component.TargetDestructionException;
-import org.apache.tuscany.spi.component.TargetInitializationException;
-import org.apache.tuscany.spi.component.TargetResolutionException;
-import org.apache.tuscany.spi.extension.AtomicComponentExtension;
-import org.apache.tuscany.spi.model.Scope;
-import org.apache.tuscany.spi.wire.OutboundWire;
/**
* Base implementation of an {@link org.apache.tuscany.spi.component.AtomicComponent} whose type is a Java class
@@ -73,13 +74,13 @@
public PojoAtomicComponent(PojoConfiguration configuration) {
super(configuration.getName(),
- configuration.getWireService(),
- configuration.getWorkContext(),
- configuration.getScheduler(),
- configuration.getMonitor(),
- configuration.getInitLevel(),
- configuration.getMaxIdleTime(),
- configuration.getMaxAge());
+ configuration.getWireService(),
+ configuration.getWorkContext(),
+ configuration.getScheduler(),
+ configuration.getMonitor(),
+ configuration.getInitLevel(),
+ configuration.getMaxIdleTime(),
+ configuration.getMaxAge());
assert configuration.getInstanceFactory() != null : "Object factory was null";
initInvoker = configuration.getInitInvoker();
destroyInvoker = configuration.getDestroyInvoker();
@@ -164,6 +165,7 @@
break;
}
}
+ //FIXME throw an error if no injection site found
propertyFactories.put(name, factory);
}
@@ -171,6 +173,7 @@
Object getProperty(String name) {
ObjectFactory<?> factory = propertyFactories.get(name);
return factory != null ? factory.getInstance() : null;
+
}
public void addResourceFactory(String name, ObjectFactory<?> factory) {
@@ -203,7 +206,7 @@
}
protected void onReferenceWire(OutboundWire wire) {
- String name = wire.getUri().getFragment();
+ String name = wire.getSourceUri().getFragment();
Member member = referenceSites.get(name);
if (member != null) {
injectors.add(createInjector(member, wire));
@@ -221,7 +224,7 @@
public void onReferenceWires(List<OutboundWire> wires) {
assert wires.size() > 0 : "Wires were empty";
- String referenceName = wires.get(0).getUri().getFragment();
+ String referenceName = wires.get(0).getSourceUri().getFragment();
Member member = referenceSites.get(referenceName);
if (member == null) {
if (constructorParamNames.contains(referenceName)) {
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=507192&r1=507191&r2=507192
==============================================================================
--- 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 12:16:54 2007
@@ -133,7 +133,7 @@
}
public void addInboundWire(InboundWire wire) {
- inboundWires.put(wire.getUri().getFragment(), wire);
+ inboundWires.put(wire.getSourceUri().getFragment(), wire);
}
public Collection<InboundWire> getInboundWires() {
@@ -181,7 +181,7 @@
ServiceDefinition def = new ServiceDefinition(uri, serviceContract, false);
InboundWire wire = wireService.createWire(def);
wire.setComponent(this);
- inboundWires.put(wire.getUri().getFragment(), wire);
+ inboundWires.put(wire.getSourceUri().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=507192&r1=507191&r2=507192
==============================================================================
--- 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 12:16:54 2007
@@ -86,11 +86,11 @@
this.serviceContract = serviceContract;
}
- public URI getUri() {
+ public URI getSourceUri() {
return uri;
}
- public void setUri(URI serviceName) {
+ public void setSourceUri(URI serviceName) {
this.uri = serviceName;
}
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=507192&r1=507191&r2=507192
==============================================================================
--- 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 12:16:54 2007
@@ -78,11 +78,11 @@
this.serviceContract = serviceContract;
}
- public URI getUri() {
+ public URI getSourceUri() {
return uri;
}
- public void setUri(URI referenceUri) {
+ public void setSourceUri(URI referenceUri) {
this.uri = referenceUri;
}
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=507192&r1=507191&r2=507192
==============================================================================
--- 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 12:16:54 2007
@@ -72,7 +72,7 @@
InboundWire wire = new InboundWireImpl();
ServiceContract<?> contract = service.getServiceContract();
wire.setServiceContract(contract);
- wire.setUri(service.getUri());
+ wire.setSourceUri(service.getUri());
for (Operation<?> operation : contract.getOperations().values()) {
InboundInvocationChain chain = createInboundChain(operation);
chain.addInterceptor(new InvokerInterceptor());
@@ -116,13 +116,13 @@
public void createWires(ReferenceBinding referenceBinding, ServiceContract<?> contract, URI target) {
InboundWire inboundWire = new InboundWireImpl(referenceBinding.getBindingType());
inboundWire.setServiceContract(contract);
- inboundWire.setUri(referenceBinding.getUri());
+ inboundWire.setSourceUri(referenceBinding.getUri());
for (Operation<?> operation : contract.getOperations().values()) {
InboundInvocationChain chain = createInboundChain(operation);
inboundWire.addInvocationChain(operation, chain);
}
OutboundWire outboundWire = new OutboundWireImpl(referenceBinding.getBindingType());
- outboundWire.setUri(referenceBinding.getUri());
+ outboundWire.setSourceUri(referenceBinding.getUri());
outboundWire.setTargetUri(target);
// [rfeng] Check if the Reference has the binding contract
ServiceContract<?> bindingContract = referenceBinding.getBindingServiceContract();
@@ -163,7 +163,7 @@
bindingContract = contract;
}
inboundWire.setServiceContract(bindingContract);
- inboundWire.setUri(serviceBinding.getUri());
+ inboundWire.setSourceUri(serviceBinding.getUri());
for (Operation<?> operation : bindingContract.getOperations().values()) {
InboundInvocationChain inboundChain = createInboundChain(operation);
inboundChain.addInterceptor(new SynchronousBridgingInterceptor());
@@ -172,7 +172,7 @@
OutboundWire outboundWire = new OutboundWireImpl(serviceBinding.getBindingType());
outboundWire.setServiceContract(contract);
- outboundWire.setUri(serviceBinding.getUri());
+ outboundWire.setSourceUri(serviceBinding.getUri());
outboundWire.setTargetUri(URI.create(targetName));
for (Operation<?> operation : contract.getOperations().values()) {
@@ -283,7 +283,7 @@
for (URI uri : target.getTargets()) {
OutboundWire wire = new OutboundWireImpl();
wire.setServiceContract(contract);
- wire.setUri(target.getReferenceName());
+ wire.setSourceUri(target.getReferenceName());
wire.setTargetUri(uri);
for (Operation<?> operation : contract.getOperations().values()) {
OutboundInvocationChain chain = createOutboundChain(operation);
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKCallbackInvocationHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKCallbackInvocationHandler.java?view=diff&rev=507192&r1=507191&r2=507192
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKCallbackInvocationHandler.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKCallbackInvocationHandler.java Tue Feb 13 12:16:54 2007
@@ -67,7 +67,7 @@
public JDKCallbackInvocationHandler(InboundWire wire, WorkContext context) {
this.context = context;
this.wire = wire;
- this.serviceName = wire.getUri().getFragment();
+ this.serviceName = wire.getSourceUri().getFragment();
}
@SuppressWarnings({"unchecked"})
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInboundInvocationHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInboundInvocationHandler.java?view=diff&rev=507192&r1=507191&r2=507192
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInboundInvocationHandler.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInboundInvocationHandler.java Tue Feb 13 12:16:54 2007
@@ -70,9 +70,9 @@
}
public JDKInboundInvocationHandler(Class<?> interfaze, InboundWire wire, WorkContext context) {
- assert wire.getUri() != null;
+ assert wire.getSourceUri() != null;
this.context = context;
- this.serviceName = wire.getUri().getFragment();
+ this.serviceName = wire.getSourceUri().getFragment();
this.interfaze = interfaze;
init(interfaze, wire);
}
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=507192&r1=507191&r2=507192
==============================================================================
--- 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 12:16:54 2007
@@ -214,9 +214,9 @@
private void init(Class<?> interfaze, OutboundWire wire, Map<Method, OutboundChainHolder> mapping)
throws NoMethodForOperationException {
ServiceContract contract = wire.getServiceContract();
- this.referenceName = wire.getUri().getFragment();
+ this.referenceName = wire.getSourceUri().getFragment();
// TODO JFM remove getContainer
- this.fromAddress = UriHelper.getDefragmentedName(wire.getUri());
+ this.fromAddress = UriHelper.getDefragmentedName(wire.getSourceUri());
this.contractIsConversational = contract.getInteractionScope().equals(CONVERSATIONAL);
this.contractIsRemotable = contract.isRemotable();
this.contractHasCallback = contract.getCallbackClass() != null;
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/binding/local/LocalTargetInvokerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/binding/local/LocalTargetInvokerTestCase.java?view=diff&rev=507192&r1=507191&r2=507192
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/binding/local/LocalTargetInvokerTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/binding/local/LocalTargetInvokerTestCase.java Tue Feb 13 12:16:54 2007
@@ -75,7 +75,7 @@
chains.put(operation, chain);
OutboundWire wire = EasyMock.createMock(OutboundWire.class);
URI uri = URI.create("foo");
- EasyMock.expect(wire.getUri()).andReturn(uri).atLeastOnce();
+ EasyMock.expect(wire.getSourceUri()).andReturn(uri).atLeastOnce();
wire.getInvocationChains();
EasyMock.expectLastCall().andReturn(chains);
EasyMock.expect(wire.getServiceContract()).andReturn(contract);
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=507192&r1=507191&r2=507192
==============================================================================
--- 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 12:16:54 2007
@@ -93,7 +93,7 @@
InboundInvocationChain chain = new InboundInvocationChainImpl(operation);
chain.addInterceptor(new InvokerInterceptor());
InboundWire targetWire = new InboundWireImpl();
- targetWire.setUri(TARGET);
+ targetWire.setSourceUri(TARGET);
targetWire.setServiceContract(contract);
targetWire.addInvocationChain(operation, chain);
@@ -175,7 +175,7 @@
InboundInvocationChain targetInboundChain = new InboundInvocationChainImpl(operation);
targetInboundChain.addInterceptor(new SynchronousBridgingInterceptor());
InboundWire localServiceInboundWire = new InboundWireImpl();
- localServiceInboundWire.setUri(SERVICE_TARGET);
+ localServiceInboundWire.setSourceUri(SERVICE_TARGET);
localServiceInboundWire.setServiceContract(contract);
localServiceInboundWire.addInvocationChain(operation, targetInboundChain);
@@ -202,7 +202,7 @@
InboundWire referenceInboundWire = new InboundWireImpl();
referenceInboundWire.setServiceContract(contract);
referenceInboundWire.addInvocationChain(operation, inboundChain);
- referenceInboundWire.setUri(uri);
+ referenceInboundWire.setSourceUri(uri);
OutboundInvocationChain outboundChain = new OutboundInvocationChainImpl(operation);
// Outbound chains always contains at least one interceptor
outboundChain.addInterceptor(new SynchronousBridgingInterceptor());
@@ -210,7 +210,7 @@
outboundWire.setServiceContract(contract);
outboundWire.setTargetUri(target);
outboundWire.addInvocationChain(operation, outboundChain);
- outboundWire.setUri(uri);
+ outboundWire.setSourceUri(uri);
referenceBinding.setInboundWire(referenceInboundWire);
referenceBinding.setOutboundWire(outboundWire);
return referenceBinding;
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=507192&r1=507191&r2=507192
==============================================================================
--- 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 12:16:54 2007
@@ -54,13 +54,13 @@
URI sourceUri = URI.create("source");
InboundInvocationChain inboundChain = new InboundInvocationChainImpl(operation);
InboundWire inboundWire = new InboundWireImpl();
- inboundWire.setUri(sourceUri);
+ inboundWire.setSourceUri(sourceUri);
inboundWire.addInvocationChain(operation, inboundChain);
inboundWire.setServiceContract(contract);
OutboundInvocationChain outboundChain = new OutboundInvocationChainImpl(operation);
OutboundWire outboundWire = new OutboundWireImpl();
- outboundWire.setUri(sourceUri);
+ outboundWire.setSourceUri(sourceUri);
outboundWire.setTargetUri(TARGET_NAME);
outboundWire.addInvocationChain(operation, outboundChain);
outboundWire.setServiceContract(contract);
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=507192&r1=507191&r2=507192
==============================================================================
--- 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 12:16:54 2007
@@ -72,7 +72,7 @@
EasyMock.expect(container.isOptimizable()).andReturn(false);
EasyMock.replay(container);
InboundWire inboundWire = new InboundWireImpl();
- inboundWire.setUri(URI.create("target"));
+ inboundWire.setSourceUri(URI.create("target"));
OutboundWire outboundWire = EasyMock.createMock(OutboundWire.class);
outboundWire.getInvocationChains();
EasyMock.expectLastCall().andReturn(Collections.emptyMap()).atLeastOnce();
@@ -93,7 +93,7 @@
EasyMock.expect(container.getUri()).andReturn(URI.create("source"));
EasyMock.replay(container);
InboundWire inboundWire = new InboundWireImpl();
- inboundWire.setUri(URI.create("target"));
+ inboundWire.setSourceUri(URI.create("target"));
OutboundWire outboundWire = EasyMock.createMock(OutboundWire.class);
outboundWire.getInvocationChains();
EasyMock.expectLastCall().andReturn(Collections.emptyMap()).atLeastOnce();
@@ -162,7 +162,7 @@
InboundWire inboundWire = new InboundWireImpl();
inboundWire.addInvocationChain(operation, new InboundInvocationChainImpl(operation));
OutboundWire outboundWire = new OutboundWireImpl();
- outboundWire.setUri(URI.create("target"));
+ outboundWire.setSourceUri(URI.create("target"));
try {
connector.connect(null, inboundWire, null, outboundWire, false);
fail();
@@ -177,7 +177,7 @@
EasyMock.replay(container);
Operation<Type> operation = new Operation<Type>("bar", null, null, null);
InboundWire inboundWire = new InboundWireImpl();
- inboundWire.setUri(URI.create("sca://foo"));
+ inboundWire.setSourceUri(URI.create("sca://foo"));
OutboundWire outboundWire = new OutboundWireImpl();
outboundWire.setTargetUri(URI.create("target"));
outboundWire.addInvocationChain(operation, new OutboundInvocationChainImpl(operation));
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=507192&r1=507191&r2=507192
==============================================================================
--- 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 12:16:54 2007
@@ -50,7 +50,7 @@
public void testInboundToOutboundPostProcessCalled() throws Exception {
SCAObject container = EasyMock.createMock(SCAObject.class);
OutboundWire owire = new OutboundWireImpl();
- owire.setUri(URI.create("target"));
+ owire.setSourceUri(URI.create("target"));
InboundWire iwire = createNiceMock(InboundWire.class);
Map<Operation<?>, InboundInvocationChain> chains = new HashMap<Operation<?>, InboundInvocationChain>();
expect(iwire.getInvocationChains()).andReturn(chains);
@@ -80,7 +80,7 @@
owire.setTargetUri(URI.create("target"));
InboundWire iwire = new InboundWireImpl();
- iwire.setUri(URI.create("target"));
+ iwire.setSourceUri(URI.create("target"));
WirePostProcessorRegistry registry = createMock(WirePostProcessorRegistry.class);
registry.process(EasyMock.eq(source), EasyMock.eq(owire), EasyMock.eq(target), EasyMock.eq(iwire));
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=507192&r1=507191&r2=507192
==============================================================================
--- 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 12:16:54 2007
@@ -76,7 +76,7 @@
InboundWire inboundWire = new InboundWireImpl();
inboundWire.setServiceContract(contract);
- inboundWire.setUri(targetUriFragment);
+ inboundWire.setSourceUri(targetUriFragment);
InboundInvocationChain inboundChain = new InboundInvocationChainImpl(operation);
inboundChain.addInterceptor(new NonBlockingForwardNonBlockingCallbackConnectionTestCase.MockInterceptor());
inboundWire.addInvocationChain(operation, inboundChain);
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=507192&r1=507191&r2=507192
==============================================================================
--- 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 12:16:54 2007
@@ -75,7 +75,7 @@
InboundWire inboundWire = new InboundWireImpl();
inboundWire.setServiceContract(contract);
- inboundWire.setUri(targetUriFragment);
+ inboundWire.setSourceUri(targetUriFragment);
InboundInvocationChain inboundChain = new InboundInvocationChainImpl(operation);
inboundChain.addInterceptor(new NonBlockingForwardSyncCallbackConnectionTestCase.MockInterceptor());
inboundWire.addInvocationChain(operation, inboundChain);
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=507192&r1=507191&r2=507192
==============================================================================
--- 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 12:16:54 2007
@@ -52,7 +52,7 @@
InboundWire inboundWire = new InboundWireImpl();
inboundWire.setServiceContract(contract);
inboundWire.addInvocationChain(operation, inboundChain);
- inboundWire.setUri(referenceUri);
+ inboundWire.setSourceUri(referenceUri);
OutboundInvocationChain outboundChain = new OutboundInvocationChainImpl(operation);
// Outbound chains always contains at least one interceptor
@@ -61,7 +61,7 @@
outboundWire.setServiceContract(contract);
outboundWire.setTargetUri(TARGET_NAME);
outboundWire.addInvocationChain(operation, outboundChain);
- outboundWire.setUri(referenceUri);
+ outboundWire.setSourceUri(referenceUri);
ReferenceBinding referenceBinding = EasyMock.createMock(ReferenceBinding.class);
referenceBinding.setReference(EasyMock.isA(Reference.class));
@@ -91,13 +91,13 @@
InboundWire inboundWire = new InboundWireImpl();
inboundWire.setServiceContract(contract);
inboundWire.addInvocationChain(operation, inboundChain);
- inboundWire.setUri(referenceUri);
+ inboundWire.setSourceUri(referenceUri);
OutboundInvocationChain outboundChain = new OutboundInvocationChainImpl(operation);
// Outbound always contains at lease one interceptor
outboundChain.addInterceptor(new InvokerInterceptor());
OutboundWire outboundWire = new OutboundWireImpl();
outboundWire.setServiceContract(contract);
- outboundWire.setUri(referenceUri);
+ outboundWire.setSourceUri(referenceUri);
outboundWire.setTargetUri(TARGET_NAME);
outboundWire.addInvocationChain(operation, outboundChain);
@@ -137,7 +137,7 @@
InboundWire targetWire = new InboundWireImpl();
targetWire.setServiceContract(contract);
targetWire.addInvocationChain(operation, inboundChain);
- targetWire.setUri(TARGET_NAME);
+ targetWire.setSourceUri(TARGET_NAME);
// create the outbound wire and chain from the source component
OutboundInvocationChain sourceChain = new OutboundInvocationChainImpl(operation);
OutboundWire sourceWire = new OutboundWireImpl();
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=507192&r1=507191&r2=507192
==============================================================================
--- 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 12:16:54 2007
@@ -86,7 +86,7 @@
InboundWire inboundWire = new InboundWireImpl();
inboundWire.setServiceContract(contract);
inboundWire.addInvocationChain(operation, inboundChain);
- inboundWire.setUri(SOURCE);
+ inboundWire.setSourceUri(SOURCE);
OutboundInvocationChain outboundChain = new OutboundInvocationChainImpl(operation);
// Outbound chains always contains at least one interceptor
outboundChain.addInterceptor(new SynchronousBridgingInterceptor());
@@ -94,7 +94,7 @@
outboundWire.setServiceContract(contract);
outboundWire.setTargetUri(TARGET_NAME);
outboundWire.addInvocationChain(operation, outboundChain);
- outboundWire.setUri(SOURCE);
+ outboundWire.setSourceUri(SOURCE);
sourceServiceBinding = new MockServiceBinding(SOURCE);
sourceServiceBinding.setInboundWire(inboundWire);
@@ -107,7 +107,7 @@
InboundWire inboundWire = new InboundWireImpl();
inboundWire.setServiceContract(contract);
inboundWire.addInvocationChain(operation, inboundChain);
- inboundWire.setUri(TARGET);
+ inboundWire.setSourceUri(TARGET);
AtomicComponent atomicTarget = EasyMock.createMock(AtomicComponent.class);
EasyMock.expect(atomicTarget.getTargetWire(EasyMock.isA(String.class))).andReturn(inboundWire).atLeastOnce();
EasyMock.expect(atomicTarget.getUri()).andReturn(TARGET);
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=507192&r1=507191&r2=507192
==============================================================================
--- 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 12:16:54 2007
@@ -74,7 +74,7 @@
InboundWire inboundWire = new InboundWireImpl();
inboundWire.setServiceContract(contract);
- inboundWire.setUri(targetUriFragment);
+ inboundWire.setSourceUri(targetUriFragment);
InboundInvocationChain inboundChain = new InboundInvocationChainImpl(operation);
inboundChain.addInterceptor(new MockInterceptor());
inboundWire.addInvocationChain(operation, inboundChain);
@@ -124,7 +124,7 @@
InboundInvocationChain inboundChain = new InboundInvocationChainImpl(operation);
inboundChain.addInterceptor(new MockInterceptor());
inboundWire.addInvocationChain(operation, inboundChain);
- inboundWire.setUri(targetUriFragment);
+ inboundWire.setSourceUri(targetUriFragment);
CompositeComponent parent = EasyMock.createMock(CompositeComponent.class);
EasyMock.expect(parent.getTargetWire(EasyMock.eq("service"))).andReturn(inboundWire);
@@ -175,7 +175,7 @@
InboundWire inboundWire = new InboundWireImpl();
inboundWire.setServiceContract(contract);
- inboundWire.setUri(targetUriFragment);
+ inboundWire.setSourceUri(targetUriFragment);
InboundInvocationChain inboundChain = new InboundInvocationChainImpl(operation);
inboundChain.addInterceptor(new MockInterceptor());
inboundWire.addInvocationChain(operation, inboundChain);
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=507192&r1=507191&r2=507192
==============================================================================
--- 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 12:16:54 2007
@@ -48,11 +48,11 @@
public void testWireOptimization() throws Exception {
InboundWire inbound = new InboundWireImpl();
inbound.setServiceContract(new JavaServiceContract(Foo.class));
- inbound.setUri(URI.create("scasystem://target#bar"));
+ inbound.setSourceUri(URI.create("scasystem://target#bar"));
OutboundWire outbound = EasyMock.createMock(OutboundWire.class);
EasyMock.expect(outbound.getTargetUri()).andReturn(URI.create("scasystem://target#bar")).atLeastOnce();
- EasyMock.expect(outbound.getUri()).andReturn(URI.create("scasystem://target#bar"));
+ EasyMock.expect(outbound.getSourceUri()).andReturn(URI.create("scasystem://target#bar"));
outbound.getInvocationChains();
EasyMock.expectLastCall().andReturn(Collections.emptyMap()).atLeastOnce();
outbound.getTargetCallbackInvocationChains();
@@ -101,7 +101,7 @@
*/
public void testSchemeIsolationWire() throws Exception {
OutboundWire outbound = new OutboundWireImpl();
- outbound.setUri(URI.create("ref"));
+ outbound.setSourceUri(URI.create("ref"));
outbound.setTargetUri(URI.create("sca://target#bar"));
List<OutboundWire> wires = new ArrayList<OutboundWire>();
wires.add(outbound);
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=507192&r1=507191&r2=507192
==============================================================================
--- 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 12:16:54 2007
@@ -98,12 +98,12 @@
AtomicComponent sourceComponent = new SystemAtomicComponentImpl(sourceConfig);
sourceComponent.setScopeContainer(sourceScopeContainer);
OutboundWire wire = new OutboundWireImpl();
- wire.setUri(URI.create("#" + setter.getName()));
+ wire.setSourceUri(URI.create("#" + setter.getName()));
wire.setServiceContract(new JavaServiceContract(targetClass));
InboundWire inboundWire = new InboundWireImpl();
inboundWire.setComponent(targetComponent);
inboundWire.setServiceContract(new JavaServiceContract(targetClass));
- inboundWire.setUri(URI.create("#" + target));
+ inboundWire.setSourceUri(URI.create("#" + target));
wire.setTargetWire(inboundWire);
sourceComponent.addOutboundWire(wire);
components.put(source, sourceComponent);
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=507192&r1=507191&r2=507192
==============================================================================
--- 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 12:16:54 2007
@@ -99,7 +99,7 @@
EasyMock.expect(outboundWire.getServiceContract()).andReturn(contract).anyTimes();
EasyMock.expect(outboundWire.getTargetCallbackInvocationChains()).andReturn(inboundChains).anyTimes();
URI uri = URI.create("foo");
- EasyMock.expect(outboundWire.getUri()).andReturn(uri).anyTimes();
+ EasyMock.expect(outboundWire.getSourceUri()).andReturn(uri).anyTimes();
EasyMock.replay(outboundWire);
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=507192&r1=507191&r2=507192
==============================================================================
--- 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 12:16:54 2007
@@ -133,7 +133,7 @@
private void createWire() {
Map<Operation<?>, OutboundInvocationChain> chains = Collections.emptyMap();
wire = EasyMock.createMock(OutboundWire.class);
- EasyMock.expect(wire.getUri()).andReturn(URI.create("#target")).atLeastOnce();
+ EasyMock.expect(wire.getSourceUri()).andReturn(URI.create("#target")).atLeastOnce();
EasyMock.expect(wire.getInvocationChains()).andReturn(chains).atLeastOnce();
EasyMock.expect(wire.isOptimizable()).andReturn(false);
JavaServiceContract targetContract = new JavaServiceContract(Target.class);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java?view=diff&rev=507192&r1=507191&r2=507192
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaReferenceWireTestCase.java Tue Feb 13 12:16:54 2007
@@ -58,7 +58,7 @@
wire.getInvocationChains();
EasyMock.expectLastCall().andReturn(new HashMap<Operation<?>, OutboundInvocationChain>()).atLeastOnce();
URI uri = URI.create("#target");
- EasyMock.expect(wire.getUri()).andReturn(uri).atLeastOnce();
+ EasyMock.expect(wire.getSourceUri()).andReturn(uri).atLeastOnce();
EasyMock.expect(wire.isOptimizable()).andReturn(false);
EasyMock.replay(wire);
WireService service = EasyMock.createMock(WireService.class);
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=507192&r1=507191&r2=507192
==============================================================================
--- 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 12:16:54 2007
@@ -213,7 +213,7 @@
wire.setServiceContract(contract);
createChains(interfaze, wire);
wire.setTargetUri(URI.create(targetName));
- wire.setUri(URI.create("component#ref"));
+ wire.setSourceUri(URI.create("component#ref"));
return wire;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentTestCase.java?view=diff&rev=507192&r1=507191&r2=507192
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentTestCase.java Tue Feb 13 12:16:54 2007
@@ -80,7 +80,7 @@
OutboundWire wire = EasyMock.createMock(OutboundWire.class);
EasyMock.expect(wire.getTargetService()).andReturn(target);
URI uri = URI.create("#ref");
- EasyMock.expect(wire.getUri()).andReturn(uri).anyTimes();
+ EasyMock.expect(wire.getSourceUri()).andReturn(uri).anyTimes();
EasyMock.replay(wire);
component.addOutboundWire(wire);
Bar bar = (Bar) component.createInstance();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentWireInvocationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentWireInvocationTestCase.java?view=diff&rev=507192&r1=507191&r2=507192
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentWireInvocationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentWireInvocationTestCase.java Tue Feb 13 12:16:54 2007
@@ -52,7 +52,7 @@
component.setScopeContainer(scope);
OutboundWire outboundWire = EasyMock.createMock(OutboundWire.class);
URI uri = URI.create("#setTarget");
- EasyMock.expect(outboundWire.getUri()).andReturn(uri).atLeastOnce();
+ EasyMock.expect(outboundWire.getSourceUri()).andReturn(uri).atLeastOnce();
EasyMock.expect(outboundWire.getTargetService()).andReturn(target);
EasyMock.replay(outboundWire);
component.addOutboundWire(outboundWire);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java?view=diff&rev=507192&r1=507191&r2=507192
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java Tue Feb 13 12:16:54 2007
@@ -203,7 +203,7 @@
InboundWire wire = new InboundWireImpl();
ServiceContract<?> contract = REGISTRY.introspect(interfaze);
wire.setServiceContract(contract);
- wire.setUri(URI.create("#" + serviceName));
+ wire.setSourceUri(URI.create("#" + serviceName));
wire.addInvocationChains(createInboundChains(interfaze, interceptor));
return wire;
}
@@ -217,7 +217,7 @@
throws InvalidServiceContractException {
OutboundWire wire = new OutboundWireImpl();
- wire.setUri(URI.create("#" + refName));
+ wire.setSourceUri(URI.create("#" + refName));
createOutboundChains(interfaze, interceptor, wire);
ServiceContract<?> contract = REGISTRY.introspect(interfaze);
wire.setServiceContract(contract);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/BasicReferenceInvocationHandlerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/BasicReferenceInvocationHandlerTestCase.java?view=diff&rev=507192&r1=507191&r2=507192
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/BasicReferenceInvocationHandlerTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/BasicReferenceInvocationHandlerTestCase.java Tue Feb 13 12:16:54 2007
@@ -57,7 +57,7 @@
OutboundWire wire = new OutboundWireImpl();
wire.addInvocationChain(operation, chain);
wire.setServiceContract(contract);
- wire.setUri(URI.create("#wire"));
+ wire.setSourceUri(URI.create("#wire"));
JDKOutboundInvocationHandler handler = new JDKOutboundInvocationHandler(SimpleTarget.class, wire, null);
assertEquals("foo", handler.invoke(null, echo, new String[]{"foo"}));
assertEquals(1, interceptor.getCount());
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/InboundInvocationErrorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/InboundInvocationErrorTestCase.java?view=diff&rev=507192&r1=507191&r2=507192
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/InboundInvocationErrorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/InboundInvocationErrorTestCase.java Tue Feb 13 12:16:54 2007
@@ -89,7 +89,7 @@
Map<Operation<?>, InboundInvocationChain> chains = new HashMap<Operation<?>, InboundInvocationChain>();
chains.put(operation, createChain(checkedMethod, checkedOperation));
InboundWire wire = new InboundWireImpl();
- wire.setUri(URI.create("#wire"));
+ wire.setSourceUri(URI.create("#wire"));
wire.addInvocationChains(chains);
wire.setServiceContract(new ServiceContract<TestBean>(TestBean.class) {
});
@@ -114,7 +114,7 @@
Map<Operation<?>, InboundInvocationChain> chains = new HashMap<Operation<?>, InboundInvocationChain>();
chains.put(operation, createChain(runtimeMethod, runtimeOperation));
InboundWire wire = new InboundWireImpl();
- wire.setUri(URI.create("#wire"));
+ wire.setSourceUri(URI.create("#wire"));
wire.addInvocationChains(chains);
wire.setServiceContract(new ServiceContract<TestBean>(TestBean.class) {
});
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationErrorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationErrorTestCase.java?view=diff&rev=507192&r1=507191&r2=507192
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationErrorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationErrorTestCase.java Tue Feb 13 12:16:54 2007
@@ -64,7 +64,7 @@
OutboundWire wire = new OutboundWireImpl();
ServiceContract<?> contract = registry.introspect(TestBean.class);
wire.setServiceContract(contract);
- wire.setUri(URI.create("#Wire"));
+ wire.setSourceUri(URI.create("#Wire"));
Operation operation = contract.getOperations().get("checkedException");
wire.addInvocationChain(operation, createChain(checkedMethod, operation));
JDKOutboundInvocationHandler handler = new JDKOutboundInvocationHandler(TestBean.class, wire, null);
@@ -82,7 +82,7 @@
OutboundWire wire = new OutboundWireImpl();
ServiceContract<?> contract = registry.introspect(TestBean.class);
wire.setServiceContract(contract);
- wire.setUri(URI.create("#Wire"));
+ wire.setSourceUri(URI.create("#Wire"));
Operation operation = contract.getOperations().get("runtimeException");
OutboundInvocationChain chain = createChain(runtimeMethod, operation);
wire.addInvocationChain(operation, chain);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationHandlerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationHandlerTestCase.java?view=diff&rev=507192&r1=507191&r2=507192
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationHandlerTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationHandlerTestCase.java Tue Feb 13 12:16:54 2007
@@ -52,7 +52,7 @@
public void testBasicInvoke() throws Throwable {
OutboundWire wire = new OutboundWireImpl();
- wire.setUri(URI.create("#wire"));
+ wire.setSourceUri(URI.create("#wire"));
Operation operation = contract.getOperations().get("hello");
wire.addInvocationChain(operation, createChain(operation));
wire.setServiceContract(contract);
@@ -62,7 +62,7 @@
public void testErrorInvoke() throws Throwable {
OutboundWire wire = new OutboundWireImpl();
- wire.setUri(URI.create("#wire"));
+ wire.setSourceUri(URI.create("#wire"));
Operation operation = contract.getOperations().get("hello");
wire.addInvocationChain(operation, createChain(operation));
wire.setServiceContract(contract);
@@ -82,7 +82,7 @@
source.setTargetInvoker(invoker);
OutboundWire wire = new OutboundWireImpl();
- wire.setUri(URI.create("#wire"));
+ wire.setSourceUri(URI.create("#wire"));
wire.setServiceContract(contract);
wire.addInvocationChain(operation, source);
JDKOutboundInvocationHandler handler = new JDKOutboundInvocationHandler(SimpleTarget.class, wire, null);
@@ -101,7 +101,7 @@
source.setTargetInvoker(invoker);
OutboundWire wire = new OutboundWireImpl();
- wire.setUri(URI.create("#wire"));
+ wire.setSourceUri(URI.create("#wire"));
wire.setServiceContract(contract);
wire.addInvocationChain(operation, source);
JDKOutboundInvocationHandler handler = new JDKOutboundInvocationHandler(SimpleTarget.class, wire, null);
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=507192&r1=507191&r2=507192
==============================================================================
--- 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 Tue Feb 13 12:16:54 2007
@@ -88,7 +88,7 @@
EasyMock.expect(invoker.invoke(EasyMock.isA(Message.class))).andReturn(resp);
EasyMock.replay(invoker);
InboundWire wire = wireService.createWire(definition);
- assertEquals("service#foo", wire.getUri().toString());
+ assertEquals("service#foo", wire.getSourceUri().toString());
assertEquals(1, wire.getInvocationChains().size());
assertEquals(contract, wire.getServiceContract());
InboundInvocationChain chain = wire.getInvocationChains().get(operation);
@@ -107,7 +107,7 @@
target.setReferenceName(URI.create("#refName"));
OutboundWire wire = wireService.createWire(target, definition).get(0);
- assertEquals("#refName", wire.getUri().toString());
+ assertEquals("#refName", wire.getSourceUri().toString());
assertEquals(1, wire.getInvocationChains().size());
assertEquals(contract, wire.getServiceContract());
OutboundInvocationChain chain = wire.getInvocationChains().get(operation);
@@ -188,12 +188,12 @@
InboundWire inboundWire = binding.getInboundWire();
assertEquals(1, inboundWire.getInvocationChains().size());
assertEquals(contract, inboundWire.getServiceContract());
- assertEquals(uri, inboundWire.getUri());
+ assertEquals(uri, inboundWire.getSourceUri());
OutboundWire outboundWire = binding.getOutboundWire();
assertEquals(1, outboundWire.getInvocationChains().size());
assertEquals(contract, outboundWire.getServiceContract());
- assertEquals(uri, outboundWire.getUri());
+ assertEquals(uri, outboundWire.getSourceUri());
}
public void testCreateServiceBindingWire() throws Exception {
@@ -204,11 +204,11 @@
InboundWire inboundWire = binding.getInboundWire();
assertEquals(1, inboundWire.getInvocationChains().size());
assertEquals(contract, inboundWire.getServiceContract());
- assertEquals(uri, inboundWire.getUri());
+ assertEquals(uri, inboundWire.getSourceUri());
OutboundWire outboundWire = binding.getOutboundWire();
assertEquals(1, outboundWire.getInvocationChains().size());
assertEquals(contract, outboundWire.getServiceContract());
- assertEquals(uri, outboundWire.getUri());
+ assertEquals(uri, outboundWire.getSourceUri());
assertEquals(1, outboundWire.getTargetCallbackInvocationChains().size());
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKCallbackInvocationHandlerSerializationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKCallbackInvocationHandlerSerializationTestCase.java?view=diff&rev=507192&r1=507191&r2=507192
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKCallbackInvocationHandlerSerializationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKCallbackInvocationHandlerSerializationTestCase.java Tue Feb 13 12:16:54 2007
@@ -40,7 +40,7 @@
super.setUp();
wire = EasyMock.createMock(InboundWire.class);
URI uri = URI.create("#foo");
- EasyMock.expect(wire.getUri()).andReturn(uri).atLeastOnce();
+ EasyMock.expect(wire.getSourceUri()).andReturn(uri).atLeastOnce();
EasyMock.replay(wire);
AtomicComponent component = EasyMock.createMock(AtomicComponent.class);
EasyMock.expect(component.getInboundWire(EasyMock.eq("foo"))).andReturn(wire);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKCallbackInvocationHandlerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKCallbackInvocationHandlerTestCase.java?view=diff&rev=507192&r1=507191&r2=507192
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKCallbackInvocationHandlerTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKCallbackInvocationHandlerTestCase.java Tue Feb 13 12:16:54 2007
@@ -34,7 +34,7 @@
public void testToString() {
InboundWireImpl wire = new InboundWireImpl();
- wire.setUri(URI.create("#wire"));
+ wire.setSourceUri(URI.create("#wire"));
wire.setServiceContract(new JavaServiceContract(Foo.class));
JDKCallbackInvocationHandler handler = new JDKCallbackInvocationHandler(wire, new WorkContextImpl());
Foo foo = (Foo) Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{Foo.class}, handler);
@@ -44,7 +44,7 @@
public void testHashCode() {
InboundWireImpl wire = new InboundWireImpl();
wire.setServiceContract(new JavaServiceContract(Foo.class));
- wire.setUri(URI.create("#wire"));
+ wire.setSourceUri(URI.create("#wire"));
JDKCallbackInvocationHandler handler = new JDKCallbackInvocationHandler(wire, new WorkContextImpl());
Foo foo = (Foo) Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{Foo.class}, handler);
assertNotNull(foo.hashCode());
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInboundInvocationHandlerSerializationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInboundInvocationHandlerSerializationTestCase.java?view=diff&rev=507192&r1=507191&r2=507192
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInboundInvocationHandlerSerializationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInboundInvocationHandlerSerializationTestCase.java Tue Feb 13 12:16:54 2007
@@ -76,7 +76,7 @@
map.put(operation, createChain(operation));
URI uri = URI.create("component#foo");
- EasyMock.expect(wire.getUri()).andReturn(uri).atLeastOnce();
+ EasyMock.expect(wire.getSourceUri()).andReturn(uri).atLeastOnce();
EasyMock.expect(wire.getInvocationChains()).andReturn(map).times(2);
EasyMock.replay(wire);
AtomicComponent component = EasyMock.createMock(AtomicComponent.class);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInboundInvocationHandlerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInboundInvocationHandlerTestCase.java?view=diff&rev=507192&r1=507191&r2=507192
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInboundInvocationHandlerTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInboundInvocationHandlerTestCase.java Tue Feb 13 12:16:54 2007
@@ -110,7 +110,7 @@
InboundWireImpl wire = new InboundWireImpl();
wire.setServiceContract(new ServiceContract<Foo>(Foo.class) {
});
- wire.setUri(URI.create("foo#bar"));
+ wire.setSourceUri(URI.create("foo#bar"));
JDKInboundInvocationHandler handler = new JDKInboundInvocationHandler(SimpleTarget.class, wire, workContext);
Foo foo = (Foo) Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{Foo.class}, handler);
assertNotNull(foo.toString());
@@ -122,7 +122,7 @@
InboundWireImpl wire = new InboundWireImpl();
wire.setServiceContract(new ServiceContract<Foo>(Foo.class) {
});
- wire.setUri(URI.create("foo#bar"));
+ wire.setSourceUri(URI.create("foo#bar"));
JDKInboundInvocationHandler handler = new JDKInboundInvocationHandler(SimpleTarget.class, wire, workContext);
Foo foo = (Foo) Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{Foo.class}, handler);
assertNotNull(foo.hashCode());
@@ -155,7 +155,7 @@
wire.addInvocationChains(chains);
wire.setServiceContract(new ServiceContract<SimpleTarget>(SimpleTarget.class) {
});
- wire.setUri(URI.create("foo#bar"));
+ wire.setSourceUri(URI.create("foo#bar"));
return wire;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerProxyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerProxyTestCase.java?view=diff&rev=507192&r1=507191&r2=507192
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerProxyTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerProxyTestCase.java Tue Feb 13 12:16:54 2007
@@ -66,7 +66,7 @@
chain.setTargetInvoker(targetInvoker);
}
wire.setServiceContract(contract);
- wire.setUri(URI.create("foo#bar"));
+ wire.setSourceUri(URI.create("foo#bar"));
clientHello = Client.class.getMethod("hello");
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerSerializationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerSerializationTestCase.java?view=diff&rev=507192&r1=507191&r2=507192
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerSerializationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerSerializationTestCase.java Tue Feb 13 12:16:54 2007
@@ -93,7 +93,7 @@
map.put(operation, createChain(operation));
EasyMock.expect(wire.getServiceContract()).andReturn(contract).atLeastOnce();
URI uri = URI.create("#foo");
- EasyMock.expect(wire.getUri()).andReturn(uri).atLeastOnce();
+ EasyMock.expect(wire.getSourceUri()).andReturn(uri).atLeastOnce();
EasyMock.expect(wire.getInvocationChains()).andReturn(map).times(2);
EasyMock.replay(wire);
Map<String, List<OutboundWire>> wires = new HashMap<String, List<OutboundWire>>();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerTestCase.java?view=diff&rev=507192&r1=507191&r2=507192
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerTestCase.java Tue Feb 13 12:16:54 2007
@@ -59,7 +59,7 @@
ServiceContract contract = new JavaServiceContract(Foo.class);
contract.setInteractionScope(InteractionScope.NONCONVERSATIONAL);
wire.setServiceContract(contract);
- wire.setUri(URI.create("foo#bar"));
+ wire.setSourceUri(URI.create("foo#bar"));
JDKOutboundInvocationHandler handler = new JDKOutboundInvocationHandler(Foo.class, wire, null);
Foo foo = (Foo) Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{Foo.class}, handler);
assertNotNull(foo.toString());
@@ -70,7 +70,7 @@
ServiceContract contract = new JavaServiceContract(Foo.class);
contract.setInteractionScope(InteractionScope.NONCONVERSATIONAL);
wire.setServiceContract(contract);
- wire.setUri(URI.create("foo#bar"));
+ wire.setSourceUri(URI.create("foo#bar"));
JDKOutboundInvocationHandler handler = new JDKOutboundInvocationHandler(Foo.class, wire, null);
Foo foo = (Foo) Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{Foo.class}, handler);
assertNotNull(foo.hashCode());
@@ -99,7 +99,7 @@
outboundChains.put(op1, outboundChain);
expect(outboundWire.getInvocationChains()).andReturn(outboundChains).anyTimes();
URI uri = URI.create("fooRef");
- expect(outboundWire.getUri()).andReturn(uri).atLeastOnce();
+ expect(outboundWire.getSourceUri()).andReturn(uri).atLeastOnce();
expect(outboundWire.getServiceContract()).andReturn(outboundContract).anyTimes();
replay(outboundWire);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKProxyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKProxyTestCase.java?view=diff&rev=507192&r1=507191&r2=507192
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKProxyTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKProxyTestCase.java Tue Feb 13 12:16:54 2007
@@ -40,7 +40,7 @@
public void testCreateProxy() {
URI uri = URI.create("#service");
- EasyMock.expect(inboundWire.getUri()).andReturn(uri).atLeastOnce();
+ EasyMock.expect(inboundWire.getSourceUri()).andReturn(uri).atLeastOnce();
EasyMock.expect(inboundWire.getInvocationChains()).andReturn(chains);
EasyMock.replay(inboundWire);
TestInterface intf = wireService.createProxy(TestInterface.class, inboundWire);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org