TUSCANY-2463 - Merging latest support for extended attributes from 1.x branch

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

2 files changed, 12 insertions, 0 deletions

diff --git a/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java b/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java
index 2c27a5c6d5..05bb50d496 100644
--- a/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java
+++ b/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java
@@ -26,6 +26,7 @@ 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;
@@ -62,6 +63,7 @@ public class BeanComponentImpl extends ChildBeanDefinition implements Component,
     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;
 
@@ -205,6 +207,10 @@ public class BeanComponentImpl extends ChildBeanDefinition implements Component,
         return extensions;
     }
 
+    public List<Extension> getAttributeExtensions() {
+        return attributeExtensions;
+    }
+    
     public boolean isUnresolved() {
         return unresolved;
     }
diff --git a/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java b/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java
index 9587a2b0ae..54818c8e8b 100644
--- a/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java
+++ b/branches/sca-java-1.3.3/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;
@@ -45,6 +46,7 @@ public class BeanBaseJavaImplementationImpl extends RootBeanDefinition implement
     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;
@@ -172,6 +174,10 @@ public class BeanBaseJavaImplementationImpl extends RootBeanDefinition implement
         return extensions;
     }
 
+    public List<Extension> getAttributeExtensions() {
+        return attributeExtensions;
+    }
+    
     public boolean isUnresolved() {
         return unresolved;
     }