diff options
author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2010-02-19 23:38:00 +0000 |
---|---|---|
committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2010-02-19 23:38:00 +0000 |
commit | 45608ba818d35c57fdd0b00a4b1904a680fbf55f (patch) | |
tree | a493afce1740cd63b1cabb8fb2e025adf0f1f353 /sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java | |
parent | fbc0426ecc97bb64a0db5b2565395a800679ff0b (diff) |
Align the interfaceContractMapper to the spec
Remove the conversation related legacy code
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@912034 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r-- | sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java index e2cd2960ba..6dc8e63c17 100644 --- a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java +++ b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java @@ -47,6 +47,7 @@ import org.apache.tuscany.sca.core.invocation.NonBlockingInterceptor; import org.apache.tuscany.sca.core.invocation.RuntimeInvoker; import org.apache.tuscany.sca.core.invocation.impl.InvocationChainImpl; import org.apache.tuscany.sca.core.invocation.impl.PhaseManager; +import org.apache.tuscany.sca.interfacedef.Compatibility; import org.apache.tuscany.sca.interfacedef.InterfaceContract; import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper; import org.apache.tuscany.sca.interfacedef.Operation; @@ -99,9 +100,6 @@ public class RuntimeEndpointReferenceImpl extends EndpointReferenceImpl implemen protected InterfaceContract bindingInterfaceContract; protected InterfaceContract referenceInterfaceContract; - private String domainURI; - private String nodeURI; - private String xml; /** @@ -133,8 +131,6 @@ public class RuntimeEndpointReferenceImpl extends EndpointReferenceImpl implemen this.policySets = copy.policySets; this.uri = copy.uri; - this.domainURI = copy.domainURI; - this.nodeURI = copy.nodeURI; this.remote = copy.remote; this.unresolved = copy.unresolved; this.status = copy.status; @@ -151,12 +147,6 @@ public class RuntimeEndpointReferenceImpl extends EndpointReferenceImpl implemen public void bind(CompositeContext compositeContext) { this.compositeContext = compositeContext; - if (nodeURI != null) { - this.nodeURI = compositeContext.getNodeURI(); - } - if (domainURI != null) { - this.domainURI = compositeContext.getDomainURI(); - } bind(compositeContext.getExtensionPointRegistry(), compositeContext.getEndpointRegistry()); } @@ -201,7 +191,7 @@ public class RuntimeEndpointReferenceImpl extends EndpointReferenceImpl implemen if (cached == null) { for (InvocationChain chain : getInvocationChains()) { Operation op = chain.getSourceOperation(); - if (interfaceContractMapper.isCompatible(operation, op, op.getInterface().isRemotable())) { + if (interfaceContractMapper.isCompatible(operation, op, Compatibility.SUBSET)) { invocationChainMap.put(operation, chain); return chain; } @@ -541,13 +531,5 @@ public class RuntimeEndpointReferenceImpl extends EndpointReferenceImpl implemen } } } - - public String getDomainURI() { - return domainURI; - } - - public String getNodeURI() { - return nodeURI; - } } |