Remove AutomaticBinding and replace it with a flag in the Contract model to indicate if a refernece or binding has one or more binding elements specified in which case it overrides the bindings from componentType or promoted contracts

Change the isCallback flag to forCallback to avoid confusion with the callback property

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

2 files changed, 2 insertions, 2 deletions

diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CompositeContext.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CompositeContext.java
index 3b8309f573..46643f643b 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CompositeContext.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CompositeContext.java
@@ -186,7 +186,7 @@ public abstract class CompositeContext {
         List<ComponentService> services = component.getServices();
         List<ComponentService> regularServices = new ArrayList<ComponentService>();
         for (ComponentService service : services) {
-            if (service.isCallback()) {
+            if (service.isForCallback()) {
                 continue;
             }
             String name = service.getName();
diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CompositeContextImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CompositeContextImpl.java
index d0810efd10..1fa976cfb7 100644
--- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CompositeContextImpl.java
+++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CompositeContextImpl.java
@@ -308,7 +308,7 @@ public class CompositeContextImpl extends CompositeContext {
         List<ComponentService> services = component.getServices();
         List<ComponentService> regularServices = new ArrayList<ComponentService>();
         for (ComponentService service : services) {
-            if (service.isCallback()) {
+            if (service.isForCallback()) {
                 continue;
             }
             String name = service.getName();