Refactoring binding http model to bring back support for servlet based resources, and making rpc style it's own operationSelector

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

2 files changed, 7 insertions, 5 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 4fdd920cb9..7d9503de88 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
@@ -13,6 +13,8 @@ Import-Package: javax.xml.namespace,
  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.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 7ef6fcf91d..195e2d71fc 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,9 +21,9 @@ package org.apache.tuscany.sca.binding.jsonp;
 
 import javax.xml.namespace.QName;
 
-import org.apache.tuscany.sca.binding.http.HTTPDefaultOperationSelector;
-import org.apache.tuscany.sca.binding.http.HTTPDefaultWireFormat;
 import org.apache.tuscany.sca.binding.http.impl.HTTPBindingImpl;
+import org.apache.tuscany.sca.binding.http.operationselector.HTTPRPCOperationSelector;
+import org.apache.tuscany.sca.binding.http.wireformat.HTTPJSONWireFormat;
 
 /**
  * JSONP Binding model
@@ -36,9 +36,9 @@ public class JSONPBinding extends HTTPBindingImpl {
         super();
 
         // configure the HTTP binding for JSONP (which for the moment is the default wireFormat)
-        setOperationSelector(new HTTPDefaultOperationSelector());
-        setRequestWireFormat(new HTTPDefaultWireFormat());
-        setResponseWireFormat(new HTTPDefaultWireFormat());
+        setOperationSelector(new HTTPRPCOperationSelector());
+        setRequestWireFormat(new HTTPJSONWireFormat());
+        setResponseWireFormat(new HTTPJSONWireFormat());
     }
 
     @Override