Author: bdaniel
Date: Tue Jun 21 11:54:22 2011
New Revision: 1137968
URL: http://svn.apache.org/viewvc?rev=1137968&view=rev
Log:
Revert change to only inherit interaction intents on interfaces. Though the
implementation intents are not used at runtime, they are used for validation.
Modified:
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java
Modified:
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java?rev=1137968&r1=1137967&r2=1137968&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java
Tue Jun 21 11:54:22 2011
@@ -108,16 +108,16 @@ public class CompositePolicyBuilderImpl
// 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
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
