[jboss-remoting-commits] JBoss Remoting SVN: r5811 - in remoting-mc-int/trunk: src/main/java/org/jboss/remoting3/metadata and 1 other directory.

[jboss-remoting-commits at lists.jboss.org]

Author: david.lloyd at jboss.com
Date: 2010-03-08 22:59:17 -0500 (Mon, 08 Mar 2010)
New Revision: 5811

Modified:
   remoting-mc-int/trunk/pom.xml
   remoting-mc-int/trunk/src/main/java/org/jboss/remoting3/metadata/RemotingHelper.java
Log:
Add dependency on River marshaller protocol

Modified: remoting-mc-int/trunk/pom.xml
===================================================================
--- remoting-mc-int/trunk/pom.xml	2010-03-09 02:45:02 UTC (rev 5810)
+++ remoting-mc-int/trunk/pom.xml	2010-03-09 03:59:17 UTC (rev 5811)
@@ -38,6 +38,11 @@
     <version>1.0.0.Beta1-SNAPSHOT</version>
     <dependencies>
         <dependency>
+            <groupId>org.jboss.marshalling</groupId>
+            <artifactId>jboss-marshalling-river</artifactId>
+            <version>1.3.0.CR2-SNAPSHOT</version>
+        </dependency>
+        <dependency>
             <groupId>org.jboss.remoting3</groupId>
             <artifactId>jboss-remoting</artifactId>
             <version>3.1.0.Beta2-SNAPSHOT</version>

Modified: remoting-mc-int/trunk/src/main/java/org/jboss/remoting3/metadata/RemotingHelper.java
===================================================================
--- remoting-mc-int/trunk/src/main/java/org/jboss/remoting3/metadata/RemotingHelper.java	2010-03-09 02:45:02 UTC (rev 5810)
+++ remoting-mc-int/trunk/src/main/java/org/jboss/remoting3/metadata/RemotingHelper.java	2010-03-09 03:59:17 UTC (rev 5811)
@@ -25,6 +25,7 @@
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executor;
+import org.jboss.marshalling.river.RiverProviderDescriptor;
 import org.jboss.remoting3.Endpoint;
 import org.jboss.remoting3.Remoting;
 import org.jboss.remoting3.UnknownURISchemeException;
@@ -33,6 +34,7 @@
 import org.jboss.remoting3.spi.ConnectionProviderContext;
 import org.jboss.remoting3.spi.ConnectionProviderFactory;
 import org.jboss.remoting3.spi.NetworkServerProvider;
+import org.jboss.remoting3.spi.ProtocolServiceType;
 import org.jboss.xnio.ChannelListener;
 import org.jboss.xnio.OptionMap;
 import org.jboss.xnio.SslTcpConnector;
@@ -50,8 +52,8 @@
     }
 
     public static Endpoint createEndpoint(final String name, final TcpConnector tcpConnector, final SslTcpConnector sslConnector, final Executor executor, final OptionMap optionMap) throws IOException {
-
         final Endpoint endpoint = Remoting.createEndpoint(name, executor, optionMap);
+        endpoint.addProtocolService(ProtocolServiceType.MARSHALLER_PROVIDER_DESCRIPTOR, "river", new RiverProviderDescriptor());
         endpoint.addConnectionProvider("remote", new ConnectionProviderFactory() {
             public ConnectionProvider createInstance(final ConnectionProviderContext context) {
                 return RemoteProtocol.getRemoteConnectionProvider(context, tcpConnector);