diff options
author | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2009-06-19 15:54:54 +0000 |
---|---|---|
committer | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2009-06-19 15:54:54 +0000 |
commit | c1feaec0db0ef74488bda2d64513e1b7b2e8ab34 (patch) | |
tree | f94952adaaff9cadb223e37336708397e26d6aef /java/sca/modules/assembly/src | |
parent | 00c1157e3e8b3202c91b32feb13cd4ba92b5811a (diff) |
TUSCANY-3092 - bring up remote version of binding.sca and include it in the build
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@786563 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca/modules/assembly/src')
2 files changed, 17 insertions, 5 deletions
diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DistributedSCABinding.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DistributedSCABinding.java index f8adb980be..8fb4215e36 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DistributedSCABinding.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DistributedSCABinding.java @@ -24,8 +24,8 @@ import org.apache.tuscany.sca.assembly.SCABinding; /**
* Represents an SCA binding used in the distributed runtime.
- * At the moment just provides us with a sensibly named type
- * against which the distributed sca binding providers can be registered
+ * It provides us with a sensibly named type against which
+ * distributed sca binding providers can be registered
*
* @version $Rev: 556322 $ $Date: 2007-07-14 19:53:15 +0100 (Sat, 14 Jul 2007) $
*/
diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceEndpointReferenceBuilderImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceEndpointReferenceBuilderImpl.java index 5439ca538f..34c169bf40 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceEndpointReferenceBuilderImpl.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceEndpointReferenceBuilderImpl.java @@ -38,6 +38,7 @@ import org.apache.tuscany.sca.assembly.Multiplicity; import org.apache.tuscany.sca.assembly.SCABinding; import org.apache.tuscany.sca.assembly.builder.CompositeBuilder; import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException; +import org.apache.tuscany.sca.assembly.impl.SCABindingImpl; import org.apache.tuscany.sca.definitions.Definitions; import org.apache.tuscany.sca.interfacedef.InterfaceContract; import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper; @@ -237,7 +238,15 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI // signify that this reference is pointing at some unwired endpoint EndpointReference endpointRef = createEndpointRef( component, reference, binding, null, false ); - endpointRef.setTargetEndpoint(createEndpoint(false)); + if (binding instanceof SCABinding){ + // Assume that the system need to resolve this binding later as + // it's the SCA binding + endpointRef.setTargetEndpoint(createEndpoint(true)); + } else { + // The user has configured a binding so assume they know what + // they are doing and mark in as already resolved. + endpointRef.setTargetEndpoint(createEndpoint(false)); + } endpointRef.setIsRemoteReference(true); reference.getEndpointReferences().add(endpointRef); continue; @@ -278,9 +287,12 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI } } else { // create endpoint reference for manually configured bindings with resolved endpoint - // to signify that this reference is pointing at some unwired endpoint + // to signify that this reference is pointing at some unwired endpoint. The endpoint + // is given the configured binding as a representation of the endpoint configuration. EndpointReference endpointRef = createEndpointRef( component, reference, binding, null, false ); - endpointRef.setTargetEndpoint(createEndpoint( false )); + Endpoint endpoint = createEndpoint( false ); + endpoint.setBinding(binding); + endpointRef.setTargetEndpoint(endpoint); endpointRef.setIsRemoteReference(true); reference.getEndpointReferences().add(endpointRef); } // end if |