svn commit: r966706 - /tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java

[bdaniel]

Author: bdaniel
Date: Thu Jul 22 15:23:56 2010
New Revision: 966706

URL: http://svn.apache.org/viewvc?rev=966706&view=rev
Log:
intents and policySets specified on implementation.composite elements were 
being lost

Modified:
    
tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java

Modified: 
tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java?rev=966706&r1=966705&r2=966706&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
 Thu Jul 22 15:23:56 2010
@@ -1098,8 +1098,17 @@ public class CompositeProcessor extends 
                     //now resolve the implementation so that even if there is 
a shared instance
                     //for this that is resolved, the specified intents and 
policysets are safe in the
                     //component and not lost
+                       List<Intent> intents = 
implementation.getRequiredIntents();
+                       List<PolicySet> policySets = 
implementation.getPolicySets();
+                       
+                       
                     implementation = resolveImplementation(implementation, 
resolver, context);
 
+                    implementation.getPolicySets().clear();
+                    implementation.getPolicySets().addAll(policySets);
+                    implementation.getRequiredIntents().clear();
+                    implementation.getRequiredIntents().addAll(intents);
+                    
                     component.setImplementation(implementation);
                 }