Removing dependency on binding http implementation artifacts that are not exported

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

2 files changed, 68 insertions, 10 deletions

diff --git a/sca-java-2.x/trunk/modules/binding-jsonp/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/modules/binding-jsonp/META-INF/MANIFEST.MF
index 7d9503de88..c2b0a9fe0b 100644
--- a/sca-java-2.x/trunk/modules/binding-jsonp/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/trunk/modules/binding-jsonp/META-INF/MANIFEST.MF
@@ -12,9 +12,8 @@ Import-Package: javax.xml.namespace,
  org.apache.tuscany.sca.assembly;version="2.0.0",

  org.apache.tuscany.sca.assembly.xml;version="2.0.0",

  org.apache.tuscany.sca.binding.http;version="2.0.0",

- org.apache.tuscany.sca.binding.http.impl;version="2.0.0",

- org.apache.tuscany.sca.binding.http.operationselector,

- org.apache.tuscany.sca.binding.http.wireformat,

+ org.apache.tuscany.sca.binding.http.operationselector;version="2.0.0",

+ org.apache.tuscany.sca.binding.http.wireformat;version="2.0.0",

  org.apache.tuscany.sca.binding.jsonp;version="2.0.0"

 Bundle-SymbolicName: org.apache.tuscany.sca.binding.jsonp

 Bundle-DocURL: http://www.apache.org/

diff --git a/sca-java-2.x/trunk/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/JSONPBinding.java b/sca-java-2.x/trunk/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/JSONPBinding.java
index 195e2d71fc..a5331c1024 100644
--- a/sca-java-2.x/trunk/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/JSONPBinding.java
+++ b/sca-java-2.x/trunk/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/JSONPBinding.java
@@ -21,28 +21,87 @@ package org.apache.tuscany.sca.binding.jsonp;
 
 import javax.xml.namespace.QName;
 
-import org.apache.tuscany.sca.binding.http.impl.HTTPBindingImpl;
+import org.apache.tuscany.sca.assembly.OperationSelector;
+import org.apache.tuscany.sca.assembly.WireFormat;
+import org.apache.tuscany.sca.binding.http.HTTPBinding;
 import org.apache.tuscany.sca.binding.http.operationselector.HTTPRPCOperationSelector;
 import org.apache.tuscany.sca.binding.http.wireformat.HTTPJSONWireFormat;
 
 /**
  * JSONP Binding model
  */
-public class JSONPBinding extends HTTPBindingImpl {
-
+public class JSONPBinding implements HTTPBinding {
     public static final QName TYPE = new QName(SCA11_TUSCANY_NS, "binding.jsonp");
+    
+    private String name;
+    private String uri;
 
+    private WireFormat wireFormat;
+    private OperationSelector operationSelector;    
+    
     public JSONPBinding() {
-        super();
-
         // configure the HTTP binding for JSONP (which for the moment is the default wireFormat)
         setOperationSelector(new HTTPRPCOperationSelector());
         setRequestWireFormat(new HTTPJSONWireFormat());
         setResponseWireFormat(new HTTPJSONWireFormat());
     }
 
-    @Override
     public QName getType() {
         return TYPE;
     }
-}
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getURI() {
+        return uri;
+    }
+
+    public void setURI(String uri) {
+        this.uri = uri;
+    }
+
+    public boolean isUnresolved() {
+        return false;
+    }
+
+    public void setUnresolved(boolean unresolved) {
+        // The sample binding is always resolved
+    }
+
+    // Wireformat and Operation selection
+
+    public WireFormat getRequestWireFormat() {
+        return wireFormat;
+    }
+
+    public void setRequestWireFormat(WireFormat wireFormat) {
+        //no op
+    }
+
+    public WireFormat getResponseWireFormat() {
+        return wireFormat;
+    }
+
+    public void setResponseWireFormat(WireFormat wireFormat) {
+        //no op
+    }    
+
+    public OperationSelector getOperationSelector() {
+        return operationSelector;
+    }
+
+    public void setOperationSelector(OperationSelector operationSelector) {
+        //no op
+    }    
+
+    @Override
+    public Object clone() throws CloneNotSupportedException {
+        return super.clone();
+    }     
+}
\ No newline at end of file