diff options
Diffstat (limited to 'sca-java-2.x/trunk/modules/core/src/main/java')
3 files changed, 5 insertions, 41 deletions
diff --git a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java index e0b866ddb9..6f784fc255 100644 --- a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java +++ b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java @@ -46,6 +46,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 RuntimeEndpointImpl extends EndpointImpl implements RuntimeEndpoint protected InterfaceContract bindingInterfaceContract; protected InterfaceContract serviceInterfaceContract; - private String domainURI; - private String nodeURI; - /** * No-arg constructor for Java serilization */ @@ -131,8 +129,6 @@ public class RuntimeEndpointImpl extends EndpointImpl implements RuntimeEndpoint this.policySets = copy.policySets; this.uri = copy.uri; - this.nodeURI = copy.nodeURI; - this.domainURI = copy.domainURI; this.remote = copy.remote; this.unresolved = copy.unresolved; @@ -148,12 +144,6 @@ public class RuntimeEndpointImpl extends EndpointImpl implements RuntimeEndpoint 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()); } @@ -211,7 +201,7 @@ public class RuntimeEndpointImpl extends EndpointImpl implements RuntimeEndpoint for (InvocationChain chain : getInvocationChains()) { Operation op = chain.getTargetOperation(); - if (interfaceContractMapper.isCompatible(operation, op, op.getInterface().isRemotable())) { + if (interfaceContractMapper.isCompatible(operation, op, Compatibility.SUBSET)) { invocationChainMap.put(operation, chain); return chain; } @@ -583,12 +573,4 @@ public class RuntimeEndpointImpl extends EndpointImpl implements RuntimeEndpoint } } - public String getDomainURI() { - return domainURI; - } - - public String getNodeURI() { - return nodeURI; - } - } 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; - } } diff --git a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java index 33255d6573..d50554a777 100644 --- a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java +++ b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java @@ -596,7 +596,7 @@ public class EndpointReferenceBinderImpl implements EndpointReferenceBinder { } boolean match = false; - match = interfaceContractMapper.isCompatible(endpointReference.getReference().getInterfaceContract(), + match = interfaceContractMapper.isCompatibleSubset(endpointReference.getReference().getInterfaceContract(), endpoint.getComponentServiceInterfaceContract()); if (!match){ |