[jboss-remoting-commits] JBoss Remoting SVN: r4367 - in remoting3/trunk: api/src/main/java/org/jboss/cx/remoting/spi/stream and 1 other directories.

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

Author: david.lloyd at jboss.com
Date: 2008-07-07 20:50:00 -0400 (Mon, 07 Jul 2008)
New Revision: 4367

Modified:
   remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/stream/StreamSerializerFactory.java
   remoting3/trunk/build.properties
   remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/InputStreamStreamSerializerFactory.java
   remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/ObjectSourceStreamSerializerFactory.java
   remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/OutputStreamStreamSerailizerFactory.java
Log:
Switch to XNIO 1.0.0-CR3

Modified: remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/stream/StreamSerializerFactory.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/stream/StreamSerializerFactory.java	2008-07-08 00:45:48 UTC (rev 4366)
+++ remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/stream/StreamSerializerFactory.java	2008-07-08 00:50:00 UTC (rev 4367)
@@ -1,7 +1,7 @@
 package org.jboss.cx.remoting.spi.stream;
 
 import org.jboss.xnio.IoHandler;
-import org.jboss.xnio.Client;
+import org.jboss.xnio.ChannelSource;
 import org.jboss.xnio.channels.StreamChannel;
 import java.io.IOException;
 import java.io.Serializable;
@@ -12,5 +12,5 @@
 public interface StreamSerializerFactory extends Serializable {
     IoHandler<? super StreamChannel> getLocalSide(Object localSide) throws IOException;
 
-    Object getRemoteSide(Client<StreamChannel> remoteClient) throws IOException;
+    Object getRemoteSide(ChannelSource<StreamChannel> remoteClient) throws IOException;
 }

Modified: remoting3/trunk/build.properties
===================================================================
--- remoting3/trunk/build.properties	2008-07-08 00:45:48 UTC (rev 4366)
+++ remoting3/trunk/build.properties	2008-07-08 00:50:00 UTC (rev 4367)
@@ -173,7 +173,7 @@
 lib.trove.local=${local.repository}/${lib.trove.path}
 lib.trove.remote=${remote.repository}/${lib.trove.path}
 
-lib.xnio-api.version=1.0.0.CR2
+lib.xnio-api.version=1.0.0.CR3
 lib.xnio-api.name=xnio-api-${lib.xnio-api.version}.jar
 lib.xnio-api.license=lgpl
 lib.xnio-api.dir=maven2/org/jboss/xnio/xnio-api/${lib.xnio-api.version}/

Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/InputStreamStreamSerializerFactory.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/InputStreamStreamSerializerFactory.java	2008-07-08 00:45:48 UTC (rev 4366)
+++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/InputStreamStreamSerializerFactory.java	2008-07-08 00:50:00 UTC (rev 4367)
@@ -12,7 +12,7 @@
 import org.jboss.xnio.channels.CommonOptions;
 import org.jboss.xnio.channels.StreamSourceChannel;
 import org.jboss.xnio.IoHandler;
-import org.jboss.xnio.Client;
+import org.jboss.xnio.ChannelSource;
 import org.jboss.xnio.IoUtils;
 import org.jboss.xnio.BufferAllocator;
 import org.jboss.xnio.IoFuture;
@@ -43,7 +43,7 @@
         return new LocalHandler((InputStream) localSide, allocator);
     }
 
-    public Object getRemoteSide(final Client<StreamChannel> remoteClient) throws IOException {
+    public Object getRemoteSide(final ChannelSource<StreamChannel> remoteClient) throws IOException {
 //        return new RemoteInputStream(taskList, futureChannel);
         return null;
     }

Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/ObjectSourceStreamSerializerFactory.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/ObjectSourceStreamSerializerFactory.java	2008-07-08 00:45:48 UTC (rev 4366)
+++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/ObjectSourceStreamSerializerFactory.java	2008-07-08 00:50:00 UTC (rev 4367)
@@ -9,7 +9,7 @@
 import org.jboss.xnio.channels.StreamSinkChannel;
 import org.jboss.xnio.channels.CommonOptions;
 import org.jboss.xnio.IoHandler;
-import org.jboss.xnio.Client;
+import org.jboss.xnio.ChannelSource;
 import org.jboss.xnio.IoUtils;
 import org.jboss.xnio.log.Logger;
 
@@ -38,7 +38,7 @@
         return null;
     }
 
-    public Object getRemoteSide(final Client<StreamChannel> remoteClient) throws IOException {
+    public Object getRemoteSide(final ChannelSource<StreamChannel> remoteClient) throws IOException {
         return null;
     }
 

Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/OutputStreamStreamSerailizerFactory.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/OutputStreamStreamSerailizerFactory.java	2008-07-08 00:45:48 UTC (rev 4366)
+++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/OutputStreamStreamSerailizerFactory.java	2008-07-08 00:50:00 UTC (rev 4367)
@@ -10,7 +10,7 @@
 import org.jboss.xnio.channels.StreamSourceChannel;
 import org.jboss.xnio.channels.StreamSinkChannel;
 import org.jboss.xnio.IoHandler;
-import org.jboss.xnio.Client;
+import org.jboss.xnio.ChannelSource;
 import org.jboss.xnio.BufferAllocator;
 import org.jboss.xnio.IoUtils;
 import org.jboss.xnio.IoFuture;
@@ -36,7 +36,7 @@
         });
     }
 
-    public Object getRemoteSide(final Client<StreamChannel> remoteClient) throws IOException {
+    public Object getRemoteSide(final ChannelSource<StreamChannel> remoteClient) throws IOException {
         final RemoteHandler handler = new RemoteHandler(new BufferAllocator<ByteBuffer>() {
             public ByteBuffer allocate() {
                 return ByteBuffer.allocate(512);
@@ -45,7 +45,7 @@
             public void free(final ByteBuffer byteBuffer) {
             }
         });
-        final IoFuture<StreamChannel> futureChannel = remoteClient.connect(handler);
+        final IoFuture<StreamChannel> futureChannel = remoteClient.open(handler);
         return new RemoteOutputStream(handler, futureChannel);
     }