svn commit: r801654 - in /servicemix/components/bindings/servicemix-rmi/trunk: ./ src/main/java/org/apache/servicemix/rmi/ src/main/java/org/apache/servicemix/rmi/marshaler/

[jb...@apache.org]

Author: jbonofre
Date: Thu Aug  6 14:15:01 2009
New Revision: 801654

URL: http://svn.apache.org/viewvc?rev=801654&view=rev
Log:
Update to CXF 2.2.3.

Modified:
    servicemix/components/bindings/servicemix-rmi/trunk/pom.xml
    servicemix/components/bindings/servicemix-rmi/trunk/src/main/java/org/apache/servicemix/rmi/RmiProviderEndpoint.java
    servicemix/components/bindings/servicemix-rmi/trunk/src/main/java/org/apache/servicemix/rmi/marshaler/DefaultRmiMarshaler.java
    servicemix/components/bindings/servicemix-rmi/trunk/src/main/java/org/apache/servicemix/rmi/marshaler/RmiMarshalerSupport.java

Modified: servicemix/components/bindings/servicemix-rmi/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-rmi/trunk/pom.xml?rev=801654&r1=801653&r2=801654&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-rmi/trunk/pom.xml (original)
+++ servicemix/components/bindings/servicemix-rmi/trunk/pom.xml Thu Aug  6 14:15:01 2009
@@ -41,7 +41,7 @@
     <properties>
         <servicemix-version>3.3.1-SNAPSHOT</servicemix-version>
         <servicemix-shared-version>2009.01</servicemix-shared-version>
-        <cxf-version>2.2.3-SNAPSHOT</cxf-version>
+        <cxf-version>2.2.3</cxf-version>
         
         <servicemix.osgi.import>
             org.apache.servicemix;resolution:=optional,

Modified: servicemix/components/bindings/servicemix-rmi/trunk/src/main/java/org/apache/servicemix/rmi/RmiProviderEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-rmi/trunk/src/main/java/org/apache/servicemix/rmi/RmiProviderEndpoint.java?rev=801654&r1=801653&r2=801654&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-rmi/trunk/src/main/java/org/apache/servicemix/rmi/RmiProviderEndpoint.java (original)
+++ servicemix/components/bindings/servicemix-rmi/trunk/src/main/java/org/apache/servicemix/rmi/RmiProviderEndpoint.java Thu Aug  6 14:15:01 2009
@@ -230,7 +230,7 @@
             Object response = rmiExchange.invoke(stub);
             // TODO handle RMI invocation exception using exchange.setError();
             // marshal the response object into a normalized message
-            marshaler.handleRmiResponse(exchange, response);
+            marshaler.handleRmiResponse(exchange, response, rmiExchange.getMethod().getReturnType());
             // send the exchange into the NMR
             send(exchange);
         }

Modified: servicemix/components/bindings/servicemix-rmi/trunk/src/main/java/org/apache/servicemix/rmi/marshaler/DefaultRmiMarshaler.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-rmi/trunk/src/main/java/org/apache/servicemix/rmi/marshaler/DefaultRmiMarshaler.java?rev=801654&r1=801653&r2=801654&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-rmi/trunk/src/main/java/org/apache/servicemix/rmi/marshaler/DefaultRmiMarshaler.java (original)
+++ servicemix/components/bindings/servicemix-rmi/trunk/src/main/java/org/apache/servicemix/rmi/marshaler/DefaultRmiMarshaler.java Thu Aug  6 14:15:01 2009
@@ -24,6 +24,7 @@
 import javax.jbi.messaging.NormalizedMessage;
 
 import org.apache.cxf.databinding.DataBinding;
+import org.apache.cxf.databinding.DataWriter;
 import org.apache.servicemix.rmi.RmiExchange;
 
 /**
@@ -45,14 +46,15 @@
      * (non-Javadoc)
      * @see org.apache.servicemix.rmi.marshaler.RmiMarshalerSupport#toNMR(javax.jbi.messaging.NormalizedMessage, java.lang.Object, java.lang.reflect.Method, java.lang.Object[])
      */
-    public void handleRmiResponse(MessageExchange exchange, Object object) throws MessagingException {
+    public void handleRmiResponse(MessageExchange exchange, Object object, Class objectClass) throws MessagingException {
         if (exchange instanceof InOut) {
             // it's an InOut exchange
             // create the out message
             NormalizedMessage out = exchange.createMessage();
             // marshal the object using the data binding
-            //dataBinding.createWriter(Remote.class);
-            //out.setContent("");
+            DataWriter dataWriter = dataBinding.createWriter(objectClass);
+            // put the marshaled response into the out message
+            //out.setContent(dataWriter.write(arg0, arg1)));
         } else if (exchange instanceof InOptionalOut) {
             // it's an InOptionalOut, send the response only if the object is not null
             if (object != null) {

Modified: servicemix/components/bindings/servicemix-rmi/trunk/src/main/java/org/apache/servicemix/rmi/marshaler/RmiMarshalerSupport.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-rmi/trunk/src/main/java/org/apache/servicemix/rmi/marshaler/RmiMarshalerSupport.java?rev=801654&r1=801653&r2=801654&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-rmi/trunk/src/main/java/org/apache/servicemix/rmi/marshaler/RmiMarshalerSupport.java (original)
+++ servicemix/components/bindings/servicemix-rmi/trunk/src/main/java/org/apache/servicemix/rmi/marshaler/RmiMarshalerSupport.java Thu Aug  6 14:15:01 2009
@@ -59,8 +59,9 @@
      *  
      * @param exchange the message exchange.
      * @param object the response object.
+     * @param objectClass the response object type.
      * @throws MessagingException in case of marshaling failure.
      */
-    public void handleRmiResponse(MessageExchange exchange, Object object) throws MessagingException;
+    public void handleRmiResponse(MessageExchange exchange, Object object, Class objectClass) throws MessagingException;
 
 }