intents and policySets specified on implementation.composite elements were being lost

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@966706 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 9 insertions, 0 deletions

diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java b/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
index 8922c232b0..c2deacbb35 100644
--- a/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
+++ b/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
@@ -1098,8 +1098,17 @@ public class CompositeProcessor extends BaseAssemblyProcessor implements StAXArt
                     //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);
                 }