Fixed the start method of the Web 2.0 binding providers where we were overwriting the model binding URI with the URI calculated at runtime, and removed the FIXME and TODO comments that were used to flag that issue.

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

2 files changed, 2 insertions, 46 deletions

diff --git a/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingImpl.java b/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingImpl.java
index 6a46ff6e5b..76551bc412 100644
--- a/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingImpl.java
+++ b/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingImpl.java
@@ -22,10 +22,6 @@ package org.apache.tuscany.sca.binding.feed.impl;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.OptimizableBinding;
 import org.apache.tuscany.sca.binding.feed.AtomBinding;
 import org.apache.tuscany.sca.policy.Intent;
 import org.apache.tuscany.sca.policy.IntentAttachPointType;
@@ -37,7 +33,7 @@ import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
  *
  * @version $Rev$ $Date$
  */
-class AtomBindingImpl implements AtomBinding, OptimizableBinding, PolicySetAttachPoint {
+class AtomBindingImpl implements AtomBinding, PolicySetAttachPoint {
 
     private String name;
     private String uri;
@@ -91,47 +87,10 @@ class AtomBindingImpl implements AtomBinding, OptimizableBinding, PolicySetAttac
     public void setType(IntentAttachPointType intentAttachPointType) {
         this.intentAttachPointType = intentAttachPointType;
     }
-
-    //FIXME Temporary to get access to the target binding information
-    // To be removed when the distributed domain supports wiring of other
-    // bindings than the SCA binding
-    private Binding targetBinding; 
-    private Component targetComponent; 
-    private ComponentService targetComponentService; 
     
+    @Override
     public Object clone() throws CloneNotSupportedException {
         return super.clone();
     }
-    
-    public Binding getTargetBinding() {
-        return targetBinding;
-    }
-    
-    public void setTargetBinding(Binding binding) {
-        this.targetBinding = binding;
-    }
-    
-    public Component getTargetComponent() {
-        return targetComponent;
-    }
-    
-    public void setTargetComponent(Component component) {
-        this.targetComponent = component;
-    }
-    
-    public ComponentService getTargetComponentService() {
-        return targetComponentService;
-    }
-    
-    public void setTargetComponentService(ComponentService service) {
-        this.targetComponentService = service; 
-    }
-
-    public void setPolicySets(List<PolicySet> policySets) {
-        this.policySets = policySets; 
-    }
 
-    public void setRequiredIntents(List<Intent> intents) {
-        this.requiredIntents = intents;
-    }
 }
diff --git a/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomServiceBindingProvider.java b/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomServiceBindingProvider.java
index bffa5dec0e..23c36f51e3 100644
--- a/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomServiceBindingProvider.java
+++ b/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomServiceBindingProvider.java
@@ -79,9 +79,6 @@ class AtomServiceBindingProvider implements ServiceBindingProvider {
             servletMapping += "*";
         }
         servletHost.addServletMapping(servletMapping, servlet);
-        
-        // Save the actual binding URI in the binding
-        binding.setURI(servletHost.getURLMapping(binding.getURI()).toString());
     }
 
     public void stop() {