You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2006/09/18 07:22:12 UTC
svn commit: r447246 - in /incubator/tuscany/java/sca/kernel:
core/src/main/java/org/apache/tuscany/core/implementation/system/wire/
core/src/main/java/org/apache/tuscany/core/wire/
core/src/main/java/org/apache/tuscany/core/wire/jdk/ spi/src/main/java/...
Author: rfeng
Date: Sun Sep 17 22:22:11 2006
New Revision: 447246
URL: http://svn.apache.org/viewvc?view=rev&rev=447246
Log:
Change the RuntimeWire to keep container (SCAObject) instead of containerName (String)
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/wire/SystemInboundWireImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/wire/SystemOutboundAutowire.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/wire/SystemOutboundWireImpl.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/jdk/JDKCallbackInvocationHandler.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/main/java/org/apache/tuscany/core/wire/jdk/JDKWireService.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/RuntimeWire.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/wire/SystemInboundWireImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/wire/SystemInboundWireImpl.java?view=diff&rev=447246&r1=447245&r2=447246
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/wire/SystemInboundWireImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/wire/SystemInboundWireImpl.java Sun Sep 17 22:22:11 2006
@@ -22,6 +22,7 @@
import java.util.Map;
import org.apache.tuscany.spi.component.Component;
+import org.apache.tuscany.spi.component.SCAObject;
import org.apache.tuscany.spi.component.TargetException;
import org.apache.tuscany.spi.idl.java.JavaServiceContract;
import org.apache.tuscany.spi.model.Operation;
@@ -40,7 +41,7 @@
private ServiceContract serviceContract;
private Component component;
private SystemOutboundWire wire;
- private String containerName;
+ private SCAObject container;
private Class<?> interfaze;
/**
@@ -136,12 +137,12 @@
this.wire = (SystemOutboundWire) wire;
}
- public String getContainerName() {
- return containerName;
+ public SCAObject getContainer() {
+ return container;
}
- public void setContainerName(String name) {
- this.containerName = name;
+ public void setContainer(SCAObject container) {
+ this.container = container;
}
public void addMapping(Object messageId, Object fromAddress) {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/wire/SystemOutboundAutowire.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/wire/SystemOutboundAutowire.java?view=diff&rev=447246&r1=447245&r2=447246
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/wire/SystemOutboundAutowire.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/wire/SystemOutboundAutowire.java Sun Sep 17 22:22:11 2006
@@ -22,6 +22,7 @@
import java.util.Map;
import org.apache.tuscany.spi.QualifiedName;
+import org.apache.tuscany.spi.component.SCAObject;
import org.apache.tuscany.spi.component.TargetException;
import org.apache.tuscany.spi.component.TargetNotFoundException;
import org.apache.tuscany.spi.idl.java.JavaServiceContract;
@@ -44,7 +45,7 @@
private ServiceContract serviceContract;
private AutowireComponent component;
private final boolean required;
- private String containerName;
+ private SCAObject container;
public SystemOutboundAutowire(String referenceName, Class<?> interfaze, AutowireComponent component,
boolean required) {
@@ -141,11 +142,11 @@
return true;
}
- public String getContainerName() {
- return containerName;
+ public SCAObject getContainer() {
+ return container;
}
- public void setContainerName(String name) {
- this.containerName = name;
+ public void setContainer(SCAObject container) {
+ this.container = container;
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/wire/SystemOutboundWireImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/wire/SystemOutboundWireImpl.java?view=diff&rev=447246&r1=447245&r2=447246
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/wire/SystemOutboundWireImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/wire/SystemOutboundWireImpl.java Sun Sep 17 22:22:11 2006
@@ -22,6 +22,7 @@
import java.util.Map;
import org.apache.tuscany.spi.QualifiedName;
+import org.apache.tuscany.spi.component.SCAObject;
import org.apache.tuscany.spi.component.TargetException;
import org.apache.tuscany.spi.idl.java.JavaServiceContract;
import org.apache.tuscany.spi.model.Operation;
@@ -40,7 +41,7 @@
private QualifiedName targetName;
private ServiceContract serviceContract;
private SystemInboundWire targetWire;
- private String containerName;
+ private SCAObject container;
private Class<?> interfaze;
public SystemOutboundWireImpl(String referenceName, QualifiedName targetName, Class<?> interfaze) {
@@ -134,12 +135,12 @@
return true;
}
- public String getContainerName() {
- return containerName;
+ public SCAObject getContainer() {
+ return container;
}
- public void setContainerName(String name) {
- this.containerName = name;
+ public void setContainer(SCAObject container) {
+ this.container = container;
}
}
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=447246&r1=447245&r2=447246
==============================================================================
--- 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 Sun Sep 17 22:22:11 2006
@@ -21,6 +21,7 @@
import java.util.HashMap;
import java.util.Map;
+import org.apache.tuscany.spi.component.SCAObject;
import org.apache.tuscany.spi.component.TargetException;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.ServiceContract;
@@ -44,7 +45,7 @@
private Map<Operation<?>, InboundInvocationChain> chains = new HashMap<Operation<?>, InboundInvocationChain>();
private Map<Object, Map<Operation<?>, OutboundInvocationChain>> callbackSourceChainMaps =
new HashMap<Object, Map<Operation<?>, OutboundInvocationChain>>();
- private String containerName;
+ private SCAObject container;
private Map<Object, Object> msgIdsToAddrs = new HashMap<Object, Object>();
public Object getTargetService() throws TargetException {
@@ -136,12 +137,12 @@
return true;
}
- public String getContainerName() {
- return containerName;
+ public SCAObject getContainer() {
+ return container;
}
- public void setContainerName(String name) {
- this.containerName = name;
+ public void setContainer(SCAObject container) {
+ this.container = container;
}
public void addMapping(Object messageId, Object fromAddress) {
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=447246&r1=447245&r2=447246
==============================================================================
--- 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 Sun Sep 17 22:22:11 2006
@@ -22,6 +22,7 @@
import java.util.Map;
import org.apache.tuscany.spi.QualifiedName;
+import org.apache.tuscany.spi.component.SCAObject;
import org.apache.tuscany.spi.component.TargetException;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.ServiceContract;
@@ -46,7 +47,7 @@
private String referenceName;
private QualifiedName targetName;
private InboundWire targetWire;
- private String containerName;
+ private SCAObject container;
public Object getTargetService() throws TargetException {
if (targetWire != null) {
@@ -159,11 +160,11 @@
return true;
}
- public String getContainerName() {
- return containerName;
+ public SCAObject getContainer() {
+ return container;
}
- public void setContainerName(String name) {
- this.containerName = name;
+ public void setContainer(SCAObject container) {
+ this.container = container;
}
}
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=447246&r1=447245&r2=447246
==============================================================================
--- 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 Sun Sep 17 22:22:11 2006
@@ -77,7 +77,7 @@
}
protected Object getFromAddress() {
- return inboundWire.getContainerName();
+ return (inboundWire.getContainer() == null) ? null : inboundWire.getContainer().getName();
}
protected Object getMessageId() {
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=447246&r1=447245&r2=447246
==============================================================================
--- 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 Sun Sep 17 22:22:11 2006
@@ -60,7 +60,7 @@
throws NoMethodForOperationException {
Map<Operation<?>, OutboundInvocationChain> invocationChains = wire.getInvocationChains();
this.chains = new HashMap<Method, ChainHolder>(invocationChains.size());
- this.fromAddress = wire.getContainerName();
+ this.fromAddress = (wire.getContainer() == null) ? null : wire.getContainer().getName();
Method[] methods = wire.getServiceContract().getInterfaceClass().getMethods();
// TODO optimize this
for (Map.Entry<Operation<?>, OutboundInvocationChain> entry : invocationChains.entrySet()) {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireService.java?view=diff&rev=447246&r1=447245&r2=447246
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireService.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireService.java Sun Sep 17 22:22:11 2006
@@ -168,7 +168,7 @@
ComponentType<?, ?, ?> componentType = implementation.getComponentType();
for (ServiceDefinition service : componentType.getServices().values()) {
InboundWire inboundWire = createWire(service);
- inboundWire.setContainerName(component.getName());
+ inboundWire.setContainer(component);
if (componentType instanceof CompositeComponentType<?, ?, ?>) {
// If this is the case, then it means that component has already been returned
// by CompositeBuilder and thus its children, in particular composite services,
@@ -179,7 +179,7 @@
if (serviceChild instanceof CompositeService) {
serviceChild.setInboundWire(inboundWire);
// Notice that now the more immediate container of the wire is the composite service
- inboundWire.setContainerName(serviceChild.getName());
+ inboundWire.setContainer(serviceChild);
}
}
component.addInboundWire(inboundWire);
@@ -189,7 +189,7 @@
Map<String, ? extends ReferenceDefinition> references = componentType.getReferences();
ReferenceDefinition mappedReference = references.get(referenceTarget.getReferenceName());
OutboundWire wire = createWire(referenceTarget, mappedReference);
- wire.setContainerName(component.getName());
+ wire.setContainer(component);
component.addOutboundWire(wire);
if (componentType instanceof CompositeComponentType<?, ?, ?>) {
// If this is the case, then it means that component has already been returned
@@ -201,7 +201,7 @@
if (reference instanceof CompositeReference) {
reference.setOutboundWire(wire);
// Notice that now the more immediate container of the wire is the composite reference
- wire.setContainerName(reference.getName());
+ wire.setContainer(reference);
}
}
}
@@ -210,7 +210,7 @@
public <T> void createWires(Reference reference, ServiceContract<?> contract) {
InboundWire wire = new InboundWireImpl();
wire.setServiceContract(contract);
- wire.setContainerName(reference.getName());
+ wire.setContainer(reference);
for (Operation<?> operation : contract.getOperations().values()) {
InboundInvocationChain chain = createInboundChain(operation);
chain.addInterceptor(new InvokerInterceptor());
@@ -287,10 +287,10 @@
InboundWire inboundWire = new InboundWireImpl();
OutboundWire outboundWire = new OutboundWireImpl();
inboundWire.setServiceContract(contract);
- inboundWire.setContainerName(service.getName());
+ inboundWire.setContainer(service);
outboundWire.setServiceContract(contract);
outboundWire.setTargetName(new QualifiedName(targetName));
- outboundWire.setContainerName(service.getName());
+ outboundWire.setContainer(service);
for (Operation<?> operation : contract.getOperations().values()) {
InboundInvocationChain inboundChain = createInboundChain(operation);
inboundWire.addInvocationChain(operation, inboundChain);
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/RuntimeWire.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/RuntimeWire.java?view=diff&rev=447246&r1=447245&r2=447246
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/RuntimeWire.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/RuntimeWire.java Sun Sep 17 22:22:11 2006
@@ -20,6 +20,7 @@
import org.apache.tuscany.spi.component.TargetException;
import org.apache.tuscany.spi.model.ServiceContract;
+import org.apache.tuscany.spi.component.SCAObject;
/**
* The base wire type used to connect references and services
@@ -58,12 +59,12 @@
boolean isOptimizable();
/**
- * Returns the name of the SCAObject that contains this wire
+ * Returns the SCAObject that contains this wire
*/
- String getContainerName();
+ SCAObject getContainer();
/**
* Sets the name of the SCAObject that contains this wire
*/
- void setContainerName(String name);
+ void setContainer(SCAObject container);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org