Fix motivated by ASM-5023. Update code to reflect the OASIS treatment of promoted references. Endpoint references are now copied down to the promoted component reference and the multiplicity validation is performed there. The change works now but the code needs tidying. I've left some things commented out that I'll now remove.

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

2 files changed, 0 insertions, 26 deletions

diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
index 702826d43e..a20ad4eca6 100644
--- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
+++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
@@ -46,23 +46,6 @@ public interface Reference extends AbstractReference, Contract {
      */
     void setWiredByImpl(boolean wiredByImpl);
 
-    /**
-     * Returns a boolean value, "false" by default, which indicates whether
-     * the configuration of this reference is a promotion override for
-     * another more deeply nested reference.
-     * 
-     * @return true if the reference is a promotion override
-     */
-    boolean isPromotionOverride();
-
-    /**
-     * Sets a boolean value, "false" by default, which indicates whether
-     * the configuration of this reference is a promotion override for
-     * another more deeply nested reference.
-     * 
-     * @param promotionOverride whether the reference is a promotion override
-     */
-    void setPromotionOverride(boolean promotionOverride);
 
     /**
      * Returns the targets of this reference.
diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
index af4b3559c5..69d76f238d 100644
--- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
+++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
@@ -40,7 +40,6 @@ public class ReferenceImpl extends AbstractReferenceImpl implements Reference, C
     private boolean wiredByImpl;
     private List<ComponentService> targets = new ArrayList<ComponentService>();
     private Callback callback;
-    private boolean promotionOverride;
     private boolean overridingBindings;
     private List<EndpointReference> endpointReferences = new ArrayList<EndpointReference>();
 
@@ -99,14 +98,6 @@ public class ReferenceImpl extends AbstractReferenceImpl implements Reference, C
         this.wiredByImpl = wiredByImpl;
     }
 
-    public boolean isPromotionOverride() {
-        return promotionOverride;
-    }
-
-    public void setPromotionOverride(boolean promotionOverride) {
-        this.promotionOverride = promotionOverride;
-    }
-
     public List<ComponentService> getTargets() {
         return targets;
     }