diff options
| author | bdaniel <bdaniel@13f79535-47bb-0310-9956-ffa450edef68> | 2011-06-17 21:24:20 +0000 |
|---|---|---|
| committer | bdaniel <bdaniel@13f79535-47bb-0310-9956-ffa450edef68> | 2011-06-17 21:24:20 +0000 |
| commit | 46639afca6c568f624c1ca4ae6886b4ae914cc95 (patch) | |
| tree | bc7ed08414c91f28061579aadd2f732bd86363b8 /sca-java-2.x/trunk | |
| parent | f75a5166c0b4a053e2a0505b535e9c885892a401 (diff) | |
Endpoints should only inherit interaction intents
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1137036 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk')
| -rw-r--r-- | sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java b/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java index 9c4da518d7..ac893e4678 100644 --- a/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java +++ b/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java @@ -108,16 +108,16 @@ public class CompositePolicyBuilderImpl extends ComponentPolicyBuilderImpl imple // Inherit from binding - inherit(ep, null, true, ep.getBinding()); + inherit(ep, Intent.Type.interaction, true, ep.getBinding()); // Inherit from composite/component/service - inherit(ep, null, true, ep.getService(), ep.getComponent(), composite ); + inherit(ep, Intent.Type.interaction, true, ep.getService(), ep.getComponent(), composite ); if (componentService.getInterfaceContract() != null) { // Inherit from the component.service.interface // Do not check mutual exclusion here.. interfaces do not follow normal rules // of the structural hierarchy (Policy spec 4.10) - inherit(ep, null, false, componentService.getInterfaceContract().getInterface()); + inherit(ep, Intent.Type.interaction, false, componentService.getInterfaceContract().getInterface()); } // Replace profile intents with their required intents @@ -163,16 +163,16 @@ public class CompositePolicyBuilderImpl extends ComponentPolicyBuilderImpl imple for (EndpointReference epr : componentReference.getEndpointReferences()) { // Inherit from binding - inherit(epr, null, true, epr.getBinding()); + inherit(epr, Intent.Type.interaction, true, epr.getBinding()); // Inherit from composite/component/reference - inherit(epr, null, true, epr.getReference(), epr.getComponent(), composite); + inherit(epr, Intent.Type.interaction, true, epr.getReference(), epr.getComponent(), composite); // Inherit from the component.reference.interface if (componentReference.getInterfaceContract() != null) { // Do not check mutual exclusion here.. interfaces do not follow normal rules // of the structural hierarchy (Policy spec 4.10) - inherit(epr, null, true, componentReference.getInterfaceContract().getInterface()); + inherit(epr, Intent.Type.interaction, true, componentReference.getInterfaceContract().getInterface()); } // Replace profile intents with their required intents |