svn commit: r979479 - in /tuscany: otest/newlayout/tuscany-policy-test-runner/src/test/resources/tuscany-oasis-sca-tests-errors.properties sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentPolicyBuilderImpl.java

[bdaniel]

Author: bdaniel
Date: Mon Jul 26 22:44:10 2010
New Revision: 979479

URL: http://svn.apache.org/viewvc?rev=979479&view=rev
Log:
Fix bug in removeConstrainedIntents

Modified:
    
tuscany/otest/newlayout/tuscany-policy-test-runner/src/test/resources/tuscany-oasis-sca-tests-errors.properties
    
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentPolicyBuilderImpl.java

Modified: 
tuscany/otest/newlayout/tuscany-policy-test-runner/src/test/resources/tuscany-oasis-sca-tests-errors.properties
URL: 
http://svn.apache.org/viewvc/tuscany/otest/newlayout/tuscany-policy-test-runner/src/test/resources/tuscany-oasis-sca-tests-errors.properties?rev=979479&r1=979478&r2=979479&view=diff
==============================================================================
--- 
tuscany/otest/newlayout/tuscany-policy-test-runner/src/test/resources/tuscany-oasis-sca-tests-errors.properties
 (original)
+++ 
tuscany/otest/newlayout/tuscany-policy-test-runner/src/test/resources/tuscany-oasis-sca-tests-errors.properties
 Mon Jul 26 22:44:10 2010
@@ -31,7 +31,7 @@ POL_3017=org.oasisopen.sca.ServiceRuntim
 POL_3018=org.oasisopen.sca.ServiceRuntimeException: [Contribution: POL_3018, 
Artifact: META-INF/definitions.xml, Definitions: 
jar:file:***/POL_3018.zip!/META-INF/definitions.xml] - [POL30021] Intent Map 
provides for Intent not specified as provided by parent PolicySet - 
BadIntentMapPolicySet
 POL_3020=TUSCANY-3371
 POL_4001=org.oasisopen.sca.ServiceRuntimeException: [Composite: 
{http://docs.oasis-open.org/ns/opencsa/sca/200912}, Component: TestClient, 
Service: TestInvocation] - The intent 
{http://docs.oasis-open.org/ns/opencsa/scatests/200903}testIntentExt2 
associated with policy subject ***Endpoint:  URI = 
TestClient#service-binding(TestInvocation/TestInvocation) has no matching 
policy set
-POL_4004=org.oasisopen.sca.ServiceRuntimeException: [Composite: 
{http://docs.oasis-open.org/ns/opencsa/sca/200912}, Component: 
TEST_POL_4004Component1, Composite: 
{http://docs.oasis-open.org/ns/opencsa/scatests/200903}TestCompositeImplIntent, 
Component: TestComposite0Component1] - The intent 
{http://docs.oasis-open.org/ns/opencsa/scatests/200903}testImplIntent.qual2 
associated with policy subject Composite 
(name={http://docs.oasis-open.org/ns/opencsa/scatests/200903}TestComposite0) 
has no matching policy set
+POL_4004=org.oasisopen.sca.ServiceRuntimeException: [Composite: 
{http://docs.oasis-open.org/ns/opencsa/sca/200912}, Component: 
TEST_POL_4004Component1, Composite: 
{http://docs.oasis-open.org/ns/opencsa/scatests/200903}TestCompositeImplIntent, 
Component: TestComposite0Component1, Composite: 
{http://docs.oasis-open.org/ns/opencsa/scatests/200903}TestComposite0, 
Component: TestComposite0Component1] - The intent 
{http://docs.oasis-open.org/ns/opencsa/scatests/200903}testImplIntent.qual2 
associated with policy subject 
{http://docs.oasis-open.org/ns/opencsa/sca/200912}implementation.java 
(class=org.oasisopen.sca.test.service1Impl) has no matching policy set
 POL_4005=org.oasisopen.sca.ServiceRuntimeException: [Composite: 
{http://docs.oasis-open.org/ns/opencsa/sca/200912}, Component: 
TEST_POL_4005Component1, Service: Service1] - The intent 
{http://docs.oasis-open.org/ns/opencsa/scatests/200903}testImplIntent.qual2 
associated with policy subject ***Endpoint:  URI = 
TEST_POL_4005Component1#service-binding(Service1/Service1) has no matching 
policy set
 POL_4006=org.oasisopen.sca.ServiceRuntimeException: [Composite: 
{http://docs.oasis-open.org/ns/opencsa/sca/200912}, Component: TestClient, 
Service: TestInvocation] - The intent 
{http://docs.oasis-open.org/ns/opencsa/scatests/200903}HighIntent associated 
with policy subject ***Endpoint:  URI = 
TestClient#service-binding(TestInvocation/TestInvocation) has no matching 
policy set
 POL_4009=org.oasisopen.sca.ServiceRuntimeException: [Composite: 
{http://docs.oasis-open.org/ns/opencsa/sca/200912}, Component: 
TEST_POL_4009Component1, Composite: 
{http://docs.oasis-open.org/ns/opencsa/scatests/200903}TestCompositeImplPolicySet,
 Component: TestComposite0Component1, Composite: 
{http://docs.oasis-open.org/ns/opencsa/scatests/200903}TestComposite0, 
Component: TestComposite0Component1] - The intent 
{http://docs.oasis-open.org/ns/opencsa/scatests/200903}testImplIntent2 
associated with policy subject 
{http://docs.oasis-open.org/ns/opencsa/sca/200912}implementation.java 
(class=org.oasisopen.sca.test.service1Impl) has no matching policy set

Modified: 
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentPolicyBuilderImpl.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentPolicyBuilderImpl.java?rev=979479&r1=979478&r2=979479&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentPolicyBuilderImpl.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentPolicyBuilderImpl.java
 Mon Jul 26 22:44:10 2010
@@ -475,7 +475,7 @@ public class ComponentPolicyBuilderImpl 
                
                 if (constrainedTypes.size() > 0){
                     boolean constraintFound = false;
-                    for (ExtensionType constrainedType : 
i.getConstrainedTypes()){
+                    for (ExtensionType constrainedType : constrainedTypes){
                         if 
(constrainedType.getType().equals(extensionType.getType()) ||
                             
constrainedType.getType().equals(extensionType.getBaseType())){
                             constraintFound = true;