You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2009/08/07 15:45:27 UTC
svn commit: r802000 - in /tuscany/branches/sca-java-1.5.1/modules/assembly:
./
src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java
Author: antelder
Date: Fri Aug 7 13:45:26 2009
New Revision: 802000
URL: http://svn.apache.org/viewvc?rev=802000&view=rev
Log:
TUSCANY-3195: merge fix from 1.x to 1.5.1 for Inherently-provided intents do not work at operation level
Modified:
tuscany/branches/sca-java-1.5.1/modules/assembly/ (props changed)
tuscany/branches/sca-java-1.5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java
Propchange: tuscany/branches/sca-java-1.5.1/modules/assembly/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Aug 7 13:45:26 2009
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/assembly:671193
+/tuscany/branches/sca-java-1.x/modules/assembly:801231
Modified: tuscany/branches/sca-java-1.5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java?rev=802000&r1=801999&r2=802000&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java (original)
+++ tuscany/branches/sca-java-1.5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java Fri Aug 7 13:45:26 2009
@@ -156,17 +156,7 @@
//remove duplicates and ...
//where qualified form of intent exists retain it and remove the qualifiable intent
filterDuplicatesAndQualifiableIntents(confOp);
-
- //exclude intents that are inherently supported by the parent
- //attachpoint-type (binding-type / implementation-type)
- if ( attachPointType != null ) {
- List<Intent> requiredIntents = new ArrayList<Intent>(confOp.getRequiredIntents());
- for ( Intent intent : requiredIntents ) {
- if ( isProvidedInherently(attachPointType, intent) ) {
- confOp.getRequiredIntents().remove(intent);
- }
- }
- }
+
}
}