TUSCANY-3617 - Adding support for configuring wireFormat only for response to allow RPC over GET services to define the wireFormat to use for generating the response payload.

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

12 files changed, 387 insertions, 223 deletions

diff --git a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingProviderFactory.java b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingProviderFactory.java
index 7c9ec85a9e..0f5047deef 100644
--- a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingProviderFactory.java
+++ b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingProviderFactory.java
@@ -6,15 +6,15 @@
  * 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.    
+ * under the License.
  */
 
 package org.apache.tuscany.sca.binding.rest.provider;
@@ -33,7 +33,7 @@ import org.apache.tuscany.sca.runtime.RuntimeEndpointReference;
 
 
 /**
- * Factory for REST binding providers. 
+ * Factory for REST binding providers.
  *
  * @version $Rev$ $Date$
  */
@@ -41,7 +41,7 @@ public class RESTBindingProviderFactory implements BindingProviderFactory<RESTBi
     private ExtensionPointRegistry extensionPoints;
     private MessageFactory messageFactory;
     private ServletHost servletHost;
-    
+
     public RESTBindingProviderFactory(ExtensionPointRegistry extensionPoints) {
         this.extensionPoints = extensionPoints;
         this.servletHost = ServletHostHelper.getServletHost(extensionPoints);
@@ -51,14 +51,12 @@ public class RESTBindingProviderFactory implements BindingProviderFactory<RESTBi
 
     public ReferenceBindingProvider createReferenceBindingProvider(RuntimeEndpointReference endpointReference) {
         return new RESTReferenceBindingProvider(extensionPoints, endpointReference);
-    	// Binding REST is currently NOT supporting References
-        // throw new UnsupportedOperationException("binding.rest for SCA references is not implemented yet.");
     }
 
     public ServiceBindingProvider createServiceBindingProvider(RuntimeEndpoint endpoint) {
         return new RESTServiceBindingProvider(endpoint, extensionPoints, messageFactory, servletHost);
     }
-    
+
     public Class<RESTBinding> getModelType() {
         return RESTBinding.class;
     }
diff --git a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTServiceBindingProvider.java b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTServiceBindingProvider.java
index 46002e3226..a12c28715a 100644
--- a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTServiceBindingProvider.java
+++ b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTServiceBindingProvider.java
@@ -6,15 +6,15 @@
  * 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.    
+ * under the License.
  */
 
 package org.apache.tuscany.sca.binding.rest.provider;
@@ -66,6 +66,13 @@ import org.oasisopen.sca.ServiceRuntimeException;
  * @version $Rev$ $Date$
  */
 public class RESTServiceBindingProvider implements EndpointProvider {
+    private static Map<QName, String> wireFormatToMediaTypeMapping = new HashMap<QName, String>();
+
+    static {
+        wireFormatToMediaTypeMapping.put(JSONWireFormat.REST_WIREFORMAT_JSON_QNAME, MediaType.APPLICATION_JSON);
+        wireFormatToMediaTypeMapping.put(XMLWireFormat.REST_WIREFORMAT_XML_QNAME, MediaType.APPLICATION_XML);
+    }
+
     private ExtensionPointRegistry extensionPoints;
 
     private RuntimeEndpoint endpoint;
@@ -77,6 +84,7 @@ public class RESTServiceBindingProvider implements EndpointProvider {
 
     private OperationSelectorProvider osProvider;
     private WireFormatProvider wfProvider;
+    private WireFormatProvider wfResponseProvider;
 
     private ServletHost servletHost;
     private String servletMapping;
@@ -106,31 +114,42 @@ public class RESTServiceBindingProvider implements EndpointProvider {
         if (binding.getOperationSelector() != null) {
             // Configure the interceptors for operation selection
             OperationSelectorProviderFactory osProviderFactory =
-                (OperationSelectorProviderFactory)providerFactories.getProviderFactory(binding.getOperationSelector()
-                    .getClass());
+                (OperationSelectorProviderFactory)providerFactories.getProviderFactory(binding.getOperationSelector().getClass());
             if (osProviderFactory != null) {
                 this.osProvider = osProviderFactory.createServiceOperationSelectorProvider(endpoint);
             }
         }
 
-        if (binding.getRequestWireFormat() != null && binding.getResponseWireFormat() != null) {
+        if (binding.getRequestWireFormat() != null) {
             // Configure the interceptors for wire format
             WireFormatProviderFactory wfProviderFactory =
-                (WireFormatProviderFactory)providerFactories.getProviderFactory(binding.getRequestWireFormat()
-                    .getClass());
+                (WireFormatProviderFactory)providerFactories.getProviderFactory(binding.getRequestWireFormat().getClass());
             if (wfProviderFactory != null) {
                 this.wfProvider = wfProviderFactory.createServiceWireFormatProvider(endpoint);
             }
         }
 
+        if (binding.getResponseWireFormat() != null ) {
+            // Configure the interceptors for wire format
+            WireFormatProviderFactory wfProviderFactory =
+                (WireFormatProviderFactory)providerFactories.getProviderFactory(binding.getResponseWireFormat().getClass());
+            if (wfProviderFactory != null) {
+                this.wfResponseProvider = wfProviderFactory.createServiceWireFormatProvider(endpoint);
+            }
+        }
+
         //clone the service contract to avoid databinding issues
         try {
             this.serviceContract = (InterfaceContract)service.getInterfaceContract().clone();
 
             // configure data binding
-            if (this.wfProvider != null) {
+            if (wfProvider != null ) {
                 wfProvider.configureWireFormatInterfaceContract(serviceContract);
             }
+
+            if(wfResponseProvider != null) {
+                wfResponseProvider.configureWireFormatInterfaceContract(serviceContract);
+            }
         } catch (CloneNotSupportedException e) {
             this.serviceContract = service.getInterfaceContract();
         }
@@ -204,12 +223,27 @@ public class RESTServiceBindingProvider implements EndpointProvider {
         servletHost.addServletMapping(servletMapping, servlet);
     }
 
-    private static Map<QName, String> wireFormatToMediaTypeMapping = new HashMap<QName, String>();
-    static {
-        wireFormatToMediaTypeMapping.put(JSONWireFormat.REST_WIREFORMAT_JSON_QNAME, MediaType.APPLICATION_JSON);
-        wireFormatToMediaTypeMapping.put(XMLWireFormat.REST_WIREFORMAT_XML_QNAME, MediaType.APPLICATION_XML);
+    public void stop() {
+        if (application != null) {
+            application.destroy();
+        }
+        // Unregister the Servlet from the Servlet host
+        servletHost.removeServletMapping(servletMapping);
+    }
+
+    public InterfaceContract getBindingInterfaceContract() {
+        return serviceContract;
     }
 
+    public boolean supportsOneWayInvocation() {
+        return false;
+    }
+
+
+    /**
+     * Register a Tuscany REST Servlet to handle JAX-RS Resources on a binding endpoint
+     * @return
+     */
     private SimpleApplication registerWithJAXRS() {
         try {
             SimpleApplication application = null;
@@ -249,16 +283,11 @@ public class RESTServiceBindingProvider implements EndpointProvider {
 
         public SimpleApplication(Class<?> resourceClass) {
             super();
-            // boolean isJAXRS = isJAXRSResource(resourceClass);
-            // if (isJAXRS) {
             if (resourceClass.isInterface()) {
                 this.resourceClass = generateResourceClass(resourceClass);
             } else {
                 this.resourceClass = resourceClass;
             }
-            // } else {
-            //    throw new ServiceRuntimeException(resourceClass+" is not a JAX-RS resource class.");
-            // }
         }
 
         @Override
@@ -283,7 +312,7 @@ public class RESTServiceBindingProvider implements EndpointProvider {
 
                 String uri = endpoint.getBinding().getURI();
                 String path = URI.create(uri).getPath();
-                
+
                 // FIXME: [rfeng] We need to have a better way to deal with URI template for bindings
                 if(path.startsWith(servletHost.getContextPath())) {
                     path = path.substring(servletHost.getContextPath().length());
@@ -319,36 +348,11 @@ public class RESTServiceBindingProvider implements EndpointProvider {
                     return true;
                 }
             }
-            
-            /*
-            for (Annotation[] annotations : method.getParameterAnnotations()) {
-                for (Annotation a : annotations) {
-                    if (a.annotationType().getName().startsWith("javax.ws.rs.")) {
-                        return true;
-                    }
-                }
-
-            }
-            */
         }
         return false;
     }
 
-    public void stop() {
-        if (application != null) {
-            application.destroy();
-        }
-        // Unregister the Servlet from the Servlet host
-        servletHost.removeServletMapping(servletMapping);
-    }
 
-    public InterfaceContract getBindingInterfaceContract() {
-        return serviceContract;
-    }
-
-    public boolean supportsOneWayInvocation() {
-        return false;
-    }
 
     /**
      * Add specific rest interceptor to invocation chain
@@ -364,6 +368,14 @@ public class RESTServiceBindingProvider implements EndpointProvider {
             }
         }
 
+        if (wfResponseProvider != null) {
+            Interceptor interceptor = wfResponseProvider.createInterceptor();
+            if (interceptor != null) {
+                bindingChain.addInterceptor(Phase.SERVICE_BINDING_WIREFORMAT, interceptor);
+            }
+
+        }
+
         if (osProvider != null) {
             Interceptor interceptor = osProvider.createInterceptor();
             if (interceptor != null) {
diff --git a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/provider/JSONWireFormatInterceptor.java b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/provider/JSONWireFormatInterceptor.java
index fdcbc92c9c..e5ce32328c 100644
--- a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/provider/JSONWireFormatInterceptor.java
+++ b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/provider/JSONWireFormatInterceptor.java
@@ -6,15 +6,15 @@
  * 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.    
+ * under the License.
  */
 
 package org.apache.tuscany.sca.binding.rest.wireformat.json.provider;
@@ -24,8 +24,11 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.StringWriter;
 
+import org.apache.tuscany.sca.binding.rest.RESTBinding;
+import org.apache.tuscany.sca.binding.rest.wireformat.json.JSONWireFormat;
 import org.apache.tuscany.sca.common.http.HTTPContext;
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.interfacedef.Operation;
 import org.apache.tuscany.sca.invocation.Interceptor;
 import org.apache.tuscany.sca.invocation.Invoker;
 import org.apache.tuscany.sca.invocation.Message;
@@ -34,16 +37,17 @@ import org.json.JSONObject;
 
 /**
  * JSON wire format Interceptor.
- * 
+ *
  * @version $Rev$ $Date$
 */
 public class JSONWireFormatInterceptor implements Interceptor {
     private Invoker next;
+    private RESTBinding binding;
 
     public JSONWireFormatInterceptor(ExtensionPointRegistry extensionPoints, RuntimeEndpoint endpoint) {
-
+        this.binding = (RESTBinding) endpoint.getBinding();
     }
-    
+
     public Invoker getNext() {
         return next;
     }
@@ -51,34 +55,74 @@ public class JSONWireFormatInterceptor implements Interceptor {
     public void setNext(Invoker next) {
         this.next = next;
     }
-    
+
     public Message invoke(Message msg) {
         HTTPContext bindingContext = (HTTPContext) msg.getBindingContext();
         if (bindingContext == null) {
             return getNext().invoke(msg);
         }
+
+
+        if (binding.getRequestWireFormat() instanceof JSONWireFormat) {
+            if( isPayloadSupported(bindingContext.getHttpRequest().getMethod()) && msg.getBody() != null) {
+                msg = invokeRequest(bindingContext, msg);
+            }
+        }
+
+        msg = getNext().invoke(msg);
+
+        //if it's oneway return back
+        Operation operation = msg.getOperation();
+        if (operation != null && operation.isNonBlocking()) {
+            return msg;
+        }
+
+        if (binding.getResponseWireFormat() instanceof JSONWireFormat) {
+            msg = invokeResponse(bindingContext, msg);
+        }
+
+       return msg;
+    }
+
+    /**
+     * Handle any wire format specific transformations required for request data
+     * @param bindingContext the binding context (e.g. HTTP Request, Response objects)
+     * @param msg the invocation message
+     * @return processed request message
+     */
+    private Message invokeRequest(HTTPContext bindingContext, Message msg) {
+
         // Decode using the charset in the request if it exists otherwise
         // use UTF-8 as this is what all browser implementations use.
         String charset = bindingContext.getHttpRequest().getCharacterEncoding();
         if (charset == null) {
             charset = "UTF-8";
         }
-        
+
         try {
-            if( isPayloadSupported(bindingContext.getHttpRequest().getMethod()) && msg.getBody() != null) {
-                Object[] args = msg.getBody();
-                InputStream in = (InputStream) args[0];
-                String data = read(in, charset);
-                JSONObject jsonPayload = new JSONObject(data);
-                msg.setBody(new Object[]{jsonPayload});
-            }
+            Object[] args = msg.getBody();
+            InputStream in = (InputStream) args[0];
+            String data = read(in, charset);
+            JSONObject jsonPayload = new JSONObject(data);
+            msg.setBody(new Object[]{jsonPayload});
         } catch(Exception e) {
             throw new RuntimeException("Unable to parse json paylod: " + msg.getBody().toString());
         }
-        
-        return getNext().invoke(msg);
+
+        return msg;
     }
-    
+
+    /**
+     * Handle any wire format specific transformation required for the response data
+     * @param bindingContext the binding context (e.g. HTTP Request, Response objects)
+     * @param msg the response message
+     * @return processed response message
+     */
+    private Message invokeResponse(HTTPContext bindingContext, Message msg) {
+        return msg;
+    }
+
+
     /**
      * Check if HTTP Operation should support payload
      * @param operation
@@ -87,10 +131,10 @@ public class JSONWireFormatInterceptor implements Interceptor {
     private static boolean isPayloadSupported(String operation) {
         boolean isGet = "get".equalsIgnoreCase(operation);
         boolean isDelete = "delete".equalsIgnoreCase(operation);
-        
+
         return  isGet == false && isDelete == false;
     }
-    
+
     /**
      * Read JSON payload from HTTP Request Body
      * @param in
diff --git a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/provider/JSONWireFormatServiceProvider.java b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/provider/JSONWireFormatServiceProvider.java
index c90f5c331c..126d2ead40 100644
--- a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/provider/JSONWireFormatServiceProvider.java
+++ b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/provider/JSONWireFormatServiceProvider.java
@@ -6,15 +6,15 @@
  * 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.    
+ * under the License.
  */
 
 package org.apache.tuscany.sca.binding.rest.wireformat.json.provider;
@@ -39,45 +39,45 @@ import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
 
 /**
  * JSON wire format service provider.
- * 
+ *
  * @version $Rev$ $Date$
 */
 public class JSONWireFormatServiceProvider implements WireFormatProvider {
     private ExtensionPointRegistry extensionPoints;
     private RuntimeEndpoint endpoint;
-    
+
     private InterfaceContract serviceContract;
     private Binding binding;
     private boolean jaxrs;
-    
+
     public JSONWireFormatServiceProvider(ExtensionPointRegistry extensionPoints, RuntimeEndpoint endpoint) {
         this.extensionPoints = extensionPoints;
         this.endpoint = endpoint;
         this.binding = endpoint.getBinding();
         this.jaxrs = isJAXRSResource();
     }
-    
+
     private boolean isJAXRSResource() {
         Interface interfaze = endpoint.getComponentServiceInterfaceContract().getInterface();
         if (interfaze instanceof JavaInterface) {
             if (RESTServiceBindingProvider.isJAXRSResource(((JavaInterface)interfaze).getJavaClass())) {
                 return true;
             }
-        } 
+        }
         return false;
     }
-    
+
     public InterfaceContract configureWireFormatInterfaceContract(InterfaceContract interfaceContract) {
         serviceContract = interfaceContract;
-        
+
         if (!jaxrs) {
-            //set JSON databinding
-            setDataBinding(serviceContract.getInterface());
+            boolean configureInput = binding.getRequestWireFormat() != null;
+            boolean configureOutput = binding.getRequestWireFormat() != null || binding.getResponseWireFormat() != null;
 
-            //make JSON databinding default
-            serviceContract.getInterface().resetDataBinding(JSONDataBinding.NAME);
+            //set JSON databinding
+            setDataBinding(serviceContract.getInterface(), configureInput, configureOutput);
         }
-        
+
         return serviceContract;
     }
 
@@ -85,7 +85,8 @@ public class JSONWireFormatServiceProvider implements WireFormatProvider {
         if (jaxrs) {
             return null;
         }
-        if (binding.getRequestWireFormat() != null && binding.getRequestWireFormat() instanceof JSONWireFormat) {
+        if( (binding.getRequestWireFormat() != null && binding.getRequestWireFormat() instanceof JSONWireFormat) ||
+            (binding.getResponseWireFormat() != null && binding.getResponseWireFormat() instanceof JSONWireFormat) ){
             return new JSONWireFormatInterceptor(extensionPoints, endpoint);
         }
         return null;
@@ -95,29 +96,39 @@ public class JSONWireFormatServiceProvider implements WireFormatProvider {
         return Phase.SERVICE_BINDING_WIREFORMAT;
     }
 
-    
+
     /**
-     * Utility method to reset data binding for the interface contract
+     * Utility method to reset data binding for the interface contract.
+     * We need to handle special case where :
+     *    - global wire format for binding
+     *    - wire format configured only for response
      * @param interfaze
      */
     @SuppressWarnings({"deprecation", "unchecked"})
-    private void setDataBinding(Interface interfaze) {
+    private void setDataBinding(Interface interfaze, boolean configureInput, boolean configureOutput) {
         List<Operation> operations = interfaze.getOperations();
         for (Operation operation : operations) {
-            operation.setDataBinding(JSONDataBinding.NAME);
-            DataType<List<DataType>> inputType = operation.getInputType();
-            if (inputType != null) {
-                List<DataType> logical = inputType.getLogical();
-                for (DataType inArg : logical) {
-                    if (!SimpleJavaDataBinding.NAME.equals(inArg.getDataBinding())) {
-                        inArg.setDataBinding(JSONDataBinding.NAME);
-                    } 
+            // handle input types
+            if (configureInput) {
+                operation.setDataBinding(JSONDataBinding.NAME);
+                DataType<List<DataType>> inputType = operation.getInputType();
+                if (inputType != null) {
+                    List<DataType> logical = inputType.getLogical();
+                    for (DataType inArg : logical) {
+                        if (!SimpleJavaDataBinding.NAME.equals(inArg.getDataBinding())) {
+                            inArg.setDataBinding(JSONDataBinding.NAME);
+                        }
+                    }
                 }
             }
-            DataType outputType = operation.getOutputType();
-            if (outputType != null) {
-                if (!SimpleJavaDataBinding.NAME.equals(outputType.getDataBinding())) {
-                    outputType.setDataBinding(JSONDataBinding.NAME);
+
+            // handle output types
+            if (configureOutput) {
+                DataType outputType = operation.getOutputType();
+                if (outputType != null) {
+                    if (!SimpleJavaDataBinding.NAME.equals(outputType.getDataBinding())) {
+                        outputType.setDataBinding(JSONDataBinding.NAME);
+                    }
                 }
             }
         }
diff --git a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/provider/XMLWireFormatInterceptor.java b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/provider/XMLWireFormatInterceptor.java
index 3ece7c07a3..d5055b6701 100644
--- a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/provider/XMLWireFormatInterceptor.java
+++ b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/provider/XMLWireFormatInterceptor.java
@@ -6,15 +6,15 @@
  * 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.    
+ * under the License.
  */
 
 package org.apache.tuscany.sca.binding.rest.wireformat.xml.provider;
@@ -24,9 +24,13 @@ import java.io.InputStream;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamReader;
 
+import org.apache.tuscany.sca.binding.rest.RESTBinding;
+import org.apache.tuscany.sca.binding.rest.wireformat.json.JSONWireFormat;
+import org.apache.tuscany.sca.binding.rest.wireformat.xml.XMLWireFormat;
 import org.apache.tuscany.sca.common.http.HTTPContext;
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.core.FactoryExtensionPoint;
+import org.apache.tuscany.sca.interfacedef.Operation;
 import org.apache.tuscany.sca.invocation.Interceptor;
 import org.apache.tuscany.sca.invocation.Invoker;
 import org.apache.tuscany.sca.invocation.Message;
@@ -34,19 +38,22 @@ import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
 
 /**
  * JSON wire format Interceptor.
- * 
+ *
  * @version $Rev$ $Date$
 */
 public class XMLWireFormatInterceptor implements Interceptor {
     private XMLInputFactory inputFactory;
-    
+
     private Invoker next;
+    private RESTBinding binding;
 
     public XMLWireFormatInterceptor(ExtensionPointRegistry extensionPoints, RuntimeEndpoint endpoint) {
         FactoryExtensionPoint factories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
         inputFactory = factories.getFactory(XMLInputFactory.class);
+
+        this.binding = (RESTBinding) endpoint.getBinding();
     }
-    
+
     public Invoker getNext() {
         return next;
     }
@@ -57,14 +64,46 @@ public class XMLWireFormatInterceptor implements Interceptor {
 
     public Message invoke(Message msg) {
         HTTPContext bindingContext = (HTTPContext) msg.getBindingContext();
-        
+        if (bindingContext == null) {
+            return getNext().invoke(msg);
+        }
+
+
+        if (binding.getRequestWireFormat() instanceof XMLWireFormat) {
+            if( isPayloadSupported(bindingContext.getHttpRequest().getMethod()) && msg.getBody() != null) {
+                msg = invokeRequest(bindingContext, msg);
+            }
+        }
+
+        msg = getNext().invoke(msg);
+
+        //if it's oneway return back
+        Operation operation = msg.getOperation();
+        if (operation != null && operation.isNonBlocking()) {
+            return msg;
+        }
+
+        if (binding.getResponseWireFormat() instanceof XMLWireFormat) {
+            msg = invokeResponse(bindingContext, msg);
+        }
+
+       return msg;
+    }
+
+    /**
+     * Handle any wire format specific transformations required for request data
+     * @param bindingContext the binding context (e.g. HTTP Request, Response objects)
+     * @param msg the invocation message
+     * @return processed request message
+     */
+    private Message invokeRequest(HTTPContext bindingContext, Message msg) {
         // Decode using the charset in the request if it exists otherwise
         // use UTF-8 as this is what all browser implementations use.
         String charset = bindingContext.getHttpRequest().getCharacterEncoding();
         if (charset == null) {
             charset = "UTF-8";
         }
-        
+
         try {
             if(msg.getBody() != null) {
                 Object[] args = msg.getBody();
@@ -75,8 +114,30 @@ public class XMLWireFormatInterceptor implements Interceptor {
         } catch(Exception e) {
             throw new RuntimeException("Unable to process xml paylod: " + msg.getBody().toString());
         }
-        
-        return getNext().invoke(msg);
+
+        return msg;
     }
 
+
+    /**
+     * Handle any wire format specific transformation required for the response data
+     * @param bindingContext the binding context (e.g. HTTP Request, Response objects)
+     * @param msg the response message
+     * @return processed response message
+     */
+    private Message invokeResponse(HTTPContext bindingContext, Message msg) {
+        return msg;
+    }
+
+    /**
+     * Check if HTTP Operation should support payload
+     * @param operation
+     * @return
+     */
+    private static boolean isPayloadSupported(String operation) {
+        boolean isGet = "get".equalsIgnoreCase(operation);
+        boolean isDelete = "delete".equalsIgnoreCase(operation);
+
+        return  isGet == false && isDelete == false;
+    }
 }
diff --git a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/provider/XMLWireFormatServiceProvider.java b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/provider/XMLWireFormatServiceProvider.java
index 9e532d2df2..2725de15b8 100644
--- a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/provider/XMLWireFormatServiceProvider.java
+++ b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/provider/XMLWireFormatServiceProvider.java
@@ -6,15 +6,15 @@
  * 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.    
+ * under the License.
  */
 
 package org.apache.tuscany.sca.binding.rest.wireformat.xml.provider;
@@ -41,46 +41,46 @@ import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
 
 /**
  * XML wire format service provider.
- * 
+ *
  * @version $Rev$ $Date$
 */
 public class XMLWireFormatServiceProvider implements WireFormatProvider {
     private static final String DATABABINDING = XMLStreamReader.class.getName();
-    
+
     private ExtensionPointRegistry extensionPoints;
     private RuntimeEndpoint endpoint;
-    
+
     private InterfaceContract serviceContract;
     private Binding binding;
-    
+
     private boolean jaxrs;
-    
+
     public XMLWireFormatServiceProvider(ExtensionPointRegistry extensionPoints, RuntimeEndpoint endpoint) {
         this.extensionPoints = extensionPoints;
         this.endpoint = endpoint;
         this.binding = endpoint.getBinding();
         this.jaxrs = isJAXRSResource();
     }
-    
+
     private boolean isJAXRSResource() {
         Interface interfaze = endpoint.getComponentServiceInterfaceContract().getInterface();
         if (interfaze instanceof JavaInterface) {
             if (RESTServiceBindingProvider.isJAXRSResource(((JavaInterface)interfaze).getJavaClass())) {
                 return true;
             }
-        } 
+        }
         return false;
     }
-    
+
     public InterfaceContract configureWireFormatInterfaceContract(InterfaceContract interfaceContract) {
         serviceContract = interfaceContract;
-        if (!jaxrs) {
 
-            //make XML databinding default
-            serviceContract.getInterface().resetDataBinding(DATABABINDING);
+        if (!jaxrs) {
+            boolean configureInput = binding.getRequestWireFormat() != null;
+            boolean configureOutput = binding.getRequestWireFormat() != null || binding.getResponseWireFormat() != null;
 
             //set XML databinding
-            setDataBinding(serviceContract.getInterface());
+            setDataBinding(serviceContract.getInterface(), configureInput, configureOutput);
         }
 
         return serviceContract;
@@ -90,7 +90,9 @@ public class XMLWireFormatServiceProvider implements WireFormatProvider {
         if (jaxrs) {
             return null;
         }
-        if (binding.getRequestWireFormat() != null && binding.getRequestWireFormat() instanceof XMLWireFormat) {
+
+        if( (binding.getRequestWireFormat() != null && binding.getRequestWireFormat() instanceof XMLWireFormat) ||
+            (binding.getResponseWireFormat() != null && binding.getResponseWireFormat() instanceof XMLWireFormat) ){
             return new XMLWireFormatInterceptor(extensionPoints, endpoint);
         }
         return null;
@@ -100,28 +102,33 @@ public class XMLWireFormatServiceProvider implements WireFormatProvider {
         return Phase.SERVICE_BINDING_WIREFORMAT;
     }
 
-    
+
     /**
      * Utility method to reset data binding for the interface contract
      * @param interfaze
      */
     @SuppressWarnings({"deprecation", "unchecked"})
-    private void setDataBinding(Interface interfaze) {
+    private void setDataBinding(Interface interfaze, boolean configureInput, boolean configureOutput) {
         List<Operation> operations = interfaze.getOperations();
         for (Operation operation : operations) {
-            operation.setDataBinding(DATABABINDING);
-            DataType<List<DataType>> inputType = operation.getInputType();
-            if (inputType != null) {
-                List<DataType> logical = inputType.getLogical();
-                for (DataType inArg : logical) {
-                    if (!SimpleJavaDataBinding.NAME.equals(inArg.getDataBinding())) {
-                        inArg.setDataBinding(DATABABINDING);
-                    } 
+            // handle input types
+            if (configureInput) {
+                operation.setDataBinding(DATABABINDING);
+                DataType<List<DataType>> inputType = operation.getInputType();
+                if (inputType != null) {
+                    List<DataType> logical = inputType.getLogical();
+                    for (DataType inArg : logical) {
+                        if (!SimpleJavaDataBinding.NAME.equals(inArg.getDataBinding())) {
+                            inArg.setDataBinding(DATABABINDING);
+                        }
+                    }
                 }
             }
-            DataType outputType = operation.getOutputType();
-            if (outputType != null) {
-                if (!SimpleJavaDataBinding.NAME.equals(outputType.getDataBinding())) {
+
+            // handle output types
+            if (configureOutput) {
+                DataType outputType = operation.getOutputType();
+                if (outputType != null) {
                     outputType.setDataBinding(XMLStringDataBinding.NAME);
                 }
             }
diff --git a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/rpc/EchoServiceTestCase.java b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/rpc/EchoServiceTestCase.java
index cb65249fe3..5a7aaecaf1 100644
--- a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/rpc/EchoServiceTestCase.java
+++ b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/rpc/EchoServiceTestCase.java
@@ -6,15 +6,15 @@
  * 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.    
+ * under the License.
  */
 
 package org.apache.tuscany.sca.binding.rest.rpc;
@@ -28,7 +28,6 @@ import org.apache.tuscany.sca.node.NodeFactory;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import com.meterware.httpunit.GetMethodWebRequest;
@@ -36,16 +35,17 @@ import com.meterware.httpunit.WebConversation;
 import com.meterware.httpunit.WebRequest;
 import com.meterware.httpunit.WebResponse;
 
-@Ignore
 public class EchoServiceTestCase {
-    private static final String SERVICE_URL = "http://localhost:8085/EchoService";
-
-    private static final String GET_RESPONSE = "[{\"price\":\"$1.55\",\"name\":\"Pear\",\"javaClass\":\"services.store.Item\"},{\"price\":\"$2.99\",\"name\":\"Apple\",\"javaClass\":\"services.store.Item\"},{\"price\":\"$3.55\",\"name\":\"Orange\",\"javaClass\":\"services.store.Item\"}]";
-    private static final String NEW_ITEM = "{\"price\":\"$4.35\",\"name\":\"Grape\"}\"";
-    private static final String GET_NEW_RESPONSE = "[{\"price\":\"$1.55\",\"name\":\"Pear\",\"javaClass\":\"services.store.Item\"},{\"price\":\"$2.99\",\"name\":\"Apple\",\"javaClass\":\"services.store.Item\"},{\"price\":\"$3.55\",\"name\":\"Orange\",\"javaClass\":\"services.store.Item\"},{\"price\":\"$4.35\",\"name\":\"Grape\",\"javaClass\":\"services.store.Item\"}]";
-    private static final String UPDATED_ITEM = "{\"price\":\"$1.35\",\"name\":\"Grape\"}\"";
-    private static final String GET_UPDATED_RESPONSE = "[{\"price\":\"$1.55\",\"name\":\"Pear\",\"javaClass\":\"services.store.Item\"},{\"price\":\"$2.99\",\"name\":\"Apple\",\"javaClass\":\"services.store.Item\"},{\"price\":\"$3.55\",\"name\":\"Orange\",\"javaClass\":\"services.store.Item\"},{\"price\":\"$1.35\",\"name\":\"Grape\",\"javaClass\":\"services.store.Item\"}]";    
-    
+    private static final String SERVICE_URL_JSON = "http://localhost:8085/EchoService/json";
+    private static final String SERVICE_URL_XML = "http://localhost:8085/EchoService/xml";
+
+    private static final String XML_RESPONSE = "" +
+           "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+           "<return xmlns:ns2=\"http://echo.services/\" "+
+           "xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" " +
+           "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" "+
+           "xsi:type=\"xs:string\">Hello RPC</return>";
+
     private static Node node;
 
     @BeforeClass
@@ -65,38 +65,55 @@ public class EchoServiceTestCase {
             node.stop();
         }
     }
-    
+
     @Test
     public void testPing() throws Exception {
         new Socket("127.0.0.1", 8085);
-        //System.in.read();
+        // System.in.read();
     }
-    
+
     @Test
-    public void testRPCGetOperation() throws Exception {
+    public void testJSONRPCGetOperation() throws Exception {
         String queryString = "?method=echo&msg=Hello RPC";
 
         WebConversation wc = new WebConversation();
-        WebRequest request = new GetMethodWebRequest(SERVICE_URL + queryString);
+        WebRequest request = new GetMethodWebRequest(SERVICE_URL_JSON + queryString);
         request.setHeaderField("Content-Type", "application/json");
         WebResponse response = wc.getResource(request);
 
         Assert.assertEquals(200, response.getResponseCode());
         Assert.assertEquals("Hello RPC", response.getText());
     }
-    
+
     @Test
     public void testRPCGetArrayOperation() throws Exception {
         String queryString = "?method=echoArrayString&msgArray=Hello RPC1&msgArray=Hello RPC2";
 
         WebConversation wc = new WebConversation();
-        WebRequest request = new GetMethodWebRequest(SERVICE_URL + queryString);
+        WebRequest request = new GetMethodWebRequest(SERVICE_URL_JSON + queryString);
         request.setHeaderField("Content-Type", "application/json");
         WebResponse response = wc.getResource(request);
 
         Assert.assertEquals(200, response.getResponseCode());
         Assert.assertEquals("[\"Hello RPC1\",\"Hello RPC2\"]", response.getText());
     }
-    
-    
+
+
+    @Test
+    public void testXMLRPCGetOperation() throws Exception {
+        String queryString = "?method=echo&msg=Hello RPC";
+
+        WebConversation wc = new WebConversation();
+        WebRequest request = new GetMethodWebRequest(SERVICE_URL_XML + queryString);
+        request.setHeaderField("Content-Type", "application/xml");
+        WebResponse response = wc.getResource(request);
+
+        System.out.println("Expected>>" + XML_RESPONSE);
+        System.out.println("Received>>" + response.getText());
+
+        Assert.assertEquals(200, response.getResponseCode());
+        Assert.assertEquals(XML_RESPONSE, response.getText());
+    }
+
+
 }
diff --git a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/json/CatalogServiceTestCase.java b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/json/CatalogServiceTestCase.java
index de5acc2fe7..2aa59af508 100644
--- a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/json/CatalogServiceTestCase.java
+++ b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/json/CatalogServiceTestCase.java
@@ -6,15 +6,15 @@
  * 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.    
+ * under the License.
  */
 
 package org.apache.tuscany.sca.binding.rest.wireformat.json;
@@ -26,6 +26,8 @@ import org.apache.tuscany.sca.node.Contribution;
 import org.apache.tuscany.sca.node.ContributionLocationHelper;
 import org.apache.tuscany.sca.node.Node;
 import org.apache.tuscany.sca.node.NodeFactory;
+import org.json.JSONException;
+import org.json.JSONObject;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
@@ -44,8 +46,8 @@ public class CatalogServiceTestCase {
     private static final String NEW_ITEM = "{\"price\":\"$4.35\",\"name\":\"Grape\"}\"";
     private static final String GET_NEW_RESPONSE = "{\"items\":[{\"price\":\"$1.55\",\"name\":\"Pear\"},{\"price\":\"$2.99\",\"name\":\"Apple\"},{\"price\":\"$3.55\",\"name\":\"Orange\"},{\"price\":\"$4.35\",\"name\":\"Grape\"}]}";
     private static final String UPDATED_ITEM = "{\"price\":\"$1.35\",\"name\":\"Grape\"}\"";
-    private static final String GET_UPDATED_RESPONSE = "{\"items\":[{\"price\":\"$1.55\",\"name\":\"Pear\"},{\"price\":\"$2.99\",\"name\":\"Apple\"},{\"price\":\"$3.55\",\"name\":\"Orange\"},{\"price\":\"$1.35\",\"name\":\"Grape\"}]}";    
-    
+    private static final String GET_UPDATED_RESPONSE = "{\"items\":[{\"price\":\"$1.55\",\"name\":\"Pear\"},{\"price\":\"$2.99\",\"name\":\"Apple\"},{\"price\":\"$3.55\",\"name\":\"Orange\"},{\"price\":\"$1.35\",\"name\":\"Grape\"}]}";
+
     private static Node node;
 
     @BeforeClass
@@ -65,27 +67,28 @@ public class CatalogServiceTestCase {
             node.stop();
         }
     }
-    
+
     @Test
     public void testPing() throws Exception {
         new Socket("127.0.0.1", 8085);
         //System.in.read();
     }
-    
+
     @Test
-    public void testGetInvocation() throws Exception {        
+    public void testGetInvocation() throws Exception {
         WebConversation wc = new WebConversation();
         WebRequest request = new GetMethodWebRequest(SERVICE_URL);
         request.setHeaderField("Content-Type", "application/json");
         WebResponse response = wc.getResource(request);
 
         Assert.assertEquals(200, response.getResponseCode());
-        Assert.assertEquals(GET_RESPONSE, response.getText());
+        Assert.assertNotNull(response.getText());
+        Assert.assertTrue(validateJsonResponse(GET_RESPONSE,response.getText()));
     }
 
 
     @Test
-    public void testPostInvocation() throws Exception {        
+    public void testPostInvocation() throws Exception {
         //Add new item to catalog
         WebConversation wc = new WebConversation();
         WebRequest request   = new PostMethodWebRequest(SERVICE_URL, new ByteArrayInputStream(NEW_ITEM.getBytes("UTF-8")),"application/json");
@@ -93,22 +96,23 @@ public class CatalogServiceTestCase {
         WebResponse response = wc.getResource(request);
 
         Assert.assertEquals(204, response.getResponseCode());
-        
+
         //read new results and expect to get new item back in the response
         request = new GetMethodWebRequest(SERVICE_URL);
         request.setHeaderField("Content-Type", "application/json");
         response = wc.getResource(request);
-        
+
         //for debug purposes
         //System.out.println(">>>" + GET_UPDATED_RESPONSE);
         //System.out.println(">>>" + response.getText());
 
         Assert.assertEquals(200, response.getResponseCode());
-        Assert.assertEquals(GET_NEW_RESPONSE, response.getText());
+        Assert.assertNotNull(response.getText());
+        Assert.assertTrue(validateJsonResponse(GET_NEW_RESPONSE,response.getText()));
     }
 
     @Test
-    public void testPutInvocation() throws Exception {        
+    public void testPutInvocation() throws Exception {
         //Add new item to catalog
         WebConversation wc = new WebConversation();
         WebRequest request   = new PostMethodWebRequest(SERVICE_URL, new ByteArrayInputStream(UPDATED_ITEM.getBytes("UTF-8")),"application/json");
@@ -116,17 +120,31 @@ public class CatalogServiceTestCase {
         WebResponse response = wc.getResource(request);
 
         Assert.assertEquals(204, response.getResponseCode());
-        
+
         //read new results and expect to get new item back in the response
         request = new GetMethodWebRequest(SERVICE_URL);
         request.setHeaderField("Content-Type", "application/json");
         response = wc.getResource(request);
-        
+
         //for debug purposes
         //System.out.println(">>>" + GET_UPDATED_RESPONSE);
         //System.out.println(">>>" + response.getText());
 
         Assert.assertEquals(200, response.getResponseCode());
-        Assert.assertEquals(GET_UPDATED_RESPONSE, response.getText());
+        Assert.assertNotNull(response.getText());
+        Assert.assertTrue(validateJsonResponse(GET_UPDATED_RESPONSE,response.getText()));
+    }
+
+
+    private boolean validateJsonResponse(String expected, String actual) throws JSONException {
+        JSONObject jsonExpected = new JSONObject(expected);
+        JSONObject jsonActual = new JSONObject(actual);
+
+        if(jsonExpected.getJSONArray("items").length() != jsonActual.getJSONArray("items").length()) {
+            return false;
+        }
+
+        return true;
+
     }
 }
diff --git a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/echo/Echo.java b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/echo/Echo.java
index ca5d73246a..8664162ffb 100644
--- a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/echo/Echo.java
+++ b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/echo/Echo.java
@@ -6,15 +6,15 @@
  * 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.    
+ * under the License.
  */
 package services.echo;
 
@@ -24,7 +24,7 @@ import org.oasisopen.sca.annotation.Remotable;
 
 /**
  * Interface of our sample JSONRPC service.
- * 
+ *
  * @version $Rev$ $Date$
  */
 @Remotable
@@ -32,9 +32,7 @@ public interface Echo {
 
     String echo(@QueryParam("msg") String msg);
 
-    int echoInt(int param);
-
-    boolean echoBoolean(boolean param);
+    int echoInt(@QueryParam("param") int param);
 
     String [] echoArrayString(@QueryParam("msgArray") String[] stringArray);
 
diff --git a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/echo/EchoImpl.java b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/echo/EchoImpl.java
index 2596637ce8..6bc22bd41a 100644
--- a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/echo/EchoImpl.java
+++ b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/echo/EchoImpl.java
@@ -6,27 +6,27 @@
  * 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.    
+ * under the License.
  */
 package services.echo;
 
 
 /**
  * A simple client component that uses a reference with an JSONRPC binding.
- * 
+ *
  * @version $Rev$ $Date$
  */
-public class EchoImpl implements Echo {    
+public class EchoImpl implements Echo {
 
-    public String echo(String msg) {        
+    public String echo(String msg) {
         return msg;
     }
 
@@ -35,11 +35,6 @@ public class EchoImpl implements Echo {
         return value;
     }
 
-    public boolean echoBoolean(boolean param) {
-        boolean value = param;
-        return value;
-    }
-
     public String[] echoArrayString(String[] stringArray) {
         return stringArray;
     }
diff --git a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/store/FruitsCatalogImpl.java b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/store/FruitsCatalogImpl.java
index 498576117b..afe3d3863e 100644
--- a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/store/FruitsCatalogImpl.java
+++ b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/store/FruitsCatalogImpl.java
@@ -6,15 +6,15 @@
  * 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.    
+ * under the License.
  */
 
 package services.store;
@@ -31,13 +31,13 @@ import org.oasisopen.sca.annotation.Scope;
 
 @Scope("COMPOSITE")
 public class FruitsCatalogImpl implements Catalog {
-    
+
     @Property
     public String currencyCode = "USD";
-    
+
     @Reference
     public CurrencyConverter currencyConverter;
-    
+
     private Map<String, Item> catalog = new HashMap<String, Item>();
 
     @Init
@@ -50,32 +50,27 @@ public class FruitsCatalogImpl implements Catalog {
 
     public Items getItem() {
         Items items = new Items();
-        // Add by order so that we can test in the json array
-        List<Item> list = new ArrayList<Item>();
-        list.add(catalog.get("Pear"));
-        list.add(catalog.get("Apple"));
-        list.add(catalog.get("Orange"));
-        items.setItems(list);
+        items.setItems(new ArrayList<Item>(catalog.values()));
         return items;
     }
-    
+
     public Item getItemById(String itemId) {
         return catalog.get(itemId);
     }
-    
+
     public void addItem(Item item) {
         catalog.put(item.getName(),item);
     }
-    
+
     public void updateItem(Item item) {
         if(catalog.get(item.getName()) != null) {
             catalog.put(item.getName(), item);
         }
     }
-    
+
     public void deleteItem(String itemId) {
         if(catalog.get(itemId) != null) {
             catalog.remove(itemId);
-        }        
+        }
     }
 }
diff --git a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/resources/echo.composite b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/resources/echo.composite
index b69107834a..9e56b84315 100644
--- a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/resources/echo.composite
+++ b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/resources/echo.composite
@@ -7,15 +7,15 @@
  * 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.    

+ * under the License.

 -->

 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"

 	xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"

@@ -26,11 +26,19 @@
     <component name="EchoComponent">

         <implementation.java class="services.echo.EchoImpl"/>

         <service name="Echo">

-            <tuscany:binding.rest uri="http://localhost:8085/EchoService">

-    		    <tuscany:wireFormat.json />

-			    <tuscany:operationSelector.rpc />            

+            <tuscany:binding.rest name="json" uri="http://localhost:8085/EchoService/json">

+			    <tuscany:operationSelector.rpc />

+			    <tuscany:response>

+			    	<tuscany:wireFormat.json />

+			    </tuscany:response>

+            </tuscany:binding.rest>

+

+            <tuscany:binding.rest name="xml" uri="http://localhost:8085/EchoService/xml">

+			    <tuscany:operationSelector.rpc />

+			    <tuscany:response>

+			    	<tuscany:wireFormat.xml />

+			    </tuscany:response>

             </tuscany:binding.rest>

         </service>

     </component>

-    

 </composite>