svn commit: r590820 - in /incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc: JSONRPCServiceServlet.java provider/JSONRPCServiceBindingProvider.java

[rfeng]

Author: rfeng
Date: Wed Oct 31 13:45:38 2007
New Revision: 590820

URL: http://svn.apache.org/viewvc?rev=590820&view=rev
Log:
Make sure the simple types are not overridden with JSON databinding

Modified:
    
incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceServlet.java
    
incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java

Modified: 
incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceServlet.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceServlet.java?rev=590820&r1=590819&r2=590820&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceServlet.java
 (original)
+++ 
incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceServlet.java
 Wed Oct 31 13:45:38 2007
@@ -243,6 +243,9 @@
             } catch (JSONException e1) {
                 throw new ServiceRuntimeException(e);
             }
+        } catch(RuntimeException e) {
+            e.printStackTrace();
+            throw e;
         }
         
         //get response to send to client

Modified: 
incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java?rev=590820&r1=590819&r2=590820&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java
 (original)
+++ 
incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java
 Wed Oct 31 13:45:38 2007
@@ -74,7 +74,7 @@
             this.serviceContract = service.getInterfaceContract();
         }
         
-        setDataBinding(serviceContract.getInterface(), false);
+        setDataBinding(serviceContract.getInterface());
     }
 
     public InterfaceContract getBindingInterfaceContract() {
@@ -165,8 +165,7 @@
         return ((JavaInterface)targetInterface).getJavaClass();
     }
     
-    private void setDataBinding(Interface interfaze, boolean isReference) {
-        interfaze.setDefaultDataBinding(JSONDataBinding.NAME);
+    private void setDataBinding(Interface interfaze) {
         List<Operation> operations = interfaze.getOperations();
         for (Operation operation : operations) {
             operation.setDataBinding(JSONDataBinding.NAME);
@@ -174,22 +173,14 @@
             if (inputType != null) {
                 List<DataType> logical = inputType.getLogical();
                 for (DataType inArg : logical) {
-                    if 
(SimpleJavaDataBinding.NAME.equals(inArg.getDataBinding())) {
-                        if (!isReference) {
-                            inArg.setDataBinding(JSONDataBinding.NAME);
-                        }
-                    } else {
+                    if 
(!SimpleJavaDataBinding.NAME.equals(inArg.getDataBinding())) {
                         inArg.setDataBinding(JSONDataBinding.NAME);
-                    }
+                    } 
                 }
             }
             DataType outputType = operation.getOutputType();
             if (outputType != null) {
-                if 
(SimpleJavaDataBinding.NAME.equals(outputType.getDataBinding())) {
-                    if (!isReference) {
-                        outputType.setDataBinding(JSONDataBinding.NAME);
-                    }
-                } else {
+                if 
(!SimpleJavaDataBinding.NAME.equals(outputType.getDataBinding())) {
                     outputType.setDataBinding(JSONDataBinding.NAME);
                 }
             }



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]