summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk/modules/builder/src
diff options
context:
space:
mode:
authorbdaniel <bdaniel@13f79535-47bb-0310-9956-ffa450edef68>2011-06-21 11:54:22 +0000
committerbdaniel <bdaniel@13f79535-47bb-0310-9956-ffa450edef68>2011-06-21 11:54:22 +0000
commitdcc1e7ce969d95b9053f9bf092156c430372deb0 (patch)
treeab09c44d307a7f74ab77d345ac3071a403f55868 /sca-java-2.x/trunk/modules/builder/src
parent6fecd93cd8a8452b7784fb2eee90af930f56952d (diff)
Revert change to only inherit interaction intents on interfaces. Though the implementation intents are not used at runtime, they are used for validation.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1137968 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/modules/builder/src')
-rw-r--r--sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java12
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 ac893e4678..9c4da518d7 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, Intent.Type.interaction, true, ep.getBinding());
+ inherit(ep, null, true, ep.getBinding());
// Inherit from composite/component/service
- inherit(ep, Intent.Type.interaction, true, ep.getService(), ep.getComponent(), composite );
+ inherit(ep, null, 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, Intent.Type.interaction, false, componentService.getInterfaceContract().getInterface());
+ inherit(ep, null, 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, Intent.Type.interaction, true, epr.getBinding());
+ inherit(epr, null, true, epr.getBinding());
// Inherit from composite/component/reference
- inherit(epr, Intent.Type.interaction, true, epr.getReference(), epr.getComponent(), composite);
+ inherit(epr, null, 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, Intent.Type.interaction, true, componentReference.getInterfaceContract().getInterface());
+ inherit(epr, null, true, componentReference.getInterfaceContract().getInterface());
}
// Replace profile intents with their required intents