activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r357725 [3/4] - in /incubator/activemq/trunk/activeio: ./ src/java/org/activeio/ src/java/org/activeio/adapter/ src/java/org/activeio/command/ src/java/org/activeio/filter/ src/java/org/activeio/journal/ src/java/org/activeio/journal/active...
Date Mon, 19 Dec 2005 16:52:42 GMT
Copied: incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/socket/SocketSyncChannel.java (from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/net/SocketSyncChannel.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/socket/SocketSyncChannel.java?p2=incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/socket/SocketSyncChannel.java&p1=incubator/activemq/trunk/activeio/src/java/org/activeio/net/SocketSyncChannel.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/net/SocketSyncChannel.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/socket/SocketSyncChannel.java Mon Dec 19 08:50:54 2005
@@ -16,23 +16,22 @@
  * 
  **/
 
-package org.activeio.net;
+package org.activeio.packet.sync.socket;
 
 import java.io.IOException;
-import java.net.InetAddress;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.Socket;
-import java.net.SocketAddress;
-import java.net.SocketException;
 import java.net.SocketTimeoutException;
 
-import org.activeio.ByteSequence;
-import org.activeio.Packet;
-import org.activeio.SyncChannel;
-import org.activeio.SyncChannelServer;
-import org.activeio.adapter.OutputStreamChannelToOutputStream;
 import org.activeio.packet.ByteArrayPacket;
+import org.activeio.packet.ByteSequence;
 import org.activeio.packet.EOSPacket;
 import org.activeio.packet.EmptyPacket;
+import org.activeio.packet.Packet;
+import org.activeio.packet.sync.SyncChannel;
+import org.activeio.packet.sync.SyncChannelServer;
+import org.activeio.stream.sync.socket.SocketStreamChannel;
 
 /**
  * A {@see org.activeio.SynchChannel} implementation that uses a {@see java.net.Socket}
@@ -40,12 +39,13 @@
  * 
  * @version $Revision$
  */
-public class SocketSyncChannel implements SyncChannel, SocketMetadata {
+public class SocketSyncChannel implements SyncChannel {
 
     protected static final int DEFAULT_BUFFER_SIZE = 64 * 1024;
     private final SocketStreamChannel channel;
     private Packet inputPacket;
-    private final OutputStreamChannelToOutputStream outputStream;
+    private final OutputStream os;
+    private final InputStream is;
     
     protected SocketSyncChannel(Socket socket) throws IOException {
         this(new SocketStreamChannel(socket));
@@ -53,30 +53,31 @@
 
     public SocketSyncChannel(SocketStreamChannel channel) throws IOException {
         this.channel = channel;
-        outputStream = new OutputStreamChannelToOutputStream(channel);
-        setReceiveBufferSize(DEFAULT_BUFFER_SIZE);
-        setSendBufferSize(DEFAULT_BUFFER_SIZE);
+        os = channel.getOutputStream();
+        is = channel.getInputStream();
+        channel.setReceiveBufferSize(DEFAULT_BUFFER_SIZE);
+        channel.setSendBufferSize(DEFAULT_BUFFER_SIZE);
     }
 
     /**
      * @see org.activeio.SynchChannel#read(long)
      */
-    synchronized public org.activeio.Packet read(long timeout) throws IOException {
+    synchronized public org.activeio.packet.Packet read(long timeout) throws IOException {
         try {
             
             if( timeout==SyncChannelServer.WAIT_FOREVER_TIMEOUT )
-                setSoTimeout( 0 );
+                channel.setSoTimeout( 0 );
             else if( timeout==SyncChannelServer.NO_WAIT_TIMEOUT )
-                setSoTimeout( 1 );
+                channel.setSoTimeout( 1 );
             else 
-                setSoTimeout( (int)timeout );
+                channel.setSoTimeout( (int)timeout );
 
             if( inputPacket==null || !inputPacket.hasRemaining() ) {
                 inputPacket = allocatePacket();
             }
             
             ByteSequence sequence = inputPacket.asByteSequence();
-            int size = channel.read(sequence.getData(), sequence.getOffset(), sequence.getLength());
+            int size = is.read(sequence.getData(), sequence.getOffset(), sequence.getLength());
             if( size == -1 )
                 return EOSPacket.EOS_PACKET;
             if( size == 0 )
@@ -102,22 +103,19 @@
         return new ByteArrayPacket(data);
     }
 
-    protected void setSoTimeout(int i) throws SocketException {
-        channel.setSoTimeout(i);
-    }
     
     /**
-     * @see org.activeio.Channel#write(org.activeio.Packet)
+     * @see org.activeio.Channel#write(org.activeio.packet.Packet)
      */
     public void write(Packet packet) throws IOException {
-        packet.writeTo(outputStream);
+        packet.writeTo(os);
     }
 
     /**
      * @see org.activeio.Channel#flush()
      */
     public void flush() throws IOException {
-        channel.flush();
+        os.flush();
     }
 
     /**
@@ -130,89 +128,10 @@
     public void start() throws IOException {
         channel.start();
     }
-    public void stop(long timeout) throws IOException {
-        channel.stop(timeout);
-    }
-    
-    public InetAddress getInetAddress() {
-        return channel.getInetAddress();
-    }
-    public boolean getKeepAlive() throws SocketException {
-        return channel.getKeepAlive();
-    }
-    public InetAddress getLocalAddress() {
-        return channel.getLocalAddress();
-    }
-    public int getLocalPort() {
-        return channel.getLocalPort();
-    }
-    public SocketAddress getLocalSocketAddress() {
-        return channel.getLocalSocketAddress();
-    }
-    public boolean getOOBInline() throws SocketException {
-        return channel.getOOBInline();
-    }
-    public int getPort() {
-        return channel.getPort();
-    }
-    public int getReceiveBufferSize() throws SocketException {
-        return channel.getReceiveBufferSize();
-    }
-    public SocketAddress getRemoteSocketAddress() {
-        return channel.getRemoteSocketAddress();
-    }
-    public boolean getReuseAddress() throws SocketException {
-        return channel.getReuseAddress();
-    }
-    public int getSendBufferSize() throws SocketException {
-        return channel.getSendBufferSize();
-    }
-    public int getSoLinger() throws SocketException {
-        return channel.getSoLinger();
-    }
-    public int getSoTimeout() throws SocketException {
-        return channel.getSoTimeout();
+    public void stop() throws IOException {
+        channel.stop();
     }
-    public boolean getTcpNoDelay() throws SocketException {
-        return channel.getTcpNoDelay();
-    }
-    public int getTrafficClass() throws SocketException {
-        return channel.getTrafficClass();
-    }
-    public boolean isBound() {
-        return channel.isBound();
-    }
-    public boolean isClosed() {
-        return channel.isClosed();
-    }
-    public boolean isConnected() {
-        return channel.isConnected();
-    }
-    public void setKeepAlive(boolean on) throws SocketException {
-        channel.setKeepAlive(on);
-    }
-    public void setOOBInline(boolean on) throws SocketException {
-        channel.setOOBInline(on);
-    }
-    public void setReceiveBufferSize(int size) throws SocketException {
-        channel.setReceiveBufferSize(size);
-    }
-    public void setReuseAddress(boolean on) throws SocketException {
-        channel.setReuseAddress(on);
-    }
-    public void setSendBufferSize(int size) throws SocketException {
-        channel.setSendBufferSize(size);
-    }
-    public void setSoLinger(boolean on, int linger) throws SocketException {
-        channel.setSoLinger(on, linger);
-    }
-    public void setTcpNoDelay(boolean on) throws SocketException {
-        channel.setTcpNoDelay(on);
-    }
-    public void setTrafficClass(int tc) throws SocketException {
-        channel.setTrafficClass(tc);
-    }
-    
+        
     public Object getAdapter(Class target) {
         if( target.isAssignableFrom(getClass()) ) {
             return this;

Copied: incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/socket/SocketSyncChannelFactory.java (from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/net/SocketSyncChannelFactory.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/socket/SocketSyncChannelFactory.java?p2=incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/socket/SocketSyncChannelFactory.java&p1=incubator/activemq/trunk/activeio/src/java/org/activeio/net/SocketSyncChannelFactory.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/net/SocketSyncChannelFactory.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/socket/SocketSyncChannelFactory.java Mon Dec 19 08:50:54 2005
@@ -15,7 +15,7 @@
  * limitations under the License. 
  * 
  **/
-package org.activeio.net;
+package org.activeio.packet.sync.socket;
 
 import java.io.IOException;
 import java.net.URI;
@@ -23,10 +23,13 @@
 import javax.net.ServerSocketFactory;
 import javax.net.SocketFactory;
 
-import org.activeio.StreamChannelServer;
-import org.activeio.SyncChannel;
-import org.activeio.SyncChannelFactory;
-import org.activeio.SyncChannelServer;
+import org.activeio.packet.sync.SyncChannel;
+import org.activeio.packet.sync.SyncChannelFactory;
+import org.activeio.packet.sync.SyncChannelServer;
+import org.activeio.stream.sync.StreamChannelServer;
+import org.activeio.stream.sync.socket.SocketStreamChannel;
+import org.activeio.stream.sync.socket.SocketStreamChannelFactory;
+import org.activeio.stream.sync.socket.SocketStreamChannelServer;
 
 /**
  * A TcpSynchChannelFactory creates {@see org.activeio.net.TcpSynchChannel}

Copied: incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/socket/SocketSyncChannelServer.java (from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/net/SocketSyncChannelServer.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/socket/SocketSyncChannelServer.java?p2=incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/socket/SocketSyncChannelServer.java&p1=incubator/activemq/trunk/activeio/src/java/org/activeio/net/SocketSyncChannelServer.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/net/SocketSyncChannelServer.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/socket/SocketSyncChannelServer.java Mon Dec 19 08:50:54 2005
@@ -16,14 +16,16 @@
  * 
  **/
 
-package org.activeio.net;
+package org.activeio.packet.sync.socket;
 
 import java.io.IOException;
 import java.net.ServerSocket;
 import java.net.URI;
 
 import org.activeio.Channel;
-import org.activeio.SyncChannelServer;
+import org.activeio.packet.sync.SyncChannelServer;
+import org.activeio.stream.sync.socket.SocketStreamChannel;
+import org.activeio.stream.sync.socket.SocketStreamChannelServer;
 
 /**
  * A SynchChannelServer that creates
@@ -81,8 +83,8 @@
         server.start();
     }
 
-    public void stop(long timeout) throws IOException {
-        server.stop(timeout);
+    public void stop() throws IOException {
+        server.stop();
     }
     
     public Object getAdapter(Class target) {

Copied: incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/ssl/SslSocketSyncChannelFactory.java (from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/net/SslSocketSyncChannelFactory.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/ssl/SslSocketSyncChannelFactory.java?p2=incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/ssl/SslSocketSyncChannelFactory.java&p1=incubator/activemq/trunk/activeio/src/java/org/activeio/net/SslSocketSyncChannelFactory.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/net/SslSocketSyncChannelFactory.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/ssl/SslSocketSyncChannelFactory.java Mon Dec 19 08:50:54 2005
@@ -15,10 +15,12 @@
  * limitations under the License. 
  * 
  **/
-package org.activeio.net;
+package org.activeio.packet.sync.ssl;
 
 import javax.net.ssl.SSLServerSocketFactory;
 import javax.net.ssl.SSLSocketFactory;
+
+import org.activeio.packet.sync.socket.SocketSyncChannelFactory;
 
 /**
  * A SslSynchChannelFactory creates {@see org.activeio.net.TcpSynchChannel}

Copied: incubator/activemq/trunk/activeio/src/java/org/activeio/stream/sync/StreamChannel.java (from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/StreamChannel.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/stream/sync/StreamChannel.java?p2=incubator/activemq/trunk/activeio/src/java/org/activeio/stream/sync/StreamChannel.java&p1=incubator/activemq/trunk/activeio/src/java/org/activeio/StreamChannel.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/StreamChannel.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/stream/sync/StreamChannel.java Mon Dec 19 08:50:54 2005
@@ -15,10 +15,19 @@
  *  limitations under the License.
  */
 
-package org.activeio;
+package org.activeio.stream.sync;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import org.activeio.Channel;
+
 
 /**
  * @version $Revision$
  */
-public interface StreamChannel extends OutputStreamChannel, InputStreamChannel {
+public interface StreamChannel extends Channel {
+    InputStream getInputStream() throws IOException;
+    OutputStream getOutputStream() throws IOException;
 }

Copied: incubator/activemq/trunk/activeio/src/java/org/activeio/stream/sync/StreamChannelFactory.java (from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/StreamChannelFactory.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/stream/sync/StreamChannelFactory.java?p2=incubator/activemq/trunk/activeio/src/java/org/activeio/stream/sync/StreamChannelFactory.java&p1=incubator/activemq/trunk/activeio/src/java/org/activeio/StreamChannelFactory.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/StreamChannelFactory.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/stream/sync/StreamChannelFactory.java Mon Dec 19 08:50:54 2005
@@ -14,7 +14,7 @@
 *  See the License for the specific language governing permissions and
 *  limitations under the License.
 */
-package org.activeio;
+package org.activeio.stream.sync;
 
 import java.io.IOException;
 import java.net.URI;

Copied: incubator/activemq/trunk/activeio/src/java/org/activeio/stream/sync/StreamChannelServer.java (from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/StreamChannelServer.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/stream/sync/StreamChannelServer.java?p2=incubator/activemq/trunk/activeio/src/java/org/activeio/stream/sync/StreamChannelServer.java&p1=incubator/activemq/trunk/activeio/src/java/org/activeio/StreamChannelServer.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/StreamChannelServer.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/stream/sync/StreamChannelServer.java Mon Dec 19 08:50:54 2005
@@ -14,9 +14,12 @@
 *  See the License for the specific language governing permissions and
 *  limitations under the License.
 */
-package org.activeio;
+package org.activeio.stream.sync;
 
 import java.io.IOException;
+
+import org.activeio.Channel;
+import org.activeio.ChannelServer;
 
 
 

Copied: incubator/activemq/trunk/activeio/src/java/org/activeio/stream/sync/socket/SocketMetadata.java (from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/net/SocketMetadata.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/stream/sync/socket/SocketMetadata.java?p2=incubator/activemq/trunk/activeio/src/java/org/activeio/stream/sync/socket/SocketMetadata.java&p1=incubator/activemq/trunk/activeio/src/java/org/activeio/net/SocketMetadata.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/net/SocketMetadata.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/stream/sync/socket/SocketMetadata.java Mon Dec 19 08:50:54 2005
@@ -15,7 +15,7 @@
  * limitations under the License. 
  * 
  **/
-package org.activeio.net;
+package org.activeio.stream.sync.socket;
 
 import java.net.InetAddress;
 import java.net.SocketAddress;
@@ -34,8 +34,6 @@
 
     public SocketAddress getLocalSocketAddress();
 
-    public boolean getOOBInline() throws SocketException;
-
     public int getPort();
 
     public int getReceiveBufferSize() throws SocketException;
@@ -46,6 +44,8 @@
 
     public int getSendBufferSize() throws SocketException;
 
+    public boolean getOOBInline() throws SocketException;
+
     public int getSoLinger() throws SocketException;
 
     public int getSoTimeout() throws SocketException;
@@ -71,6 +71,8 @@
     public void setSendBufferSize(int size) throws SocketException;
 
     public void setSoLinger(boolean on, int linger) throws SocketException;
+    
+    public void setSoTimeout(int i) throws SocketException;
 
     public void setTcpNoDelay(boolean on) throws SocketException;
 

Copied: incubator/activemq/trunk/activeio/src/java/org/activeio/stream/sync/socket/SocketStreamChannel.java (from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/net/SocketStreamChannel.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/stream/sync/socket/SocketStreamChannel.java?p2=incubator/activemq/trunk/activeio/src/java/org/activeio/stream/sync/socket/SocketStreamChannel.java&p1=incubator/activemq/trunk/activeio/src/java/org/activeio/net/SocketStreamChannel.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/net/SocketStreamChannel.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/stream/sync/socket/SocketStreamChannel.java Mon Dec 19 08:50:54 2005
@@ -16,7 +16,7 @@
  * 
  **/
 
-package org.activeio.net;
+package org.activeio.stream.sync.socket;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -26,7 +26,7 @@
 import java.net.SocketAddress;
 import java.net.SocketException;
 
-import org.activeio.StreamChannel;
+import org.activeio.stream.sync.StreamChannel;
 
 /**
  * A {@see org.activeio.StreamChannel} implementation that uses a {@see java.net.Socket}
@@ -42,13 +42,13 @@
     private boolean disposed;
     private int curentSoTimeout;
 
-    protected SocketStreamChannel(Socket socket) throws IOException {
+    public SocketStreamChannel(Socket socket) throws IOException {
         this.socket = socket;
         in = socket.getInputStream();
         out = socket.getOutputStream();        
     }
 
-    protected void setSoTimeout(int i) throws SocketException {
+    public void setSoTimeout(int i) throws SocketException {
         if( curentSoTimeout != i ) {
             socket.setSoTimeout(i);
             curentSoTimeout = i;
@@ -56,13 +56,6 @@
     }
     
     /**
-     * @see org.activeio.Channel#flush()
-     */
-    public void flush() throws IOException {
-        out.flush();
-    }
-
-    /**
      * @see org.activeio.Disposable#dispose()
      */
     public void dispose() {
@@ -86,7 +79,7 @@
 
     public void start() throws IOException {
     }
-    public void stop(long timeout) throws IOException {
+    public void stop() throws IOException {
     }
     
     public InetAddress getInetAddress() {
@@ -179,56 +172,16 @@
         return "Socket Connection: "+getLocalSocketAddress()+" -> "+getRemoteSocketAddress();
     }
 
-    public void write(byte[] data, int pos, int length) throws IOException {
-        out.write(data,pos,length);
+    public InputStream getInputStream() throws IOException {
+        return in;
     }
 
-    public void write(byte[] data) throws IOException {
-        out.write(data);
-    }
-
-    public void write(int data) throws IOException {
-        out.write(data);
-    }
-
-    public int available() throws IOException {
-        return in.available();
-    }
-
-    public void mark(int pos) {
-        in.mark(pos);
-    }
-
-    public boolean markSupported() {
-        return in.markSupported();
-    }
-
-    public int read(byte[] data, int offset, int length) throws IOException {
-        try {
-            return in.read(data, offset, length);
-        } catch (ArrayIndexOutOfBoundsException e) {
-            e.printStackTrace();
-            return 0;
-        }
-    }
-
-    public int read(byte[] data) throws IOException {
-        return in.read(data);
-    }
-
-    public void reset() throws IOException {
-        in.reset();
-    }
-
-    public long skip(long count) throws IOException {
-        return in.skip(count);
-    }
-
-    public int read() throws IOException {
-        return in.read();
+    public OutputStream getOutputStream() throws IOException {
+        return out;
     }
 
     public Socket getSocket() {
         return socket;
     }
+
 }

Copied: incubator/activemq/trunk/activeio/src/java/org/activeio/stream/sync/socket/SocketStreamChannelFactory.java (from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/net/SocketStreamChannelFactory.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/stream/sync/socket/SocketStreamChannelFactory.java?p2=incubator/activemq/trunk/activeio/src/java/org/activeio/stream/sync/socket/SocketStreamChannelFactory.java&p1=incubator/activemq/trunk/activeio/src/java/org/activeio/net/SocketStreamChannelFactory.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/net/SocketStreamChannelFactory.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/stream/sync/socket/SocketStreamChannelFactory.java Mon Dec 19 08:50:54 2005
@@ -15,7 +15,7 @@
  * limitations under the License. 
  * 
  **/
-package org.activeio.net;
+package org.activeio.stream.sync.socket;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -27,9 +27,10 @@
 import javax.net.ServerSocketFactory;
 import javax.net.SocketFactory;
 
-import org.activeio.StreamChannel;
-import org.activeio.StreamChannelFactory;
-import org.activeio.StreamChannelServer;
+import org.activeio.stream.sync.StreamChannel;
+import org.activeio.stream.sync.StreamChannelFactory;
+import org.activeio.stream.sync.StreamChannelServer;
+import org.activeio.util.URISupport;
 
 /**
  * A TcpStreamChannelFactory creates {@see org.activeio.net.TcpStreamChannel}

Copied: incubator/activemq/trunk/activeio/src/java/org/activeio/stream/sync/socket/SocketStreamChannelServer.java (from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/net/SocketStreamChannelServer.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/stream/sync/socket/SocketStreamChannelServer.java?p2=incubator/activemq/trunk/activeio/src/java/org/activeio/stream/sync/socket/SocketStreamChannelServer.java&p1=incubator/activemq/trunk/activeio/src/java/org/activeio/net/SocketStreamChannelServer.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/net/SocketStreamChannelServer.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/stream/sync/socket/SocketStreamChannelServer.java Mon Dec 19 08:50:54 2005
@@ -16,7 +16,7 @@
  * 
  **/
 
-package org.activeio.net;
+package org.activeio.stream.sync.socket;
 
 import java.io.IOException;
 import java.net.ServerSocket;
@@ -26,7 +26,7 @@
 import java.net.URI;
 
 import org.activeio.Channel;
-import org.activeio.StreamChannelServer;
+import org.activeio.stream.sync.StreamChannelServer;
 
 /**
  * A StreamChannelServer that creates
@@ -112,7 +112,7 @@
     public void start() throws IOException {
     }
 
-    public void stop(long timeout) throws IOException {
+    public void stop() throws IOException {
     }
     
     public Object getAdapter(Class target) {

Copied: incubator/activemq/trunk/activeio/src/java/org/activeio/util/ByteArrayInputStream.java (from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/ByteArrayInputStream.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/util/ByteArrayInputStream.java?p2=incubator/activemq/trunk/activeio/src/java/org/activeio/util/ByteArrayInputStream.java&p1=incubator/activemq/trunk/activeio/src/java/org/activeio/ByteArrayInputStream.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/ByteArrayInputStream.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/util/ByteArrayInputStream.java Mon Dec 19 08:50:54 2005
@@ -1,7 +1,9 @@
-package org.activeio;
+package org.activeio.util;
 
 import java.io.IOException;
 import java.io.InputStream;
+
+import org.activeio.packet.ByteSequence;
 
 /**
  * Very similar to the java.io.ByteArrayInputStream but this version 

Copied: incubator/activemq/trunk/activeio/src/java/org/activeio/util/ByteArrayOutputStream.java (from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/ByteArrayOutputStream.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/util/ByteArrayOutputStream.java?p2=incubator/activemq/trunk/activeio/src/java/org/activeio/util/ByteArrayOutputStream.java&p1=incubator/activemq/trunk/activeio/src/java/org/activeio/ByteArrayOutputStream.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/ByteArrayOutputStream.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/util/ByteArrayOutputStream.java Mon Dec 19 08:50:54 2005
@@ -1,6 +1,8 @@
-package org.activeio;
+package org.activeio.util;
 
 import java.io.OutputStream;
+
+import org.activeio.packet.ByteSequence;
 
 /**
  * Very similar to the java.io.ByteArrayOutputStream but this version 

Copied: incubator/activemq/trunk/activeio/src/java/org/activeio/util/FactoryFinder.java (from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/FactoryFinder.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/util/FactoryFinder.java?p2=incubator/activemq/trunk/activeio/src/java/org/activeio/util/FactoryFinder.java&p1=incubator/activemq/trunk/activeio/src/java/org/activeio/FactoryFinder.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/FactoryFinder.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/util/FactoryFinder.java Mon Dec 19 08:50:54 2005
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.activeio;
+package org.activeio.util;
 
 import java.io.BufferedInputStream;
 import java.io.IOException;

Copied: incubator/activemq/trunk/activeio/src/java/org/activeio/util/PacketAggregator.java (from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/filter/PacketAggregator.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/util/PacketAggregator.java?p2=incubator/activemq/trunk/activeio/src/java/org/activeio/util/PacketAggregator.java&p1=incubator/activemq/trunk/activeio/src/java/org/activeio/filter/PacketAggregator.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/filter/PacketAggregator.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/util/PacketAggregator.java Mon Dec 19 08:50:54 2005
@@ -14,15 +14,15 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.activeio.filter;
+package org.activeio.util;
 
 import java.io.IOException;
 
-import org.activeio.Packet;
-import org.activeio.PacketData;
 import org.activeio.packet.AppendedPacket;
 import org.activeio.packet.ByteArrayPacket;
 import org.activeio.packet.EOSPacket;
+import org.activeio.packet.Packet;
+import org.activeio.packet.PacketData;
 
 /**
  * @version $Revision$

Copied: incubator/activemq/trunk/activeio/src/java/org/activeio/util/URISupport.java (from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/net/URISupport.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/util/URISupport.java?p2=incubator/activemq/trunk/activeio/src/java/org/activeio/util/URISupport.java&p1=incubator/activemq/trunk/activeio/src/java/org/activeio/net/URISupport.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/net/URISupport.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/util/URISupport.java Mon Dec 19 08:50:54 2005
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.activeio.net;
+package org.activeio.util;
 
 import java.net.URI;
 import java.net.URISyntaxException;

Modified: incubator/activemq/trunk/activeio/src/java/org/activeio/xnet/SyncChannelServerDaemon.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/xnet/SyncChannelServerDaemon.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/xnet/SyncChannelServerDaemon.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/xnet/SyncChannelServerDaemon.java Mon Dec 19 08:50:54 2005
@@ -16,10 +16,10 @@
  */
 package org.activeio.xnet;
 
-import org.activeio.SyncChannel;
-import org.activeio.SyncChannelServer;
 import org.activeio.adapter.SyncChannelToSocket;
-import org.activeio.net.SocketSyncChannelFactory;
+import org.activeio.packet.sync.SyncChannel;
+import org.activeio.packet.sync.SyncChannelServer;
+import org.activeio.packet.sync.socket.SocketSyncChannelFactory;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -85,10 +85,10 @@
         stopped = true;
     }
 
-    public synchronized void doFail() {
+    public synchronized void doFail() throws IOException {
         doStop();
         if (server != null) {
-            server.dispose();
+            server.stop();
         }
     }
 
@@ -140,7 +140,7 @@
 
         if (server != null) {
             try {
-                server.dispose();
+                server.stop();
             } catch (Exception ioException) {
                 log.debug("Error cleaning up socked", ioException);
             }

Modified: incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/aio
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/aio?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/aio (original)
+++ incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/aio Mon Dec 19 08:50:54 2005
@@ -1 +1 @@
-AsyncChannelFactory.class=org.activeio.net.AIOAsyncChannelFactory
+AsyncChannelFactory.class=org.activeio.packet.async.aio.AIOAsyncChannelFactory

Modified: incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/datagram
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/datagram?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/datagram (original)
+++ incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/datagram Mon Dec 19 08:50:54 2005
@@ -1 +1 @@
-SyncChannelFactory.class=org.activeio.net.DatagramSocketSyncChannelFactory
\ No newline at end of file
+SyncChannelFactory.class=org.activeio.packet.sync.datagram.DatagramSocketSyncChannelFactory
\ No newline at end of file

Modified: incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/jxta
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/jxta?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/jxta (original)
+++ incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/jxta Mon Dec 19 08:50:54 2005
@@ -1 +1 @@
-SyncChannelFactory.class=org.activeio.net.JxtaSocketSyncChannelFactory
\ No newline at end of file
+SyncChannelFactory.class=org.activeio.packet.sync.jxta.JxtaSocketSyncChannelFactory
\ No newline at end of file

Modified: incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/multicast
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/multicast?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/multicast (original)
+++ incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/multicast Mon Dec 19 08:50:54 2005
@@ -1 +1 @@
-SyncChannelFactory.class=org.activeio.net.MulticastSocketSyncChannelFactory
\ No newline at end of file
+SyncChannelFactory.class=org.activeio.packet.sync.multicast.MulticastSocketSyncChannelFactory
\ No newline at end of file

Modified: incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/nio
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/nio?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/nio (original)
+++ incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/nio Mon Dec 19 08:50:54 2005
@@ -1,2 +1,2 @@
-SyncChannelFactory.class=org.activeio.net.NIOSyncChannelFactory
-AsyncChannelFactory.class=org.activeio.net.NIOAsyncChannelFactory
\ No newline at end of file
+SyncChannelFactory.class=org.activeio.packet.sync.nio.NIOSyncChannelFactory
+AsyncChannelFactory.class=org.activeio.packet.async.nio.NIOAsyncChannelFactory
\ No newline at end of file

Modified: incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/nio-async
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/nio-async?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/nio-async (original)
+++ incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/nio-async Mon Dec 19 08:50:54 2005
@@ -1 +1 @@
-AsyncChannelFactory.class=org.activeio.net.NIOAsyncChannelFactory
\ No newline at end of file
+AsyncChannelFactory.class=org.activeio.packet.async.nio.NIOAsyncChannelFactory
\ No newline at end of file

Modified: incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/nio-sync
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/nio-sync?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/nio-sync (original)
+++ incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/nio-sync Mon Dec 19 08:50:54 2005
@@ -1 +1 @@
-SyncChannelFactory.class=org.activeio.net.NIOSyncChannelFactory
\ No newline at end of file
+SyncChannelFactory.class=org.activeio.packet.sync.nio.NIOSyncChannelFactory
\ No newline at end of file

Modified: incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/socket
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/socket?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/socket (original)
+++ incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/socket Mon Dec 19 08:50:54 2005
@@ -1 +1 @@
-SyncChannelFactory.class=org.activeio.net.SocketSyncChannelFactory
\ No newline at end of file
+SyncChannelFactory.class=org.activeio.packet.sync.socket.SocketSyncChannelFactory
\ No newline at end of file

Modified: incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/ssl
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/ssl?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/ssl (original)
+++ incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/ssl Mon Dec 19 08:50:54 2005
@@ -1 +1 @@
-SyncChannelFactory.class=org.activeio.net.SslSocketSyncChannelFactory
\ No newline at end of file
+SyncChannelFactory.class=org.activeio.packet.sync.ssl.SslSocketSyncChannelFactory
\ No newline at end of file

Modified: incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/vmpipe
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/vmpipe?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/vmpipe (original)
+++ incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/vmpipe Mon Dec 19 08:50:54 2005
@@ -1 +1 @@
-AsyncChannelFactory.class=org.activeio.net.VMPipeAsyncChannelFactory
+AsyncChannelFactory.class=org.activeio.packet.async.vmpipe.VMPipeAsyncChannelFactory

Modified: incubator/activemq/trunk/activeio/src/test/org/activeio/ChannelFactoryTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/test/org/activeio/ChannelFactoryTest.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/test/org/activeio/ChannelFactoryTest.java (original)
+++ incubator/activemq/trunk/activeio/src/test/org/activeio/ChannelFactoryTest.java Mon Dec 19 08:50:54 2005
@@ -25,16 +25,20 @@
 
 import org.activeio.adapter.AsyncToSyncChannel;
 import org.activeio.adapter.SyncToAsyncChannel;
-import org.activeio.net.AIOAsyncChannel;
-import org.activeio.net.AIOSyncChannelServer;
-import org.activeio.net.NIOAsyncChannel;
-import org.activeio.net.NIOAsyncChannelServer;
-import org.activeio.net.NIOSyncChannel;
-import org.activeio.net.NIOSyncChannelServer;
-import org.activeio.net.SocketSyncChannel;
-import org.activeio.net.SocketSyncChannelServer;
-import org.activeio.net.VMPipeAsyncChannelPipe;
-import org.activeio.net.VMPipeAsyncChannelServer;
+import org.activeio.packet.async.AsyncChannel;
+import org.activeio.packet.async.AsyncChannelServer;
+import org.activeio.packet.async.aio.AIOAsyncChannel;
+import org.activeio.packet.async.aio.AIOSyncChannelServer;
+import org.activeio.packet.async.nio.NIOAsyncChannel;
+import org.activeio.packet.async.nio.NIOAsyncChannelServer;
+import org.activeio.packet.async.vmpipe.VMPipeAsyncChannelPipe;
+import org.activeio.packet.async.vmpipe.VMPipeAsyncChannelServer;
+import org.activeio.packet.sync.SyncChannel;
+import org.activeio.packet.sync.SyncChannelServer;
+import org.activeio.packet.sync.nio.NIOSyncChannel;
+import org.activeio.packet.sync.nio.NIOSyncChannelServer;
+import org.activeio.packet.sync.socket.SocketSyncChannel;
+import org.activeio.packet.sync.socket.SocketSyncChannelServer;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: incubator/activemq/trunk/activeio/src/test/org/activeio/PacketDataTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/test/org/activeio/PacketDataTest.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/test/org/activeio/PacketDataTest.java (original)
+++ incubator/activemq/trunk/activeio/src/test/org/activeio/PacketDataTest.java Mon Dec 19 08:50:54 2005
@@ -20,6 +20,7 @@
 import java.io.IOException;
 
 import org.activeio.packet.ByteArrayPacket;
+import org.activeio.packet.PacketData;
 
 import junit.framework.TestCase;
 

Modified: incubator/activemq/trunk/activeio/src/test/org/activeio/journal/JournalStatsFilter.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/test/org/activeio/journal/JournalStatsFilter.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/test/org/activeio/journal/JournalStatsFilter.java (original)
+++ incubator/activemq/trunk/activeio/src/test/org/activeio/journal/JournalStatsFilter.java Mon Dec 19 08:50:54 2005
@@ -21,7 +21,7 @@
 import java.io.PrintWriter;
 import java.io.StringWriter;
 
-import org.activeio.Packet;
+import org.activeio.packet.Packet;
 import org.activeio.stats.CountStatisticImpl;
 import org.activeio.stats.IndentPrinter;
 import org.activeio.stats.TimeStatisticImpl;

Modified: incubator/activemq/trunk/activeio/src/test/org/activeio/journal/active/JournalImplTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/test/org/activeio/journal/active/JournalImplTest.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/test/org/activeio/journal/active/JournalImplTest.java (original)
+++ incubator/activemq/trunk/activeio/src/test/org/activeio/journal/active/JournalImplTest.java Mon Dec 19 08:50:54 2005
@@ -22,11 +22,11 @@
 
 import junit.framework.TestCase;
 
-import org.activeio.Packet;
 import org.activeio.journal.InvalidRecordLocationException;
 import org.activeio.journal.Journal;
 import org.activeio.journal.RecordLocation;
 import org.activeio.packet.ByteArrayPacket;
+import org.activeio.packet.Packet;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/OnePortAsyncChannelServerTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/OnePortAsyncChannelServerTest.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/OnePortAsyncChannelServerTest.java (original)
+++ incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/OnePortAsyncChannelServerTest.java Mon Dec 19 08:50:54 2005
@@ -26,19 +26,19 @@
 import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
 
 import org.activeio.AcceptListener;
-import org.activeio.AsyncChannel;
-import org.activeio.AsyncChannelFactory;
-import org.activeio.AsyncChannelServer;
 import org.activeio.Channel;
-import org.activeio.FilterAsyncChannelServer;
-import org.activeio.FilterSyncChannel;
-import org.activeio.Packet;
-import org.activeio.SyncChannel;
 import org.activeio.adapter.AsyncToSyncChannel;
 import org.activeio.adapter.SyncToAsyncChannelFactory;
-import org.activeio.net.SocketMetadata;
-import org.activeio.net.SocketSyncChannelFactory;
 import org.activeio.packet.ByteArrayPacket;
+import org.activeio.packet.Packet;
+import org.activeio.packet.async.AsyncChannel;
+import org.activeio.packet.async.AsyncChannelFactory;
+import org.activeio.packet.async.AsyncChannelServer;
+import org.activeio.packet.async.FilterAsyncChannelServer;
+import org.activeio.packet.sync.FilterSyncChannel;
+import org.activeio.packet.sync.SyncChannel;
+import org.activeio.packet.sync.socket.SocketSyncChannelFactory;
+import org.activeio.stream.sync.socket.SocketMetadata;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -103,7 +103,7 @@
         ((SocketMetadata)channel.getAdapter(SocketMetadata.class)).setTcpNoDelay(true);
         channel.write(new ByteArrayPacket("GIOPcrapcrap".getBytes("UTF-8")));
         channel.flush();
-        channel.dispose();
+        channel.stop();
     }
 
     public void testUnknownAccept() throws IOException, URISyntaxException, InterruptedException {
@@ -132,7 +132,7 @@
             public void onAccept(Channel channel) {
                 SyncChannel syncChannel = AsyncToSyncChannel.adapt(channel);                
                 super.onAccept(new FilterSyncChannel(syncChannel) {
-                    public org.activeio.Packet read(long timeout) throws IOException {
+                    public org.activeio.packet.Packet read(long timeout) throws IOException {
                         Packet packet = super.read(timeout);
                         if( packet!=null && packet.hasRemaining() )
                             serverPacketCounter.incrementAndGet();

Copied: incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/jetty/JettyOnePortSocketListenerTest.java (from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/JettyOnePortSocketListenerTest.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/jetty/JettyOnePortSocketListenerTest.java?p2=incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/jetty/JettyOnePortSocketListenerTest.java&p1=incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/JettyOnePortSocketListenerTest.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/JettyOnePortSocketListenerTest.java (original)
+++ incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/jetty/JettyOnePortSocketListenerTest.java Mon Dec 19 08:50:54 2005
@@ -15,9 +15,10 @@
  * limitations under the License. 
  * 
  **/
-package org.activeio.oneport;
+package org.activeio.oneport.jetty;
 
-import org.activeio.oneport.JettyOnePortSocketListener;
+import org.activeio.oneport.OnePortAsyncChannelServerTest;
+import org.activeio.oneport.jetty.JettyOnePortSocketListener;
 import org.mortbay.http.HttpContext;
 import org.mortbay.http.HttpServer;
 import org.mortbay.jetty.servlet.ServletHandler;

Copied: incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/jetty/TestServlet.java (from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/TestServlet.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/jetty/TestServlet.java?p2=incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/jetty/TestServlet.java&p1=incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/TestServlet.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/TestServlet.java (original)
+++ incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/jetty/TestServlet.java Mon Dec 19 08:50:54 2005
@@ -15,7 +15,7 @@
  * limitations under the License. 
  * 
  **/
-package org.activeio.oneport;
+package org.activeio.oneport.jetty;
 
 import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
 

Copied: incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/OpenORBOnePortSocketFactoryTest.java (from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/OpenORBOnePortSocketFactoryTest.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/OpenORBOnePortSocketFactoryTest.java?p2=incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/OpenORBOnePortSocketFactoryTest.java&p1=incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/OpenORBOnePortSocketFactoryTest.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/OpenORBOnePortSocketFactoryTest.java (original)
+++ incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/OpenORBOnePortSocketFactoryTest.java Mon Dec 19 08:50:54 2005
@@ -15,19 +15,20 @@
  * limitations under the License. 
  * 
  **/
-package org.activeio.oneport;
+package org.activeio.oneport.openorb;
 
-import edu.emory.mathcs.backport.java.util.concurrent.BlockingQueue;
+import java.rmi.RemoteException;
+import java.util.Properties;
+
+import javax.naming.NamingException;
 
+import org.activeio.oneport.OnePortAsyncChannelServerTest;
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.Object;
 import org.omg.PortableServer.POA;
 import org.omg.PortableServer.POAHelper;
 
-import javax.naming.NamingException;
-
-import java.rmi.RemoteException;
-import java.util.Properties;
+import edu.emory.mathcs.backport.java.util.concurrent.BlockingQueue;
 
 /**
  * 
@@ -44,7 +45,7 @@
         staticResultSlot = resultSlot;
         
         Properties props = new Properties();        
-        props.setProperty("org.omg.PortableInterceptor.ORBInitializerClass.org.activeio.oneport.OpenORBOpenPortFeatureInitializer", "");
+        props.setProperty("org.omg.PortableInterceptor.ORBInitializerClass."+OpenORBOpenPortFeatureInitializer.class.getName(), "");
         props.setProperty("org.omg.CORBA.ORBClass", "org.openorb.orb.core.ORB");
         props.setProperty("org.omg.CORBA.ORBSingletonClass", "org.openorb.orb.core.ORBSingleton"); 
 

Copied: incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/TestIIOPServer.java (from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/TestIIOPServer.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/TestIIOPServer.java?p2=incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/TestIIOPServer.java&p1=incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/TestIIOPServer.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/TestIIOPServer.java (original)
+++ incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/TestIIOPServer.java Mon Dec 19 08:50:54 2005
@@ -1,4 +1,4 @@
-package org.activeio.oneport;
+package org.activeio.oneport.openorb;
 
 /**
  * Interface definition: TestIIOPServer.

Copied: incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/TestIIOPServerHelper.java (from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/TestIIOPServerHelper.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/TestIIOPServerHelper.java?p2=incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/TestIIOPServerHelper.java&p1=incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/TestIIOPServerHelper.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/TestIIOPServerHelper.java (original)
+++ incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/TestIIOPServerHelper.java Mon Dec 19 08:50:54 2005
@@ -1,4 +1,5 @@
-package org.activeio.oneport;
+package org.activeio.oneport.openorb;
+
 
 /** 
  * Helper class for : TestIIOPServer
@@ -12,7 +13,7 @@
      * @param a an any
      * @param t TestIIOPServer value
      */
-    public static void insert(org.omg.CORBA.Any a, org.activeio.oneport.TestIIOPServer t)
+    public static void insert(org.omg.CORBA.Any a, org.activeio.oneport.openorb.TestIIOPServer t)
     {
         a.insert_Object(t , type());
     }
@@ -23,7 +24,7 @@
      * @param a an any
      * @return the extracted TestIIOPServer value
      */
-    public static org.activeio.oneport.TestIIOPServer extract( org.omg.CORBA.Any a )
+    public static org.activeio.oneport.openorb.TestIIOPServer extract( org.omg.CORBA.Any a )
     {
         if ( !a.type().equivalent( type() ) )
         {
@@ -31,7 +32,7 @@
         }
         try
         {
-            return org.activeio.oneport.TestIIOPServerHelper.narrow( a.extract_Object() );
+            return org.activeio.oneport.openorb.TestIIOPServerHelper.narrow( a.extract_Object() );
         }
         catch ( final org.omg.CORBA.BAD_PARAM e )
         {
@@ -73,9 +74,9 @@
      * @param istream the input stream
      * @return the readed TestIIOPServer value
      */
-    public static org.activeio.oneport.TestIIOPServer read(org.omg.CORBA.portable.InputStream istream)
+    public static org.activeio.oneport.openorb.TestIIOPServer read(org.omg.CORBA.portable.InputStream istream)
     {
-        return(org.activeio.oneport.TestIIOPServer)istream.read_Object(org.activeio.oneport._TestIIOPServerStub.class);
+        return(org.activeio.oneport.openorb.TestIIOPServer)istream.read_Object(org.activeio.oneport.openorb._TestIIOPServerStub.class);
     }
 
     /**
@@ -83,7 +84,7 @@
      * @param ostream the output stream
      * @param value TestIIOPServer value
      */
-    public static void write(org.omg.CORBA.portable.OutputStream ostream, org.activeio.oneport.TestIIOPServer value)
+    public static void write(org.omg.CORBA.portable.OutputStream ostream, org.activeio.oneport.openorb.TestIIOPServer value)
     {
         ostream.write_Object((org.omg.CORBA.portable.ObjectImpl)value);
     }

Copied: incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/TestIIOPServerHolder.java (from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/TestIIOPServerHolder.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/TestIIOPServerHolder.java?p2=incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/TestIIOPServerHolder.java&p1=incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/TestIIOPServerHolder.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/TestIIOPServerHolder.java (original)
+++ incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/TestIIOPServerHolder.java Mon Dec 19 08:50:54 2005
@@ -1,4 +1,4 @@
-package org.activeio.oneport;
+package org.activeio.oneport.openorb;
 
 /**
  * Holder class for : TestIIOPServer
@@ -11,7 +11,7 @@
     /**
      * Internal TestIIOPServer value
      */
-    public org.activeio.oneport.TestIIOPServer value;
+    public org.activeio.oneport.openorb.TestIIOPServer value;
 
     /**
      * Default constructor
@@ -23,7 +23,7 @@
      * Constructor with value initialisation
      * @param initial the initial value
      */
-    public TestIIOPServerHolder(org.activeio.oneport.TestIIOPServer initial)
+    public TestIIOPServerHolder(org.activeio.oneport.openorb.TestIIOPServer initial)
     {
         value = initial;
     }

Copied: incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/TestIIOPServerImpl.java (from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/TestIIOPServerImpl.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/TestIIOPServerImpl.java?p2=incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/TestIIOPServerImpl.java&p1=incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/TestIIOPServerImpl.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/TestIIOPServerImpl.java (original)
+++ incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/TestIIOPServerImpl.java Mon Dec 19 08:50:54 2005
@@ -15,7 +15,7 @@
  * limitations under the License. 
  * 
  **/
-package org.activeio.oneport;
+package org.activeio.oneport.openorb;
 
 import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
 

Copied: incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/TestIIOPServerOperations.java (from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/TestIIOPServerOperations.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/TestIIOPServerOperations.java?p2=incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/TestIIOPServerOperations.java&p1=incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/TestIIOPServerOperations.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/TestIIOPServerOperations.java (original)
+++ incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/TestIIOPServerOperations.java Mon Dec 19 08:50:54 2005
@@ -1,4 +1,4 @@
-package org.activeio.oneport;
+package org.activeio.oneport.openorb;
 
 /**
  * Interface definition: TestIIOPServer.

Copied: incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/TestIIOPServerPOA.java (from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/TestIIOPServerPOA.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/TestIIOPServerPOA.java?p2=incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/TestIIOPServerPOA.java&p1=incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/TestIIOPServerPOA.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/TestIIOPServerPOA.java (original)
+++ incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/TestIIOPServerPOA.java Mon Dec 19 08:50:54 2005
@@ -1,4 +1,4 @@
-package org.activeio.oneport;
+package org.activeio.oneport.openorb;
 
 /**
  * Interface definition: TestIIOPServer.

Copied: incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/TestIIOPServerPOATie.java (from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/TestIIOPServerPOATie.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/TestIIOPServerPOATie.java?p2=incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/TestIIOPServerPOATie.java&p1=incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/TestIIOPServerPOATie.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/TestIIOPServerPOATie.java (original)
+++ incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/TestIIOPServerPOATie.java Mon Dec 19 08:50:54 2005
@@ -1,4 +1,4 @@
-package org.activeio.oneport;
+package org.activeio.oneport.openorb;
 
 /**
  * Interface definition: TestIIOPServer.

Copied: incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/_TestIIOPServerStub.java (from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/_TestIIOPServerStub.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/_TestIIOPServerStub.java?p2=incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/_TestIIOPServerStub.java&p1=incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/_TestIIOPServerStub.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/_TestIIOPServerStub.java (original)
+++ incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/_TestIIOPServerStub.java Mon Dec 19 08:50:54 2005
@@ -1,4 +1,5 @@
-package org.activeio.oneport;
+package org.activeio.oneport.openorb;
+
 
 /**
  * Interface definition: TestIIOPServer.
@@ -18,7 +19,7 @@
      return _ids_list;
     }
 
-    private final static Class _opsClass = org.activeio.oneport.TestIIOPServerOperations.class;
+    private final static Class _opsClass = org.activeio.oneport.openorb.TestIIOPServerOperations.class;
 
     /**
      * Operation test
@@ -55,7 +56,7 @@
                 org.omg.CORBA.portable.ServantObject _so = _servant_preinvoke("test",_opsClass);
                 if (_so == null)
                    continue;
-                org.activeio.oneport.TestIIOPServerOperations _self = (org.activeio.oneport.TestIIOPServerOperations) _so.servant;
+                org.activeio.oneport.openorb.TestIIOPServerOperations _self = (org.activeio.oneport.openorb.TestIIOPServerOperations) _so.servant;
                 try
                 {
                     _self.test();

Modified: incubator/activemq/trunk/activeio/src/test/org/activeio/packet/AppendedPacketTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/test/org/activeio/packet/AppendedPacketTest.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/test/org/activeio/packet/AppendedPacketTest.java (original)
+++ incubator/activemq/trunk/activeio/src/test/org/activeio/packet/AppendedPacketTest.java Mon Dec 19 08:50:54 2005
@@ -16,7 +16,6 @@
  */
 package org.activeio.packet;
 
-import org.activeio.Packet;
 
 /**
  */

Modified: incubator/activemq/trunk/activeio/src/test/org/activeio/packet/ByteArrayPacketTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/test/org/activeio/packet/ByteArrayPacketTest.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/test/org/activeio/packet/ByteArrayPacketTest.java (original)
+++ incubator/activemq/trunk/activeio/src/test/org/activeio/packet/ByteArrayPacketTest.java Mon Dec 19 08:50:54 2005
@@ -16,7 +16,6 @@
  */
 package org.activeio.packet;
 
-import org.activeio.Packet;
 
 /**
  */

Modified: incubator/activemq/trunk/activeio/src/test/org/activeio/packet/ByteBufferPacketTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/test/org/activeio/packet/ByteBufferPacketTest.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/test/org/activeio/packet/ByteBufferPacketTest.java (original)
+++ incubator/activemq/trunk/activeio/src/test/org/activeio/packet/ByteBufferPacketTest.java Mon Dec 19 08:50:54 2005
@@ -18,7 +18,6 @@
 
 import java.nio.ByteBuffer;
 
-import org.activeio.Packet;
 
 /**
  */

Copied: incubator/activemq/trunk/activeio/src/test/org/activeio/packet/ClientLoadSimulator.java (from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/net/benchmark/ClientLoadSimulator.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/test/org/activeio/packet/ClientLoadSimulator.java?p2=incubator/activemq/trunk/activeio/src/test/org/activeio/packet/ClientLoadSimulator.java&p1=incubator/activemq/trunk/activeio/src/test/org/activeio/net/benchmark/ClientLoadSimulator.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/test/org/activeio/net/benchmark/ClientLoadSimulator.java (original)
+++ incubator/activemq/trunk/activeio/src/test/org/activeio/packet/ClientLoadSimulator.java Mon Dec 19 08:50:54 2005
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.activeio.net.benchmark;
+package org.activeio.packet;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
@@ -25,10 +25,10 @@
 import java.util.Iterator;
 
 import org.activeio.ChannelFactory;
-import org.activeio.Packet;
-import org.activeio.SyncChannel;
 import org.activeio.packet.ByteArrayPacket;
 import org.activeio.packet.EOSPacket;
+import org.activeio.packet.Packet;
+import org.activeio.packet.sync.SyncChannel;
 import org.activeio.stats.CountStatisticImpl;
 import org.activeio.stats.TimeStatisticImpl;
 import org.apache.commons.beanutils.BeanUtils;

Modified: incubator/activemq/trunk/activeio/src/test/org/activeio/packet/PacketTestSupport.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/test/org/activeio/packet/PacketTestSupport.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/test/org/activeio/packet/PacketTestSupport.java (original)
+++ incubator/activemq/trunk/activeio/src/test/org/activeio/packet/PacketTestSupport.java Mon Dec 19 08:50:54 2005
@@ -20,7 +20,6 @@
 
 import junit.framework.TestCase;
 
-import org.activeio.Packet;
 
 /**
  */

Copied: incubator/activemq/trunk/activeio/src/test/org/activeio/packet/Server.java (from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/net/benchmark/Server.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/test/org/activeio/packet/Server.java?p2=incubator/activemq/trunk/activeio/src/test/org/activeio/packet/Server.java&p1=incubator/activemq/trunk/activeio/src/test/org/activeio/net/benchmark/Server.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/test/org/activeio/net/benchmark/Server.java (original)
+++ incubator/activemq/trunk/activeio/src/test/org/activeio/packet/Server.java Mon Dec 19 08:50:54 2005
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.activeio.net.benchmark;
+package org.activeio.packet;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
@@ -23,14 +23,14 @@
 import java.util.HashMap;
 
 import org.activeio.AcceptListener;
-import org.activeio.AsyncChannel;
-import org.activeio.AsyncChannelListener;
-import org.activeio.AsyncChannelServer;
 import org.activeio.Channel;
 import org.activeio.ChannelFactory;
-import org.activeio.Packet;
 import org.activeio.adapter.SyncToAsyncChannel;
 import org.activeio.packet.EOSPacket;
+import org.activeio.packet.Packet;
+import org.activeio.packet.async.AsyncChannel;
+import org.activeio.packet.async.AsyncChannelListener;
+import org.activeio.packet.async.AsyncChannelServer;
 import org.activeio.stats.CountStatisticImpl;
 import org.apache.commons.beanutils.BeanUtils;
 
@@ -109,7 +109,7 @@
             }
             
             System.out.println("Stopping server.");
-            server.stop(1000*5);
+            server.stop();
             server.dispose();
             
         } catch (IOException e) {

Copied: incubator/activemq/trunk/activeio/src/test/org/activeio/packet/async/aio/AIOAsyncChannelTest.java (from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/net/AIOAsyncChannelTest.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/test/org/activeio/packet/async/aio/AIOAsyncChannelTest.java?p2=incubator/activemq/trunk/activeio/src/test/org/activeio/packet/async/aio/AIOAsyncChannelTest.java&p1=incubator/activemq/trunk/activeio/src/test/org/activeio/net/AIOAsyncChannelTest.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/test/org/activeio/net/AIOAsyncChannelTest.java (original)
+++ incubator/activemq/trunk/activeio/src/test/org/activeio/packet/async/aio/AIOAsyncChannelTest.java Mon Dec 19 08:50:54 2005
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.activeio.net;
+package org.activeio.packet.async.aio;
 
 import java.io.IOException;
 import java.net.URI;
@@ -22,6 +22,8 @@
 
 import org.activeio.Channel;
 import org.activeio.ChannelServer;
+import org.activeio.packet.async.aio.AIOAsyncChannelFactory;
+import org.activeio.packet.sync.SyncChannelTestSupport;
 
 /**
  * @version $Revision$

Copied: incubator/activemq/trunk/activeio/src/test/org/activeio/packet/async/nio/NIOAsyncChannelTest.java (from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/net/NIOAsyncChannelTest.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/test/org/activeio/packet/async/nio/NIOAsyncChannelTest.java?p2=incubator/activemq/trunk/activeio/src/test/org/activeio/packet/async/nio/NIOAsyncChannelTest.java&p1=incubator/activemq/trunk/activeio/src/test/org/activeio/net/NIOAsyncChannelTest.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/test/org/activeio/net/NIOAsyncChannelTest.java (original)
+++ incubator/activemq/trunk/activeio/src/test/org/activeio/packet/async/nio/NIOAsyncChannelTest.java Mon Dec 19 08:50:54 2005
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.activeio.net;
+package org.activeio.packet.async.nio;
 
 import java.io.IOException;
 import java.net.URI;
@@ -22,6 +22,8 @@
 
 import org.activeio.Channel;
 import org.activeio.ChannelServer;
+import org.activeio.packet.async.nio.NIOAsyncChannelFactory;
+import org.activeio.packet.sync.SyncChannelTestSupport;
 
 /**
  * @version $Revision$

Copied: incubator/activemq/trunk/activeio/src/test/org/activeio/packet/async/vmpipe/VMPipeAsyncChannelTest.java (from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/net/VMPipeAsyncChannelTest.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/test/org/activeio/packet/async/vmpipe/VMPipeAsyncChannelTest.java?p2=incubator/activemq/trunk/activeio/src/test/org/activeio/packet/async/vmpipe/VMPipeAsyncChannelTest.java&p1=incubator/activemq/trunk/activeio/src/test/org/activeio/net/VMPipeAsyncChannelTest.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/test/org/activeio/net/VMPipeAsyncChannelTest.java (original)
+++ incubator/activemq/trunk/activeio/src/test/org/activeio/packet/async/vmpipe/VMPipeAsyncChannelTest.java Mon Dec 19 08:50:54 2005
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.activeio.net;
+package org.activeio.packet.async.vmpipe;
 
 import java.io.IOException;
 import java.net.URI;
@@ -22,6 +22,8 @@
 
 import org.activeio.Channel;
 import org.activeio.ChannelServer;
+import org.activeio.packet.async.vmpipe.VMPipeAsyncChannelFactory;
+import org.activeio.packet.sync.SyncChannelTestSupport;
 
 /**
  * @version $Revision$

Copied: incubator/activemq/trunk/activeio/src/test/org/activeio/packet/async/vmpipe/VMPipeReflectionAsyncChannelTest.java (from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/net/VMPipeReflectionAsyncChannelTest.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/test/org/activeio/packet/async/vmpipe/VMPipeReflectionAsyncChannelTest.java?p2=incubator/activemq/trunk/activeio/src/test/org/activeio/packet/async/vmpipe/VMPipeReflectionAsyncChannelTest.java&p1=incubator/activemq/trunk/activeio/src/test/org/activeio/net/VMPipeReflectionAsyncChannelTest.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/test/org/activeio/net/VMPipeReflectionAsyncChannelTest.java (original)
+++ incubator/activemq/trunk/activeio/src/test/org/activeio/packet/async/vmpipe/VMPipeReflectionAsyncChannelTest.java Mon Dec 19 08:50:54 2005
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.activeio.net;
+package org.activeio.packet.async.vmpipe;
 
 import java.io.IOException;
 import java.net.URI;
@@ -22,6 +22,8 @@
 
 import org.activeio.Channel;
 import org.activeio.ChannelServer;
+import org.activeio.packet.async.vmpipe.VMPipeAsyncChannelFactory;
+import org.activeio.packet.sync.SyncChannelTestSupport;
 
 /**
  * @version $Revision$

Copied: incubator/activemq/trunk/activeio/src/test/org/activeio/packet/nio/NIOSyncChannelTest.java (from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/net/NIOSyncChannelTest.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/test/org/activeio/packet/nio/NIOSyncChannelTest.java?p2=incubator/activemq/trunk/activeio/src/test/org/activeio/packet/nio/NIOSyncChannelTest.java&p1=incubator/activemq/trunk/activeio/src/test/org/activeio/net/NIOSyncChannelTest.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/test/org/activeio/net/NIOSyncChannelTest.java (original)
+++ incubator/activemq/trunk/activeio/src/test/org/activeio/packet/nio/NIOSyncChannelTest.java Mon Dec 19 08:50:54 2005
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.activeio.net;
+package org.activeio.packet.nio;
 
 import java.io.IOException;
 import java.net.URI;
@@ -22,6 +22,8 @@
 
 import org.activeio.Channel;
 import org.activeio.ChannelServer;
+import org.activeio.packet.sync.SyncChannelTestSupport;
+import org.activeio.packet.sync.nio.NIOSyncChannelFactory;
 
 /**
  * @version $Revision$

Copied: incubator/activemq/trunk/activeio/src/test/org/activeio/packet/sync/ConnectionlessSyncChannelTestSupport.java (from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/net/ConnectionlessSyncChannelTestSupport.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/test/org/activeio/packet/sync/ConnectionlessSyncChannelTestSupport.java?p2=incubator/activemq/trunk/activeio/src/test/org/activeio/packet/sync/ConnectionlessSyncChannelTestSupport.java&p1=incubator/activemq/trunk/activeio/src/test/org/activeio/net/ConnectionlessSyncChannelTestSupport.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/test/org/activeio/net/ConnectionlessSyncChannelTestSupport.java (original)
+++ incubator/activemq/trunk/activeio/src/test/org/activeio/packet/sync/ConnectionlessSyncChannelTestSupport.java Mon Dec 19 08:50:54 2005
@@ -14,17 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activeio.net;
+package org.activeio.packet.sync;
 
 import edu.emory.mathcs.backport.java.util.concurrent.Executor;
 import edu.emory.mathcs.backport.java.util.concurrent.ScheduledThreadPoolExecutor;
 
 import org.activeio.Channel;
-import org.activeio.Packet;
-import org.activeio.SyncChannel;
 import org.activeio.adapter.AsyncToSyncChannel;
 import org.activeio.packet.ByteArrayPacket;
 import org.activeio.packet.FilterPacket;
+import org.activeio.packet.Packet;
+import org.activeio.packet.sync.SyncChannel;
+import org.activeio.packet.sync.datagram.DatagramContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Copied: incubator/activemq/trunk/activeio/src/test/org/activeio/packet/sync/SlowWriteSyncChannelFactory.java (from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/net/SlowWriteSyncChannelFactory.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/test/org/activeio/packet/sync/SlowWriteSyncChannelFactory.java?p2=incubator/activemq/trunk/activeio/src/test/org/activeio/packet/sync/SlowWriteSyncChannelFactory.java&p1=incubator/activemq/trunk/activeio/src/test/org/activeio/net/SlowWriteSyncChannelFactory.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/test/org/activeio/net/SlowWriteSyncChannelFactory.java (original)
+++ incubator/activemq/trunk/activeio/src/test/org/activeio/packet/sync/SlowWriteSyncChannelFactory.java Mon Dec 19 08:50:54 2005
@@ -15,19 +15,19 @@
  * limitations under the License. 
  * 
  **/
-package org.activeio.net;
+package org.activeio.packet.sync;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.net.URI;
 
 import org.activeio.Channel;
-import org.activeio.FilterSyncChannel;
-import org.activeio.FilterSyncChannelServer;
-import org.activeio.Packet;
-import org.activeio.SyncChannel;
-import org.activeio.SyncChannelFactory;
-import org.activeio.SyncChannelServer;
+import org.activeio.packet.Packet;
+import org.activeio.packet.sync.FilterSyncChannel;
+import org.activeio.packet.sync.FilterSyncChannelServer;
+import org.activeio.packet.sync.SyncChannel;
+import org.activeio.packet.sync.SyncChannelFactory;
+import org.activeio.packet.sync.SyncChannelServer;
 
 /**
  * Makes all the channels produced by another [@see org.activeio.SyncChannelFactory}

Copied: incubator/activemq/trunk/activeio/src/test/org/activeio/packet/sync/SyncChannelTestSupport.java (from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/net/SyncChannelTestSupport.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/test/org/activeio/packet/sync/SyncChannelTestSupport.java?p2=incubator/activemq/trunk/activeio/src/test/org/activeio/packet/sync/SyncChannelTestSupport.java&p1=incubator/activemq/trunk/activeio/src/test/org/activeio/net/SyncChannelTestSupport.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/test/org/activeio/net/SyncChannelTestSupport.java (original)
+++ incubator/activemq/trunk/activeio/src/test/org/activeio/packet/sync/SyncChannelTestSupport.java Mon Dec 19 08:50:54 2005
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.activeio.net;
+package org.activeio.packet.sync;
 
 import edu.emory.mathcs.backport.java.util.concurrent.Executor;
 import edu.emory.mathcs.backport.java.util.concurrent.ScheduledThreadPoolExecutor;
@@ -22,13 +22,14 @@
 
 import org.activeio.Channel;
 import org.activeio.ChannelServer;
-import org.activeio.Packet;
-import org.activeio.SyncChannel;
-import org.activeio.SyncChannelServer;
 import org.activeio.adapter.AsyncToSyncChannel;
 import org.activeio.adapter.AsyncToSyncChannelServer;
 import org.activeio.packet.ByteArrayPacket;
 import org.activeio.packet.EOSPacket;
+import org.activeio.packet.Packet;
+import org.activeio.packet.sync.SyncChannel;
+import org.activeio.packet.sync.SyncChannelServer;
+import org.activeio.stream.sync.socket.SocketMetadata;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Copied: incubator/activemq/trunk/activeio/src/test/org/activeio/packet/sync/datagram/DatagramSyncChannelTest.java (from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/net/DatagramSyncChannelTest.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/test/org/activeio/packet/sync/datagram/DatagramSyncChannelTest.java?p2=incubator/activemq/trunk/activeio/src/test/org/activeio/packet/sync/datagram/DatagramSyncChannelTest.java&p1=incubator/activemq/trunk/activeio/src/test/org/activeio/net/DatagramSyncChannelTest.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/test/org/activeio/net/DatagramSyncChannelTest.java (original)
+++ incubator/activemq/trunk/activeio/src/test/org/activeio/packet/sync/datagram/DatagramSyncChannelTest.java Mon Dec 19 08:50:54 2005
@@ -14,12 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activeio.net;
+package org.activeio.packet.sync.datagram;
 
 import java.io.IOException;
 import java.net.URI;
 
 import org.activeio.Channel;
+import org.activeio.packet.sync.ConnectionlessSyncChannelTestSupport;
+import org.activeio.packet.sync.datagram.DatagramSocketSyncChannelFactory;
 
 
 /**

Copied: incubator/activemq/trunk/activeio/src/test/org/activeio/packet/sync/multicast/MulticastSyncChannelTest.java (from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/net/MulticastSyncChannelTest.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/test/org/activeio/packet/sync/multicast/MulticastSyncChannelTest.java?p2=incubator/activemq/trunk/activeio/src/test/org/activeio/packet/sync/multicast/MulticastSyncChannelTest.java&p1=incubator/activemq/trunk/activeio/src/test/org/activeio/net/MulticastSyncChannelTest.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/test/org/activeio/net/MulticastSyncChannelTest.java (original)
+++ incubator/activemq/trunk/activeio/src/test/org/activeio/packet/sync/multicast/MulticastSyncChannelTest.java Mon Dec 19 08:50:54 2005
@@ -14,12 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activeio.net;
+package org.activeio.packet.sync.multicast;
 
 import java.io.IOException;
 import java.net.URI;
 
 import org.activeio.Channel;
+import org.activeio.packet.sync.ConnectionlessSyncChannelTestSupport;
+import org.activeio.packet.sync.multicast.MulticastSocketSyncChannelFactory;
 
 
 /**

Copied: incubator/activemq/trunk/activeio/src/test/org/activeio/packet/sync/socket/SlowSocketChannelSyncChannelTest.java (from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/net/SlowSocketChannelSyncChannelTest.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/test/org/activeio/packet/sync/socket/SlowSocketChannelSyncChannelTest.java?p2=incubator/activemq/trunk/activeio/src/test/org/activeio/packet/sync/socket/SlowSocketChannelSyncChannelTest.java&p1=incubator/activemq/trunk/activeio/src/test/org/activeio/net/SlowSocketChannelSyncChannelTest.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/test/org/activeio/net/SlowSocketChannelSyncChannelTest.java (original)
+++ incubator/activemq/trunk/activeio/src/test/org/activeio/packet/sync/socket/SlowSocketChannelSyncChannelTest.java Mon Dec 19 08:50:54 2005
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.activeio.net;
+package org.activeio.packet.sync.socket;
 
 import java.io.IOException;
 import java.net.URI;
@@ -22,6 +22,9 @@
 
 import org.activeio.Channel;
 import org.activeio.ChannelServer;
+import org.activeio.packet.sync.SlowWriteSyncChannelFactory;
+import org.activeio.packet.sync.SyncChannelTestSupport;
+import org.activeio.packet.sync.nio.NIOSyncChannelFactory;
 
 /**
  * @version $Revision$

Copied: incubator/activemq/trunk/activeio/src/test/org/activeio/packet/sync/socket/SlowSocketSyncChannelTest.java (from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/net/SlowSocketSyncChannelTest.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/test/org/activeio/packet/sync/socket/SlowSocketSyncChannelTest.java?p2=incubator/activemq/trunk/activeio/src/test/org/activeio/packet/sync/socket/SlowSocketSyncChannelTest.java&p1=incubator/activemq/trunk/activeio/src/test/org/activeio/net/SlowSocketSyncChannelTest.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/test/org/activeio/net/SlowSocketSyncChannelTest.java (original)
+++ incubator/activemq/trunk/activeio/src/test/org/activeio/packet/sync/socket/SlowSocketSyncChannelTest.java Mon Dec 19 08:50:54 2005
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.activeio.net;
+package org.activeio.packet.sync.socket;
 
 import java.io.IOException;
 import java.net.URI;
@@ -22,6 +22,9 @@
 
 import org.activeio.Channel;
 import org.activeio.ChannelServer;
+import org.activeio.packet.sync.SlowWriteSyncChannelFactory;
+import org.activeio.packet.sync.SyncChannelTestSupport;
+import org.activeio.packet.sync.socket.SocketSyncChannelFactory;
 
 /**
  * @version $Revision$



Mime
View raw message