Start to split policy builder into two phases: implementation hierarchy and structural hierarchy

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

3 files changed, 13 insertions, 1 deletions

diff --git a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BuilderExtensionPoint.java b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BuilderExtensionPoint.java
index ae526b92a1..cc4156e42e 100644
--- a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BuilderExtensionPoint.java
+++ b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BuilderExtensionPoint.java
@@ -19,6 +19,8 @@
 
 package org.apache.tuscany.sca.assembly.builder;
 
+import java.util.Collection;
+
 import javax.xml.namespace.QName;
 
 import org.apache.tuscany.sca.assembly.Binding;
@@ -115,4 +117,10 @@ public interface BuilderExtensionPoint {
      * @param builder
      */
     <P> void removePolicyBuilder(PolicyBuilder<P> builder);
+    
+    /**
+     * Get a collection of policy builders
+     * @return
+     */
+    public Collection<PolicyBuilder> getPolicyBuilders();
 }
diff --git a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultBuilderExtensionPoint.java b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultBuilderExtensionPoint.java
index 2d0a4b91ee..ac2bc262ff 100644
--- a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultBuilderExtensionPoint.java
+++ b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultBuilderExtensionPoint.java
@@ -186,6 +186,10 @@ public class DefaultBuilderExtensionPoint implements BuilderExtensionPoint, Life
         loadBuilders();
         return (PolicyBuilder<B>)policyBuilders.get(policyType);
     }
+    
+    public Collection<PolicyBuilder> getPolicyBuilders() {
+        return policyBuilders.values();
+    }
 
     public <B> void removePolicyBuilder(PolicyBuilder<B> builder) {
         policyBuilders.remove(builder.getPolicyType());
diff --git a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensionImpl.java b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensionImpl.java
index b5018c4d43..e69eb4a771 100644
--- a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensionImpl.java
+++ b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensionImpl.java
@@ -25,7 +25,7 @@ import org.apache.tuscany.sca.assembly.Extension;
 public class ExtensionImpl implements Extension {
     private QName qName;
     private Object value;
-    boolean isAttribute = false;
+    private boolean isAttribute = false;
 
     public ExtensionImpl() {
     }