[jboss-remoting-commits] JBoss Remoting SVN: r5599 - in remoting3/trunk/samples: src/main/java/org/jboss/remoting3/samples/socket and 1 other directory.

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

Author: david.lloyd at jboss.com
Date: 2009-11-17 19:28:44 -0500 (Tue, 17 Nov 2009)
New Revision: 5599

Modified:
   remoting3/trunk/samples/pom.xml
   remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/socket/SocketProtocol.java
Log:
Samples now depend on junit... in compile scope

Modified: remoting3/trunk/samples/pom.xml
===================================================================
--- remoting3/trunk/samples/pom.xml	2009-11-17 23:22:30 UTC (rev 5598)
+++ remoting3/trunk/samples/pom.xml	2009-11-18 00:28:44 UTC (rev 5599)
@@ -40,6 +40,12 @@
             <version>3.1.0.CR1</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.2</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

Modified: remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/socket/SocketProtocol.java
===================================================================
--- remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/socket/SocketProtocol.java	2009-11-17 23:22:30 UTC (rev 5598)
+++ remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/socket/SocketProtocol.java	2009-11-18 00:28:44 UTC (rev 5599)
@@ -26,8 +26,8 @@
 
 import org.jboss.marshalling.MarshallerFactory;
 import org.jboss.marshalling.MarshallingConfiguration;
+import org.jboss.marshalling.Marshalling;
 import org.jboss.marshalling.reflect.SunReflectiveCreator;
-import org.jboss.marshalling.river.RiverMarshallerFactory;
 import org.jboss.remoting3.ClientListener;
 import org.jboss.remoting3.Endpoint;
 import org.jboss.remoting3.RequestListener;
@@ -110,7 +110,7 @@
    
    
    static public <I, O> void initializeMarshalling(Endpoint endpoint, Executor executor) {
-      marshallerFactory = new RiverMarshallerFactory();
+      marshallerFactory = Marshalling.getMarshallerFactory("river");
       marshallingConfiguration = new MarshallingConfiguration();
       marshallingConfiguration.setCreator(new SunReflectiveCreator());
       marshallingConfiguration.setObjectTable(new SocketObjectTable<I, O>(endpoint, executor));