You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2010/05/10 17:32:15 UTC
svn commit: r942790 - in
/servicemix/components/bindings/servicemix-rmi/trunk: ./
src/main/java/org/apache/servicemix/rmi/
src/main/java/org/apache/servicemix/rmi/marshaler/
Author: jbonofre
Date: Mon May 10 15:32:15 2010
New Revision: 942790
URL: http://svn.apache.org/viewvc?rev=942790&view=rev
Log:
Resuming work on servicemix-rmi to use CXF simple frontend.
Modified:
servicemix/components/bindings/servicemix-rmi/trunk/pom.xml
servicemix/components/bindings/servicemix-rmi/trunk/src/main/java/org/apache/servicemix/rmi/RmiConsumerEndpoint.java
servicemix/components/bindings/servicemix-rmi/trunk/src/main/java/org/apache/servicemix/rmi/RmiExchange.java
servicemix/components/bindings/servicemix-rmi/trunk/src/main/java/org/apache/servicemix/rmi/marshaler/DefaultRmiMarshaler.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=942790&r1=942789&r2=942790&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-rmi/trunk/pom.xml (original)
+++ servicemix/components/bindings/servicemix-rmi/trunk/pom.xml Mon May 10 15:32:15 2010
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4_0_0.xsd">
<!--
@@ -25,7 +23,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>components-pom</artifactId>
- <version>5</version>
+ <version>6-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix</groupId>
Modified: servicemix/components/bindings/servicemix-rmi/trunk/src/main/java/org/apache/servicemix/rmi/RmiConsumerEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-rmi/trunk/src/main/java/org/apache/servicemix/rmi/RmiConsumerEndpoint.java?rev=942790&r1=942789&r2=942790&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-rmi/trunk/src/main/java/org/apache/servicemix/rmi/RmiConsumerEndpoint.java (original)
+++ servicemix/components/bindings/servicemix-rmi/trunk/src/main/java/org/apache/servicemix/rmi/RmiConsumerEndpoint.java Mon May 10 15:32:15 2010
@@ -33,8 +33,8 @@ import javax.jbi.messaging.MessagingExce
import javax.jbi.messaging.NormalizedMessage;
import javax.wsdl.factory.WSDLFactory;
import javax.wsdl.xml.WSDLWriter;
-import javax.xml.namespace.QName;
+import org.apache.cxf.frontend.ClientProxyFactoryBean;
import org.apache.servicemix.common.endpoints.ConsumerEndpoint;
import org.apache.servicemix.rmi.marshaler.DefaultRmiMarshaler;
import org.apache.servicemix.rmi.marshaler.RmiMarshalerSupport;
@@ -242,6 +242,10 @@ public class RmiConsumerEndpoint extends
throw e;
}
} else {
+ // TODO use CXF ClientProxyFactoryBean to inject into the NMR, much easier
+ //ClientProxyFactoryBean clientProxyFactory = new ClientProxyFactoryBean();
+ //clientProxyFactory.setServiceClass(serviceClass);
+
// construct XML structure corresponding to the RMI call and send into the NMR
// create in-out exchange
InOut exchange = getExchangeFactory().createInOutExchange();
Modified: servicemix/components/bindings/servicemix-rmi/trunk/src/main/java/org/apache/servicemix/rmi/RmiExchange.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-rmi/trunk/src/main/java/org/apache/servicemix/rmi/RmiExchange.java?rev=942790&r1=942789&r2=942790&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-rmi/trunk/src/main/java/org/apache/servicemix/rmi/RmiExchange.java (original)
+++ servicemix/components/bindings/servicemix-rmi/trunk/src/main/java/org/apache/servicemix/rmi/RmiExchange.java Mon May 10 15:32:15 2010
@@ -31,6 +31,7 @@ public class RmiExchange {
private Object object;
private Method method;
private Object[] args;
+
public Object getObject() {
return object;
}
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=942790&r1=942789&r2=942790&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 Mon May 10 15:32:15 2010
@@ -23,7 +23,10 @@ import javax.jbi.messaging.MessageExchan
import javax.jbi.messaging.MessagingException;
import javax.jbi.messaging.NormalizedMessage;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.cxf.databinding.DataBinding;
+import org.apache.servicemix.jbi.jaxp.StringSource;
import org.apache.servicemix.rmi.RmiExchange;
/**
@@ -35,6 +38,8 @@ import org.apache.servicemix.rmi.RmiExch
*/
public class DefaultRmiMarshaler implements RmiMarshalerSupport {
+ private final static transient Log LOG = LogFactory.getLog(DefaultRmiMarshaler.class);
+
private DataBinding dataBinding;
public void setDataBinding(DataBinding dataBinding) {
@@ -73,8 +78,11 @@ public class DefaultRmiMarshaler impleme
* @see org.apache.servicemix.rmi.marshaler.RmiMarshalerSupport#rmiCallFromNMR(javax.jbi.messaging.NormalizedMessage)
*/
public void rmiExchangeToNmr(NormalizedMessage in, RmiExchange rmiExchange) throws MessagingException {
- // TODO get the operation in the exchange and construct the RMI method call using object in the in message
+ // marshal the RMI exchange into the "in" normalized message using JAXB
+ LOG.debug("Marshal a RMI exchange into the in normalized message using JAXB.");
+ // TODO only for testing purpose
+ in.setContent(new StringSource("<TEST></TEST>"));
}
}