Populate intents and policySets from sca:reference and sca:service elements

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

1 files changed, 21 insertions, 3 deletions

diff --git a/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaReferenceBeanDefinitionParser.java b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaReferenceBeanDefinitionParser.java
index 6cb4978a47..ab797c1e52 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaReferenceBeanDefinitionParser.java
+++ b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaReferenceBeanDefinitionParser.java
@@ -16,6 +16,12 @@
  */
 package org.apache.tuscany.sca.implementation.spring.namespace;
 
+import static org.apache.tuscany.sca.implementation.spring.namespace.ScaNamespaceHandler.getAttribute;
+
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
 import org.apache.tuscany.sca.implementation.spring.SpringSCAReferenceElement;
 import org.apache.tuscany.sca.implementation.spring.context.SCAGenericApplicationContext;
 import org.springframework.beans.factory.config.BeanDefinition;
@@ -36,9 +42,21 @@ public class ScaReferenceBeanDefinitionParser implements BeanDefinitionParser {
         if (registry instanceof SCAGenericApplicationContext) {
             SCAGenericApplicationContext context = (SCAGenericApplicationContext)registry;
             SpringSCAReferenceElement referenceElement =
-                new SpringSCAReferenceElement(element.getAttributeNS(null, "name"),
-                                              element.getAttributeNS(null, "type"));
-            referenceElement.setDefaultBean(element.getAttributeNS(null, "default"));
+                new SpringSCAReferenceElement(getAttribute(element, "name"), getAttribute(element, "type"));
+            referenceElement.setDefaultBean(getAttribute(element, "default"));
+
+            String requires = getAttribute(element, "requires");
+            if (requires != null) {
+                List<QName> qnames = ScaNamespaceHandler.resolve(element, requires);
+                referenceElement.getIntentNames().addAll(qnames);
+            }
+
+            String policySets = getAttribute(element, "policySets");
+            if (policySets != null) {
+                List<QName> qnames = ScaNamespaceHandler.resolve(element, policySets);
+                referenceElement.getPolicySetNames().addAll(qnames);
+            }
+
             context.addSCAReferenceElement(referenceElement);
         }