TUSCANY-2463 - Storing extended attributes in a second list, wrapped into a extension class that stores the attribute QName, it's value

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

2 files changed, 14 insertions, 2 deletions

diff --git a/branches/sca-java-1.x/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java b/branches/sca-java-1.x/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java
index f2c517b092..9d874262e9 100644
--- a/branches/sca-java-1.x/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java
+++ b/branches/sca-java-1.x/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java
@@ -26,12 +26,13 @@ import org.apache.tuscany.sca.assembly.ComponentProperty;
 import org.apache.tuscany.sca.assembly.ComponentReference;
 import org.apache.tuscany.sca.assembly.ComponentService;
 import org.apache.tuscany.sca.assembly.ConstrainingType;
+import org.apache.tuscany.sca.assembly.Extension;
 import org.apache.tuscany.sca.assembly.Implementation;
 import org.apache.tuscany.sca.policy.Intent;
 import org.apache.tuscany.sca.policy.IntentAttachPointType;
 import org.apache.tuscany.sca.policy.PolicySet;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.GenericBeanDefinition;
 
 /**
@@ -63,6 +64,7 @@ public class BeanComponentImpl extends GenericBeanDefinition implements Componen
     private List<Intent> requiredIntents = new ArrayList<Intent>();
     private List<PolicySet> policySets = new ArrayList<PolicySet>();
     private List<Object> extensions = new ArrayList<Object>();
+    private List<Extension> attributeExtensions = new ArrayList<Extension>();
     private boolean unresolved = false;
     private BeanDefinitionRegistry beanRegistry;
 
@@ -210,6 +212,10 @@ public class BeanComponentImpl extends GenericBeanDefinition implements Componen
         return extensions;
     }
 
+    public List<Extension> getAttributeExtensions() {
+        return attributeExtensions;
+    }
+
     public boolean isUnresolved() {
         return unresolved;
     }
diff --git a/branches/sca-java-1.x/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java b/branches/sca-java-1.x/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java
index 49abfb4162..493ffe3798 100644
--- a/branches/sca-java-1.x/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java
+++ b/branches/sca-java-1.x/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java
@@ -23,6 +23,7 @@ import java.util.List;
 
 import org.apache.tuscany.sca.assembly.ConfiguredOperation;
 import org.apache.tuscany.sca.assembly.ConstrainingType;
+import org.apache.tuscany.sca.assembly.Extension;
 import org.apache.tuscany.sca.assembly.Property;
 import org.apache.tuscany.sca.assembly.Reference;
 import org.apache.tuscany.sca.assembly.Service;
@@ -30,8 +31,8 @@ import org.apache.tuscany.sca.implementation.java.BaseJavaImplementation;
 import org.apache.tuscany.sca.policy.Intent;
 import org.apache.tuscany.sca.policy.IntentAttachPointType;
 import org.apache.tuscany.sca.policy.PolicySet;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.GenericBeanDefinition;
 
 /**
@@ -46,6 +47,7 @@ public class BeanBaseJavaImplementationImpl extends GenericBeanDefinition implem
     private List<Service> services = new ArrayList<Service>();
     private ConstrainingType constrainingType;
     private List<Object> extensions = new ArrayList<Object>();
+    private List<Extension> attributeExtensions = new ArrayList<Extension>();
     private boolean unresolved;
     private BeanDefinitionRegistry beanRegistry;
     private String uri;
@@ -177,6 +179,10 @@ public class BeanBaseJavaImplementationImpl extends GenericBeanDefinition implem
         return extensions;
     }
 
+    public List<Extension> getAttributeExtensions() {
+        return attributeExtensions;
+    }
+
     public boolean isUnresolved() {
         return unresolved;
     }