Tidy up the binding interface to include the wire format and operation selector operations. They are in the OASIS specs now so it doesn't seem sensible to maintain the separate (experimental) interface that previously housed them. We want to encourage binding writers to provide wire formats and operation selectors as appropriate

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

4 files changed, 88 insertions, 42 deletions

diff --git a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
index 2a5b344b90..d933b68f45 100644
--- a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
+++ b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
@@ -68,4 +68,46 @@ public interface Binding extends Base, Cloneable {
      * @return the binding type QName
      */
     QName getType();
+    
+    /**
+     * Returns the request wire format
+     * 
+     * @return the request wire format or null is none is specified
+     */
+    WireFormat getRequestWireFormat();
+
+    /**
+     * Sets the request wire format 
+     * 
+     * @param wireFormat the request wire format
+     */
+    void setRequestWireFormat(WireFormat wireFormat);
+
+    /**
+     * Returns the response wire format 
+     * 
+     * @return the response wire format or null is none is specified
+     */
+    WireFormat getResponseWireFormat();
+
+    /**
+     * Sets the response wire format
+     * 
+     * @param wireFormat the response wire format
+     */
+    void setResponseWireFormat(WireFormat wireFormat);
+
+    /**
+     * Returns the operation selector
+     * 
+     * @return the operation selector or null is none is specified
+     */
+    OperationSelector getOperationSelector();
+
+    /**
+     * Sets the operation selector
+     * 
+     * @param operationSelector the operation selector
+     */
+    void setOperationSelector(OperationSelector operationSelector);    
 }
diff --git a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/BindingRRB.java b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/BindingRRB.java
deleted file mode 100644
index 35e5f148ba..0000000000
--- a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/BindingRRB.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.sca.assembly;
-
-/**
- * TODO RRB experiment. 
- * Represents a binding implemented using Request/Response binding chains
- * Used to test the RRB idea hence no integrated into the Binding interface, yet
- * 
- * @version $Rev$ $Date$
- */
-public interface BindingRRB extends Binding {
-
-    WireFormat getRequestWireFormat();
-
-    void setRequestWireFormat(WireFormat wireFormat);
-
-    WireFormat getResponseWireFormat();
-
-    void setResponseWireFormat(WireFormat wireFormat);
-
-    OperationSelector getOperationSelector();
-
-    void setOperationSelector(OperationSelector operationSelector);
-
-}
diff --git a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/DistributedSCABindingImpl.java b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/DistributedSCABindingImpl.java
index 99d68a11bc..8524eb6fc7 100644
--- a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/DistributedSCABindingImpl.java
+++ b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/DistributedSCABindingImpl.java
@@ -21,7 +21,9 @@ package org.apache.tuscany.sca.assembly.impl;
 import javax.xml.namespace.QName;
 
 import org.apache.tuscany.sca.assembly.DistributedSCABinding;
+import org.apache.tuscany.sca.assembly.OperationSelector;
 import org.apache.tuscany.sca.assembly.SCABinding;
+import org.apache.tuscany.sca.assembly.WireFormat;
 
 /**
  * The Distributed SCA binding wrapper for the SCA binding model object. This is currently
@@ -73,4 +75,25 @@ public class DistributedSCABindingImpl implements DistributedSCABinding {
     public QName getType() {
         return TYPE;
     }
+    
+    public WireFormat getRequestWireFormat() {
+        return null;
+    }
+    
+    public void setRequestWireFormat(WireFormat wireFormat) {  
+    }
+    
+    public WireFormat getResponseWireFormat() {
+        return null;
+    }
+    
+    public void setResponseWireFormat(WireFormat wireFormat) {
+    }
+    
+    public OperationSelector getOperationSelector() {
+        return null;
+    }
+    
+    public void setOperationSelector(OperationSelector operationSelector) {
+    }    
 }
diff --git a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java
index b67dbcbb12..5a347b8d72 100644
--- a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java
+++ b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java
@@ -28,8 +28,10 @@ import org.apache.tuscany.sca.assembly.Component;
 import org.apache.tuscany.sca.assembly.ComponentService;
 import org.apache.tuscany.sca.assembly.Extensible;
 import org.apache.tuscany.sca.assembly.Extension;
+import org.apache.tuscany.sca.assembly.OperationSelector;
 import org.apache.tuscany.sca.assembly.OptimizableBinding;
 import org.apache.tuscany.sca.assembly.SCABinding;
+import org.apache.tuscany.sca.assembly.WireFormat;
 import org.apache.tuscany.sca.policy.ExtensionType;
 import org.apache.tuscany.sca.policy.Intent;
 import org.apache.tuscany.sca.policy.PolicySet;
@@ -165,4 +167,25 @@ public class SCABindingImpl implements SCABinding, Extensible, PolicySubject, Op
     public QName getType() {
         return TYPE;
     }
+    
+    public WireFormat getRequestWireFormat() {
+        return null;
+    }
+    
+    public void setRequestWireFormat(WireFormat wireFormat) {  
+    }
+    
+    public WireFormat getResponseWireFormat() {
+        return null;
+    }
+    
+    public void setResponseWireFormat(WireFormat wireFormat) {
+    }
+    
+    public OperationSelector getOperationSelector() {
+        return null;
+    }
+    
+    public void setOperationSelector(OperationSelector operationSelector) {
+    }    
 }