activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r357725 [1/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
Author: chirino
Date: Mon Dec 19 08:50:54 2005
New Revision: 357725

URL: http://svn.apache.org/viewcvs?rev=357725&view=rev
Log:
doing 3.x reorg

Added:
    incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/jetty/
    incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/jetty/JettyOnePortSocketListener.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/JettyOnePortSocketListener.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/openorb/
    incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/openorb/OpenORBOpenPortFeatureInitializer.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/OpenORBOpenPortFeatureInitializer.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/openorb/OpenORBOpenPortSocketFactory.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/OpenORBOpenPortSocketFactory.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/ByteSequence.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/ByteSequence.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/Packet.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/Packet.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/PacketData.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/PacketData.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/async/
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/async/AsyncChannel.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/AsyncChannel.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/async/AsyncChannelFactory.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/AsyncChannelFactory.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/async/AsyncChannelListener.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/AsyncChannelListener.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/async/AsyncChannelServer.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/AsyncChannelServer.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/async/FilterAsyncChannel.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/FilterAsyncChannel.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/async/FilterAsyncChannelServer.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/FilterAsyncChannelServer.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/async/aio/
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/async/aio/AIOAsyncChannel.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/net/AIOAsyncChannel.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/async/aio/AIOAsyncChannelFactory.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/net/AIOAsyncChannelFactory.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/async/aio/AIOSyncChannelServer.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/net/AIOSyncChannelServer.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/async/filter/
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/async/filter/AsyncWriteAsyncChannel.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/filter/AsyncWriteAsyncChannel.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/async/filter/CounterAsyncChannel.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/filter/CounterAsyncChannel.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/async/filter/PacketAggregatingAsyncChannel.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/filter/PacketAggregatingAsyncChannel.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/async/filter/SynchornizedAsyncChannel.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/filter/SynchornizedAsyncChannel.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/async/filter/WriteBufferedAsyncChannel.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/filter/WriteBufferedAsyncChannel.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/async/nio/
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/async/nio/NIOAsyncChannel.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/net/NIOAsyncChannel.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/async/nio/NIOAsyncChannelFactory.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/net/NIOAsyncChannelFactory.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/async/nio/NIOAsyncChannelSelectorManager.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/net/NIOAsyncChannelSelectorManager.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/async/nio/NIOAsyncChannelServer.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/net/NIOAsyncChannelServer.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/async/vmpipe/
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/async/vmpipe/VMPipeAsyncChannelFactory.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/net/VMPipeAsyncChannelFactory.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/async/vmpipe/VMPipeAsyncChannelPipe.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/net/VMPipeAsyncChannelPipe.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/async/vmpipe/VMPipeAsyncChannelServer.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/net/VMPipeAsyncChannelServer.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/FilterSyncChannel.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/FilterSyncChannel.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/FilterSyncChannelServer.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/FilterSyncChannelServer.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/SyncChannel.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/SyncChannel.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/SyncChannelFactory.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/SyncChannelFactory.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/SyncChannelServer.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/SyncChannelServer.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/datagram/
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/datagram/DatagramContext.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/net/DatagramContext.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/datagram/DatagramSocketSyncChannel.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/net/DatagramSocketSyncChannel.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/datagram/DatagramSocketSyncChannelFactory.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/net/DatagramSocketSyncChannelFactory.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/filter/
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/filter/PacketAggregatingSyncChannel.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/filter/PacketAggregatingSyncChannel.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/filter/PushbackSyncChannel.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/filter/PushbackSyncChannel.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/filter/SynchornizedSyncChannel.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/filter/SynchornizedSyncChannel.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/filter/WriteBufferedSyncChannel.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/filter/WriteBufferedSyncChannel.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/jxta/
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/jxta/JxtaSocketSyncChannelFactory.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/net/JxtaSocketSyncChannelFactory.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/multicast/
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/multicast/MulticastSocketSyncChannel.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/net/MulticastSocketSyncChannel.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/multicast/MulticastSocketSyncChannelFactory.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/net/MulticastSocketSyncChannelFactory.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/nio/
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/nio/NIOBaseChannel.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/net/NIOBaseChannel.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/nio/NIOSyncChannel.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/net/NIOSyncChannel.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/nio/NIOSyncChannelFactory.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/net/NIOSyncChannelFactory.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/nio/NIOSyncChannelServer.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/net/NIOSyncChannelServer.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/socket/
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/socket/SocketSyncChannel.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/net/SocketSyncChannel.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/socket/SocketSyncChannelFactory.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/net/SocketSyncChannelFactory.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/socket/SocketSyncChannelServer.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/net/SocketSyncChannelServer.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/ssl/
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/sync/ssl/SslSocketSyncChannelFactory.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/net/SslSocketSyncChannelFactory.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/stream/
    incubator/activemq/trunk/activeio/src/java/org/activeio/stream/sync/
    incubator/activemq/trunk/activeio/src/java/org/activeio/stream/sync/StreamChannel.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/StreamChannel.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/stream/sync/StreamChannelFactory.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/StreamChannelFactory.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/stream/sync/StreamChannelServer.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/StreamChannelServer.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/stream/sync/socket/
    incubator/activemq/trunk/activeio/src/java/org/activeio/stream/sync/socket/SocketMetadata.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/net/SocketMetadata.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/stream/sync/socket/SocketStreamChannel.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/net/SocketStreamChannel.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/stream/sync/socket/SocketStreamChannelFactory.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/net/SocketStreamChannelFactory.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/stream/sync/socket/SocketStreamChannelServer.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/net/SocketStreamChannelServer.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/util/
    incubator/activemq/trunk/activeio/src/java/org/activeio/util/ByteArrayInputStream.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/ByteArrayInputStream.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/util/ByteArrayOutputStream.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/ByteArrayOutputStream.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/util/FactoryFinder.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/FactoryFinder.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/util/PacketAggregator.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/filter/PacketAggregator.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/util/URISupport.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/net/URISupport.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/jetty/
    incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/jetty/JettyOnePortSocketListenerTest.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/JettyOnePortSocketListenerTest.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/jetty/TestServlet.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/TestServlet.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/
    incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/OpenORBOnePortSocketFactoryTest.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/OpenORBOnePortSocketFactoryTest.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/TestIIOPServer.idl
      - copied unchanged from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/TestIIOPServer.idl
    incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/TestIIOPServer.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/TestIIOPServer.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/TestIIOPServerHelper.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/TestIIOPServerHelper.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/TestIIOPServerHolder.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/TestIIOPServerHolder.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/TestIIOPServerImpl.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/TestIIOPServerImpl.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/TestIIOPServerOperations.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/TestIIOPServerOperations.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/TestIIOPServerPOA.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/TestIIOPServerPOA.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/TestIIOPServerPOATie.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/TestIIOPServerPOATie.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/openorb/_TestIIOPServerStub.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/_TestIIOPServerStub.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/packet/ClientLoadSimulator.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/net/benchmark/ClientLoadSimulator.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/packet/Server.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/net/benchmark/Server.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/packet/async/
    incubator/activemq/trunk/activeio/src/test/org/activeio/packet/async/aio/
    incubator/activemq/trunk/activeio/src/test/org/activeio/packet/async/aio/AIOAsyncChannelTest.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/net/AIOAsyncChannelTest.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/packet/async/nio/
    incubator/activemq/trunk/activeio/src/test/org/activeio/packet/async/nio/NIOAsyncChannelTest.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/net/NIOAsyncChannelTest.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/packet/async/vmpipe/
    incubator/activemq/trunk/activeio/src/test/org/activeio/packet/async/vmpipe/VMPipeAsyncChannelTest.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/net/VMPipeAsyncChannelTest.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/packet/async/vmpipe/VMPipeReflectionAsyncChannelTest.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/net/VMPipeReflectionAsyncChannelTest.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/packet/nio/
    incubator/activemq/trunk/activeio/src/test/org/activeio/packet/nio/NIOSyncChannelTest.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/net/NIOSyncChannelTest.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/packet/sync/
    incubator/activemq/trunk/activeio/src/test/org/activeio/packet/sync/ConnectionlessSyncChannelTestSupport.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/net/ConnectionlessSyncChannelTestSupport.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/packet/sync/SlowWriteSyncChannelFactory.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/net/SlowWriteSyncChannelFactory.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/packet/sync/SyncChannelTestSupport.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/net/SyncChannelTestSupport.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/packet/sync/datagram/
    incubator/activemq/trunk/activeio/src/test/org/activeio/packet/sync/datagram/DatagramSyncChannelTest.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/net/DatagramSyncChannelTest.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/packet/sync/multicast/
    incubator/activemq/trunk/activeio/src/test/org/activeio/packet/sync/multicast/MulticastSyncChannelTest.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/net/MulticastSyncChannelTest.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/packet/sync/socket/
    incubator/activemq/trunk/activeio/src/test/org/activeio/packet/sync/socket/SlowSocketChannelSyncChannelTest.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/net/SlowSocketChannelSyncChannelTest.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/packet/sync/socket/SlowSocketSyncChannelTest.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/net/SlowSocketSyncChannelTest.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/packet/sync/socket/SocketSyncChannelTest.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/net/SocketSyncChannelTest.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/packet/sync/ssl/
    incubator/activemq/trunk/activeio/src/test/org/activeio/packet/sync/ssl/SslSocketSynchChannelTest.java
      - copied, changed from r357173, incubator/activemq/trunk/activeio/src/test/org/activeio/net/SslSocketSynchChannelTest.java
Removed:
    incubator/activemq/trunk/activeio/src/java/org/activeio/AsyncChannel.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/AsyncChannelFactory.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/AsyncChannelListener.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/AsyncChannelServer.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/AsynchChannel.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/AsynchChannelListener.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/AsynchChannelServer.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/ByteArrayInputStream.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/ByteArrayOutputStream.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/ByteSequence.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/Disposable.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/FactoryFinder.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/FilterAsyncChannel.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/FilterAsyncChannelServer.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/FilterSyncChannel.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/FilterSyncChannelServer.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/InputAsyncChannel.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/InputStreamChannel.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/InputSyncChannel.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/OutputChannel.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/OutputStreamChannel.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/Packet.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/PacketData.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/RequestChannel.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/RequestListener.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/StreamChannel.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/StreamChannelFactory.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/StreamChannelServer.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/SyncChannel.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/SyncChannelFactory.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/SyncChannelServer.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/AsyncChannelToClientRequestChannel.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/AsyncChannelToConcurrentRequestChannel.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/AsyncChannelToServerRequestChannel.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/InputStreamChannelToInputStream.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/OutputStreamChannelToOutputStream.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/filter/
    incubator/activemq/trunk/activeio/src/java/org/activeio/net/
    incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/JettyOnePortSocketListener.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/OpenORBOpenPortFeatureInitializer.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/OpenORBOpenPortSocketFactory.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/ChannelRequestTestSupport.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/filter/
    incubator/activemq/trunk/activeio/src/test/org/activeio/net/AIOAsyncChannelTest.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/net/ConnectionlessSyncChannelTestSupport.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/net/DatagramSyncChannelTest.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/net/MulticastSyncChannelTest.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/net/NIOAsyncChannelTest.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/net/NIOSyncChannelTest.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/net/SlowSocketChannelSyncChannelTest.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/net/SlowSocketSyncChannelTest.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/net/SlowWriteSyncChannelFactory.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/net/SocketSyncChannelTest.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/net/SslSocketSynchChannelTest.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/net/SyncChannelTestSupport.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/net/VMPipeAsyncChannelTest.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/net/VMPipeReflectionAsyncChannelTest.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/net/benchmark/
    incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/JettyOnePortSocketListenerTest.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/OpenORBOnePortSocketFactoryTest.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/TestIIOPServer.idl
    incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/TestIIOPServer.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/TestIIOPServerHelper.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/TestIIOPServerHolder.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/TestIIOPServerImpl.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/TestIIOPServerOperations.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/TestIIOPServerPOA.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/TestIIOPServerPOATie.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/TestServlet.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/_TestIIOPServerStub.java
Modified:
    incubator/activemq/trunk/activeio/project.xml
    incubator/activemq/trunk/activeio/src/java/org/activeio/Channel.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/ChannelFactory.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/ChannelServer.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/Service.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/AsyncChannelToOutputStream.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/AsyncToSyncChannel.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/AsyncToSyncChannelFactory.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/AsyncToSyncChannelServer.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/PacketByteArrayOutputStream.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/PacketInputStream.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/PacketOutputStream.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/PacketToInputStream.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/SyncChannelServerToServerSocket.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/SyncChannelToInputStream.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/SyncChannelToOutputStream.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/SyncChannelToSocket.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/SyncToAsyncChannel.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/SyncToAsyncChannelFactory.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/SyncToAsyncChannelServer.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/SynchToAsynchChannelAdapter.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/command/AsyncChannelToAsyncCommandChannel.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/command/DefaultWireFormat.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/command/WireFormat.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/journal/Journal.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/journal/active/BatchedWrite.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/journal/active/ControlFile.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/journal/active/JournalImpl.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/journal/active/Location.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/journal/active/LogFile.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/journal/active/LogFileManager.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/journal/active/Record.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/journal/howl/HowlJournal.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/HttpRecognizer.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/IIOPRecognizer.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/OnePortAsyncChannelServer.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/ProtocolRecognizer.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/UnknownRecognizer.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/AppendedPacket.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/ByteArrayPacket.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/ByteBufferPacket.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/ByteBufferPacketPool.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/BytePacket.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/EOSPacket.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/EmptyPacket.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/FilterPacket.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/packet/PacketPool.java
    incubator/activemq/trunk/activeio/src/java/org/activeio/xnet/SyncChannelServerDaemon.java
    incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/aio
    incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/datagram
    incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/jxta
    incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/multicast
    incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/nio
    incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/nio-async
    incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/nio-sync
    incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/socket
    incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/ssl
    incubator/activemq/trunk/activeio/src/resources/META-INF/org.activeio.ChannelFactory/vmpipe
    incubator/activemq/trunk/activeio/src/test/org/activeio/ChannelFactoryTest.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/PacketDataTest.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/journal/JournalStatsFilter.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/journal/active/JournalImplTest.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/oneport/OnePortAsyncChannelServerTest.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/packet/AppendedPacketTest.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/packet/ByteArrayPacketTest.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/packet/ByteBufferPacketTest.java
    incubator/activemq/trunk/activeio/src/test/org/activeio/packet/PacketTestSupport.java

Modified: incubator/activemq/trunk/activeio/project.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/project.xml?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/project.xml (original)
+++ incubator/activemq/trunk/activeio/project.xml Mon Dec 19 08:50:54 2005
@@ -19,6 +19,7 @@
 
     <pomVersion>3</pomVersion>
     <extend>${basedir}/../etc/project.xml</extend>
+    <currentVersion>3.0-SNAPSHOT</currentVersion>
 
     <name>ActiveIO</name>
     <artifactId>activeio</artifactId>
@@ -254,6 +255,9 @@
             <includes>
                 <include>**/*Test.java</include>
             </includes>
+            <excludes>
+                <exclude>**/OpenORBOnePortSocketFactoryTest.*</exclude>
+            </excludes>
             <resources>
                 <resource>
                     <directory>src/test</directory>

Modified: incubator/activemq/trunk/activeio/src/java/org/activeio/Channel.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/Channel.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/Channel.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/Channel.java Mon Dec 19 08:50:54 2005
@@ -27,5 +27,5 @@
  * 
  * @version $Revision$
  */
-public interface Channel extends Disposable, Service, Adaptable {    
+public interface Channel extends Service, Adaptable {    
 }

Modified: incubator/activemq/trunk/activeio/src/java/org/activeio/ChannelFactory.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/ChannelFactory.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/ChannelFactory.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/ChannelFactory.java Mon Dec 19 08:50:54 2005
@@ -17,19 +17,25 @@
  **/
 package org.activeio;
 
+import java.io.IOException;
+import java.net.URI;
+import java.util.HashMap;
+
+import org.activeio.adapter.AsyncToSyncChannelFactory;
+import org.activeio.adapter.SyncToAsyncChannelFactory;
+import org.activeio.packet.async.AsyncChannel;
+import org.activeio.packet.async.AsyncChannelFactory;
+import org.activeio.packet.async.AsyncChannelServer;
+import org.activeio.packet.sync.SyncChannel;
+import org.activeio.packet.sync.SyncChannelFactory;
+import org.activeio.packet.sync.SyncChannelServer;
+import org.activeio.util.FactoryFinder;
+
 import edu.emory.mathcs.backport.java.util.concurrent.Executor;
-import edu.emory.mathcs.backport.java.util.concurrent.LinkedBlockingQueue;
 import edu.emory.mathcs.backport.java.util.concurrent.SynchronousQueue;
 import edu.emory.mathcs.backport.java.util.concurrent.ThreadFactory;
 import edu.emory.mathcs.backport.java.util.concurrent.ThreadPoolExecutor;
 import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
-
-import org.activeio.adapter.AsyncToSyncChannelFactory;
-import org.activeio.adapter.SyncToAsyncChannelFactory;
-
-import java.io.IOException;
-import java.net.URI;
-import java.util.HashMap;
 
 /**
  * A {@see ChannelFactory}uses the requested URI's scheme to determine the

Modified: incubator/activemq/trunk/activeio/src/java/org/activeio/ChannelServer.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/ChannelServer.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/ChannelServer.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/ChannelServer.java Mon Dec 19 08:50:54 2005
@@ -27,7 +27,7 @@
  * 
  * @version $Revision$
  */
-public interface ChannelServer extends Channel {
+public interface ChannelServer extends Service, Adaptable {
 
     /**
      * The URI that was used when the channel was bound.  This could be different

Modified: incubator/activemq/trunk/activeio/src/java/org/activeio/Service.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/Service.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/Service.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/Service.java Mon Dec 19 08:50:54 2005
@@ -43,11 +43,14 @@
     /**
 	 * Stops the channel.  Once stopped, the channel is in the stopped state.
 	 * 
-	 * @param timeout The amount of time the channel is allowed to take to gracefully stop.  If the timeout
-	 *        is exceeded, the channel should do a forcefull stop.
-	 * 
 	 * @throws IOException
 	 */
-    void stop(long timeout) throws IOException;
+    void stop() throws IOException;
         
+    /**
+     * Disposes the channel.  Once disposed, the channel cannot be used anymore.
+     * 
+     * @throws IOException
+     */
+    void dispose();
 }

Modified: incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/AsyncChannelToOutputStream.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/AsyncChannelToOutputStream.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/AsyncChannelToOutputStream.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/AsyncChannelToOutputStream.java Mon Dec 19 08:50:54 2005
@@ -19,9 +19,9 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
-import org.activeio.AsyncChannel;
 import org.activeio.packet.ByteArrayPacket;
 import org.activeio.packet.BytePacket;
+import org.activeio.packet.async.AsyncChannel;
 
 /**
  */

Modified: incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/AsyncToSyncChannel.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/AsyncToSyncChannel.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/AsyncToSyncChannel.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/AsyncToSyncChannel.java Mon Dec 19 08:50:54 2005
@@ -20,10 +20,10 @@
 import java.io.IOException;
 import java.io.InterruptedIOException;
 
-import org.activeio.AsyncChannel;
-import org.activeio.AsyncChannelListener;
-import org.activeio.Packet;
-import org.activeio.SyncChannel;
+import org.activeio.packet.Packet;
+import org.activeio.packet.async.AsyncChannel;
+import org.activeio.packet.async.AsyncChannelListener;
+import org.activeio.packet.sync.SyncChannel;
 
 import edu.emory.mathcs.backport.java.util.concurrent.BlockingQueue;
 import edu.emory.mathcs.backport.java.util.concurrent.LinkedBlockingQueue;
@@ -79,9 +79,9 @@
     }
 
     /**
-     * @see org.activeio.Channel#write(org.activeio.Packet)
+     * @see org.activeio.Channel#write(org.activeio.packet.Packet)
      */
-    public void write(org.activeio.Packet packet) throws IOException {
+    public void write(org.activeio.packet.Packet packet) throws IOException {
         asyncChannel.write(packet);
     }
 
@@ -93,7 +93,7 @@
     }
 
     /**
-     * @see org.activeio.SyncChannel#read(long)
+     * @see org.activeio.packet.sync.SyncChannel#read(long)
      */
     public Packet read(long timeout) throws IOException {
         try {
@@ -136,14 +136,14 @@
     }
 
     /**
-     * @see org.activeio.Service#stop(long)
+     * @see org.activeio.Service#stop()
      */
-    public void stop(long timeout) throws IOException {
-        asyncChannel.stop(timeout);
+    public void stop() throws IOException {
+        asyncChannel.stop();
     }
 
     /**
-     * @see org.activeio.AsyncChannelListener#onPacket(org.activeio.Packet)
+     * @see org.activeio.packet.async.AsyncChannelListener#onPacket(org.activeio.packet.Packet)
      */
     public void onPacket(Packet packet) {
         try {
@@ -154,7 +154,7 @@
     }
 
     /**
-     * @see org.activeio.AsyncChannelListener#onPacketError(org.activeio.ChannelException)
+     * @see org.activeio.packet.async.AsyncChannelListener#onPacketError(org.activeio.ChannelException)
      */
     public void onPacketError(IOException error) {
         try {

Modified: incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/AsyncToSyncChannelFactory.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/AsyncToSyncChannelFactory.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/AsyncToSyncChannelFactory.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/AsyncToSyncChannelFactory.java Mon Dec 19 08:50:54 2005
@@ -20,10 +20,10 @@
 import java.io.IOException;
 import java.net.URI;
 
-import org.activeio.AsyncChannelFactory;
-import org.activeio.SyncChannel;
-import org.activeio.SyncChannelFactory;
-import org.activeio.SyncChannelServer;
+import org.activeio.packet.async.AsyncChannelFactory;
+import org.activeio.packet.sync.SyncChannel;
+import org.activeio.packet.sync.SyncChannelFactory;
+import org.activeio.packet.sync.SyncChannelServer;
 
 /**
  * @version $Revision$

Modified: incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/AsyncToSyncChannelServer.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/AsyncToSyncChannelServer.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/AsyncToSyncChannelServer.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/AsyncToSyncChannelServer.java Mon Dec 19 08:50:54 2005
@@ -22,10 +22,10 @@
 import java.net.URI;
 
 import org.activeio.AcceptListener;
-import org.activeio.AsyncChannelServer;
 import org.activeio.Channel;
 import org.activeio.ChannelServer;
-import org.activeio.SyncChannelServer;
+import org.activeio.packet.async.AsyncChannelServer;
+import org.activeio.packet.sync.SyncChannelServer;
 
 import edu.emory.mathcs.backport.java.util.concurrent.BlockingQueue;
 import edu.emory.mathcs.backport.java.util.concurrent.LinkedBlockingQueue;
@@ -82,7 +82,7 @@
     }
 
     /**
-     * @see org.activeio.SyncChannelServer#accept(long)
+     * @see org.activeio.packet.sync.SyncChannelServer#accept(long)
      */
     public org.activeio.Channel accept(long timeout) throws IOException {
         try {
@@ -124,10 +124,10 @@
     }
 
     /**
-     * @see org.activeio.Service#stop(long)
+     * @see org.activeio.Service#stop()
      */
-    public void stop(long timeout) throws IOException {
-        asyncChannelServer.stop(timeout);
+    public void stop() throws IOException {
+        asyncChannelServer.stop();
     }
 
     public URI getBindURI() {

Modified: incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/PacketByteArrayOutputStream.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/PacketByteArrayOutputStream.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/PacketByteArrayOutputStream.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/PacketByteArrayOutputStream.java Mon Dec 19 08:50:54 2005
@@ -20,9 +20,9 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
-import org.activeio.Packet;
 import org.activeio.packet.AppendedPacket;
 import org.activeio.packet.ByteArrayPacket;
+import org.activeio.packet.Packet;
 
 /**
  *

Modified: incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/PacketInputStream.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/PacketInputStream.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/PacketInputStream.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/PacketInputStream.java Mon Dec 19 08:50:54 2005
@@ -16,7 +16,7 @@
  */
 package org.activeio.adapter;
 
-import org.activeio.Packet;
+import org.activeio.packet.Packet;
 
 /**
  * @deprecated  Use PacketToInputStream instead.  This class will be removed very soon.

Modified: incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/PacketOutputStream.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/PacketOutputStream.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/PacketOutputStream.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/PacketOutputStream.java Mon Dec 19 08:50:54 2005
@@ -19,7 +19,7 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
-import org.activeio.Packet;
+import org.activeio.packet.Packet;
 
 /**
  * Provides an OutputStream for a given Packet.

Modified: incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/PacketToInputStream.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/PacketToInputStream.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/PacketToInputStream.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/PacketToInputStream.java Mon Dec 19 08:50:54 2005
@@ -19,7 +19,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.activeio.Packet;
+import org.activeio.packet.Packet;
 
 /**
  * Provides an InputStream for a given Packet.

Modified: incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/SyncChannelServerToServerSocket.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/SyncChannelServerToServerSocket.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/SyncChannelServerToServerSocket.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/SyncChannelServerToServerSocket.java Mon Dec 19 08:50:54 2005
@@ -28,8 +28,8 @@
 import java.nio.channels.ServerSocketChannel;
 
 import org.activeio.Channel;
-import org.activeio.SyncChannel;
-import org.activeio.SyncChannelServer;
+import org.activeio.packet.sync.SyncChannel;
+import org.activeio.packet.sync.SyncChannelServer;
 
 /**
  */
@@ -91,12 +91,6 @@
   	    throw new SocketException("Already bound");
     }
     
-    public void close() throws IOException {
-    	if (!isClosed()) {
-    	    channelServer.dispose();
-    	}
-    }
-
     public ServerSocketChannel getChannel() {
         return null;
     }

Modified: incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/SyncChannelToInputStream.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/SyncChannelToInputStream.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/SyncChannelToInputStream.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/SyncChannelToInputStream.java Mon Dec 19 08:50:54 2005
@@ -20,9 +20,9 @@
 import java.io.InputStream;
 
 import org.activeio.Channel;
-import org.activeio.Packet;
-import org.activeio.SyncChannel;
 import org.activeio.packet.EOSPacket;
+import org.activeio.packet.Packet;
+import org.activeio.packet.sync.SyncChannel;
 
 /**
  * Provides an InputStream for a given SynchChannel.

Modified: incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/SyncChannelToOutputStream.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/SyncChannelToOutputStream.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/SyncChannelToOutputStream.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/SyncChannelToOutputStream.java Mon Dec 19 08:50:54 2005
@@ -19,9 +19,9 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
-import org.activeio.SyncChannel;
 import org.activeio.packet.ByteArrayPacket;
 import org.activeio.packet.BytePacket;
+import org.activeio.packet.sync.SyncChannel;
 
 /**
  */

Modified: incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/SyncChannelToSocket.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/SyncChannelToSocket.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/SyncChannelToSocket.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/SyncChannelToSocket.java Mon Dec 19 08:50:54 2005
@@ -25,10 +25,10 @@
 import java.net.SocketException;
 import java.nio.channels.SocketChannel;
 
-import org.activeio.Packet;
-import org.activeio.SyncChannel;
-import org.activeio.net.SocketMetadata;
 import org.activeio.packet.ByteArrayPacket;
+import org.activeio.packet.Packet;
+import org.activeio.packet.sync.SyncChannel;
+import org.activeio.stream.sync.socket.SocketMetadata;
 
 /**
  * Provides a {@see java.net.Socket} interface to a {@see org.activeio.SynchChannel}.
@@ -80,7 +80,7 @@
         closed = true;
         inputStream.close();
         outputStream.close();
-        channel.dispose();
+        channel.stop();
     }
     
     public void connect(SocketAddress endpoint) throws IOException {

Modified: incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/SyncToAsyncChannel.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/SyncToAsyncChannel.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/SyncToAsyncChannel.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/SyncToAsyncChannel.java Mon Dec 19 08:50:54 2005
@@ -22,14 +22,13 @@
 import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
 import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
 
-import org.activeio.AsyncChannel;
-import org.activeio.AsyncChannelListener;
 import org.activeio.Channel;
 import org.activeio.ChannelFactory;
-import org.activeio.Packet;
-import org.activeio.Service;
-import org.activeio.SyncChannel;
 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.sync.SyncChannel;
 
 import java.io.IOException;
 
@@ -100,34 +99,13 @@
         }
     }
 
-    synchronized public void stop(long timeout) throws IOException {
+    synchronized public void stop() throws IOException {
         if (running.compareAndSet(true, false)) {
             try {
-                if( timeout == NO_WAIT_TIMEOUT ) {
-                    syncChannel.stop(NO_WAIT_TIMEOUT);
-                } else if( timeout == WAIT_FOREVER_TIMEOUT ) {
-                    doneCountDownLatch.await();
-                    syncChannel.stop(WAIT_FOREVER_TIMEOUT);
-                } else {
-                    
-                    long start = System.currentTimeMillis();
-                    if( doneCountDownLatch.await(timeout, TimeUnit.MILLISECONDS) ) {
-                        timeout -= (System.currentTimeMillis() - start);
-                    } else {
-                        timeout=0;
-                    }
-                    
-                    if( timeout <= 0 ) {
-                        syncChannel.stop(NO_WAIT_TIMEOUT);
-                    } else {
-                        syncChannel.stop(timeout);
-                    }
-                }
-            } catch (IOException e) {
-                throw e;
+                doneCountDownLatch.await(5, TimeUnit.SECONDS);
             } catch (Throwable e) {
-                throw (IOException)new IOException("stop failed: " + e.getMessage()).initCause(e);
             }
+            syncChannel.stop();
         }
     }
 
@@ -169,7 +147,7 @@
     }
 
     /**
-     * @see org.activeio.AsyncChannel#setAsyncChannelListener(org.activeio.UpPacketListener)
+     * @see org.activeio.packet.async.AsyncChannel#setAsyncChannelListener(org.activeio.UpPacketListener)
      */
     public void setAsyncChannelListener(AsyncChannelListener channelListener) {
         if (running.get())
@@ -178,9 +156,9 @@
     }
 
     /**
-     * @see org.activeio.Channel#write(org.activeio.Packet)
+     * @see org.activeio.Channel#write(org.activeio.packet.Packet)
      */
-    public void write(org.activeio.Packet packet) throws IOException {
+    public void write(org.activeio.packet.Packet packet) throws IOException {
         syncChannel.write(packet);
     }
 
@@ -196,7 +174,7 @@
      */
     public void dispose() {
         try {
-            stop(Service.NO_WAIT_TIMEOUT);
+            stop();
         } catch ( IOException ignore) {
         }
         syncChannel.dispose();        

Modified: incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/SyncToAsyncChannelFactory.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/SyncToAsyncChannelFactory.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/SyncToAsyncChannelFactory.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/SyncToAsyncChannelFactory.java Mon Dec 19 08:50:54 2005
@@ -20,11 +20,11 @@
 import java.io.IOException;
 import java.net.URI;
 
-import org.activeio.AsyncChannel;
-import org.activeio.AsyncChannelFactory;
-import org.activeio.AsyncChannelServer;
 import org.activeio.ChannelFactory;
-import org.activeio.SyncChannelFactory;
+import org.activeio.packet.async.AsyncChannel;
+import org.activeio.packet.async.AsyncChannelFactory;
+import org.activeio.packet.async.AsyncChannelServer;
+import org.activeio.packet.sync.SyncChannelFactory;
 
 import edu.emory.mathcs.backport.java.util.concurrent.Executor;
 

Modified: incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/SyncToAsyncChannelServer.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/SyncToAsyncChannelServer.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/SyncToAsyncChannelServer.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/SyncToAsyncChannelServer.java Mon Dec 19 08:50:54 2005
@@ -18,22 +18,20 @@
 
 package org.activeio.adapter;
 
-import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
-import edu.emory.mathcs.backport.java.util.concurrent.Executor;
-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
+import java.io.IOException;
+import java.net.URI;
 
 import org.activeio.AcceptListener;
-import org.activeio.AsyncChannelServer;
 import org.activeio.Channel;
 import org.activeio.ChannelFactory;
 import org.activeio.ChannelServer;
-import org.activeio.Disposable;
-import org.activeio.Service;
-import org.activeio.SyncChannelServer;
+import org.activeio.packet.async.AsyncChannelServer;
+import org.activeio.packet.sync.SyncChannelServer;
 
-import java.io.IOException;
-import java.net.URI;
+import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
+import edu.emory.mathcs.backport.java.util.concurrent.Executor;
+import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
+import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * Adapts a {@see org.activeio,SynchChannelServer} so that it provides an 
@@ -93,36 +91,13 @@
         }
     }
 
-    synchronized public void stop(long timeout) throws IOException {
+    synchronized public void stop() throws IOException {
         if (running.compareAndSet(true, false)) {
             try {
-                
-                if( timeout == NO_WAIT_TIMEOUT ) {
-                    syncChannelServer.stop(NO_WAIT_TIMEOUT);
-                } else if( timeout == WAIT_FOREVER_TIMEOUT ) {
-                    doneCountDownLatch.await();
-                    syncChannelServer.stop(WAIT_FOREVER_TIMEOUT);
-                } else {
-                    
-                    long start = System.currentTimeMillis();
-                    if( doneCountDownLatch.await(timeout, TimeUnit.MILLISECONDS) ) {
-                        timeout -= (System.currentTimeMillis() - start);
-                    } else {
-                        timeout=0;
-                    }
-                    
-                    if( timeout <= 0 ) {
-                        syncChannelServer.stop(NO_WAIT_TIMEOUT);
-                    } else {
-                        syncChannelServer.stop(timeout);
-                    }
-                }
-                
-            } catch (IOException e) {
-                throw e;
+                doneCountDownLatch.await(5, TimeUnit.SECONDS);
             } catch (Throwable e) {
-                throw (IOException)new IOException("stop failed: " + e.getMessage()).initCause(e);
             }
+            syncChannelServer.stop();
         }
     }
 
@@ -153,7 +128,7 @@
     }
 
     /**
-     * @see org.activeio.AsyncChannelServer#setAcceptListener(org.activeio.AcceptListener)
+     * @see org.activeio.packet.async.AsyncChannelServer#setAcceptListener(org.activeio.AcceptListener)
      */
     public void setAcceptListener(AcceptListener acceptListener) {
         if(running.get()) 
@@ -166,12 +141,10 @@
      */
     public void dispose() {
         try {
-            stop(Service.NO_WAIT_TIMEOUT);
+            stop();
         } catch ( IOException ignore) {
         }
-        if( syncChannelServer instanceof Disposable ) {
-            ((Disposable)syncChannelServer).dispose();
-        }
+        syncChannelServer.dispose();
     }
 
     public URI getBindURI() {

Modified: incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/SynchToAsynchChannelAdapter.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/SynchToAsynchChannelAdapter.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/SynchToAsynchChannelAdapter.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/adapter/SynchToAsynchChannelAdapter.java Mon Dec 19 08:50:54 2005
@@ -16,9 +16,10 @@
  */
 package org.activeio.adapter;
 
-import org.activeio.SyncChannel;
-import org.activeio.AsyncChannel;
 import org.activeio.Channel;
+import org.activeio.packet.async.AsyncChannel;
+import org.activeio.packet.sync.SyncChannel;
+
 import edu.emory.mathcs.backport.java.util.concurrent.Executor;
 
 /**

Modified: incubator/activemq/trunk/activeio/src/java/org/activeio/command/AsyncChannelToAsyncCommandChannel.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/command/AsyncChannelToAsyncCommandChannel.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/command/AsyncChannelToAsyncCommandChannel.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/command/AsyncChannelToAsyncCommandChannel.java Mon Dec 19 08:50:54 2005
@@ -17,10 +17,10 @@
  **/
 package org.activeio.command;
 
-import org.activeio.AsyncChannel;
-import org.activeio.AsyncChannelListener;
-import org.activeio.Packet;
 import org.activeio.packet.EOSPacket;
+import org.activeio.packet.Packet;
+import org.activeio.packet.async.AsyncChannel;
+import org.activeio.packet.async.AsyncChannelListener;
 
 import java.io.EOFException;
 import java.io.IOException;
@@ -54,8 +54,8 @@
         channel.start();
     }
 
-    public void stop(long timeout) throws IOException {
-        channel.stop(timeout);
+    public void stop() throws IOException {
+        channel.stop();
     }
 
     public void setCommandListener(final CommandListener listener) {

Modified: incubator/activemq/trunk/activeio/src/java/org/activeio/command/DefaultWireFormat.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/command/DefaultWireFormat.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/command/DefaultWireFormat.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/command/DefaultWireFormat.java Mon Dec 19 08:50:54 2005
@@ -22,10 +22,10 @@
 import java.io.IOException;
 import java.io.ObjectOutputStream;
 
-import org.activeio.ByteArrayOutputStream;
-import org.activeio.Packet;
 import org.activeio.adapter.PacketToInputStream;
 import org.activeio.packet.ByteArrayPacket;
+import org.activeio.packet.Packet;
+import org.activeio.util.ByteArrayOutputStream;
 
 /**
  * A default implementation which uses serialization

Modified: incubator/activemq/trunk/activeio/src/java/org/activeio/command/WireFormat.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/command/WireFormat.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/command/WireFormat.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/command/WireFormat.java Mon Dec 19 08:50:54 2005
@@ -21,7 +21,7 @@
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activeio.Packet;
+import org.activeio.packet.Packet;
 
 /**
  * Provides a mechanism to marshal commands into and out of packets

Modified: incubator/activemq/trunk/activeio/src/java/org/activeio/journal/Journal.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/journal/Journal.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/journal/Journal.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/journal/Journal.java Mon Dec 19 08:50:54 2005
@@ -19,7 +19,7 @@
 
 import java.io.IOException;
 
-import org.activeio.Packet;
+import org.activeio.packet.Packet;
 
 /**
  * A Journal is a record logging Interface that can be used to implement 

Modified: incubator/activemq/trunk/activeio/src/java/org/activeio/journal/active/BatchedWrite.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/journal/active/BatchedWrite.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/journal/active/BatchedWrite.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/journal/active/BatchedWrite.java Mon Dec 19 08:50:54 2005
@@ -17,7 +17,7 @@
  **/
 package org.activeio.journal.active;
 
-import org.activeio.Packet;
+import org.activeio.packet.Packet;
 
 import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
 

Modified: incubator/activemq/trunk/activeio/src/java/org/activeio/journal/active/ControlFile.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/journal/active/ControlFile.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/journal/active/ControlFile.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/journal/active/ControlFile.java Mon Dec 19 08:50:54 2005
@@ -27,9 +27,8 @@
 import java.util.Properties;
 import java.util.Set;
 
-import org.activeio.Disposable;
-import org.activeio.Packet;
 import org.activeio.packet.ByteBufferPacket;
+import org.activeio.packet.Packet;
 
 /**
  * Control file holds the last known good state of the journal.  It stores the state in 
@@ -39,7 +38,7 @@
  * 
  * @version $Revision: 1.1 $
  */
-final public class ControlFile implements Disposable {
+final public class ControlFile {
 
     /** The File that holds the control data. */
     private final RandomAccessFile file;

Modified: incubator/activemq/trunk/activeio/src/java/org/activeio/journal/active/JournalImpl.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/journal/active/JournalImpl.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/journal/active/JournalImpl.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/journal/active/JournalImpl.java Mon Dec 19 08:50:54 2005
@@ -21,14 +21,13 @@
 import java.io.IOException;
 import java.io.InterruptedIOException;
 
-import org.activeio.Disposable;
-import org.activeio.Packet;
 import org.activeio.journal.InvalidRecordLocationException;
 import org.activeio.journal.Journal;
 import org.activeio.journal.JournalEventListener;
 import org.activeio.journal.RecordLocation;
 import org.activeio.packet.ByteArrayPacket;
 import org.activeio.packet.ByteBufferPacketPool;
+import org.activeio.packet.Packet;
 
 import edu.emory.mathcs.backport.java.util.concurrent.Callable;
 import edu.emory.mathcs.backport.java.util.concurrent.ExecutionException;
@@ -60,7 +59,7 @@
  * 
  * @version $Revision: 1.1 $
  */
-final public class JournalImpl implements Journal, Disposable {
+final public class JournalImpl implements Journal {
 
     public static final int DEFAULT_POOL_SIZE = Integer.parseInt(System.getProperty("org.activeio.journal.active.DefaultPoolSize", ""+(5)));
     public static final int DEFAULT_PACKET_SIZE = Integer.parseInt(System.getProperty("org.activeio.journal.active.DefaultPacketSize", ""+(1024*1024*4)));

Modified: incubator/activemq/trunk/activeio/src/java/org/activeio/journal/active/Location.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/journal/active/Location.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/journal/active/Location.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/journal/active/Location.java Mon Dec 19 08:50:54 2005
@@ -21,9 +21,9 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.activeio.Packet;
-import org.activeio.PacketData;
 import org.activeio.journal.RecordLocation;
+import org.activeio.packet.Packet;
+import org.activeio.packet.PacketData;
 
 /**
  * Defines a where a record can be located in the Journal.

Modified: incubator/activemq/trunk/activeio/src/java/org/activeio/journal/active/LogFile.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/journal/active/LogFile.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/journal/active/LogFile.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/journal/active/LogFile.java Mon Dec 19 08:50:54 2005
@@ -24,14 +24,12 @@
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 
-import org.activeio.Disposable;
-
 /**
  * Allows read/append access to a LogFile.
  * 
  * @version $Revision: 1.1 $
  */
-final public class LogFile implements Disposable {
+final public class LogFile {
 
     private final RandomAccessFile file;
     private final FileChannel channel;

Modified: incubator/activemq/trunk/activeio/src/java/org/activeio/journal/active/LogFileManager.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/journal/active/LogFileManager.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/journal/active/LogFileManager.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/journal/active/LogFileManager.java Mon Dec 19 08:50:54 2005
@@ -27,12 +27,12 @@
 import java.text.NumberFormat;
 import java.util.HashMap;
 
-import org.activeio.Packet;
 import org.activeio.adapter.PacketOutputStream;
 import org.activeio.adapter.PacketToInputStream;
 import org.activeio.journal.InvalidRecordLocationException;
 import org.activeio.packet.ByteArrayPacket;
 import org.activeio.packet.ByteBufferPacket;
+import org.activeio.packet.Packet;
 
 import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
 

Modified: incubator/activemq/trunk/activeio/src/java/org/activeio/journal/active/Record.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/journal/active/Record.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/journal/active/Record.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/journal/active/Record.java Mon Dec 19 08:50:54 2005
@@ -24,11 +24,10 @@
 import java.io.IOException;
 import java.util.zip.CRC32;
 
-import org.activeio.Disposable;
-import org.activeio.Packet;
-import org.activeio.adapter.PacketToInputStream;
 import org.activeio.adapter.PacketOutputStream;
+import org.activeio.adapter.PacketToInputStream;
 import org.activeio.packet.ByteArrayPacket;
+import org.activeio.packet.Packet;
 
 
 /**
@@ -36,7 +35,7 @@
  * 
  * @version $Revision: 1.1 $
  */
-final public class Record implements Disposable {
+final public class Record {
     
     static final public int RECORD_HEADER_SIZE=8+Location.SERIALIZED_SIZE;
     static final public int RECORD_FOOTER_SIZE=12+Location.SERIALIZED_SIZE;

Modified: incubator/activemq/trunk/activeio/src/java/org/activeio/journal/howl/HowlJournal.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/journal/howl/HowlJournal.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/journal/howl/HowlJournal.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/journal/howl/HowlJournal.java Mon Dec 19 08:50:54 2005
@@ -20,12 +20,12 @@
 import java.io.IOException;
 import java.io.InterruptedIOException;
 
-import org.activeio.Packet;
 import org.activeio.journal.InvalidRecordLocationException;
 import org.activeio.journal.Journal;
 import org.activeio.journal.JournalEventListener;
 import org.activeio.journal.RecordLocation;
 import org.activeio.packet.ByteArrayPacket;
+import org.activeio.packet.Packet;
 import org.objectweb.howl.log.Configuration;
 import org.objectweb.howl.log.InvalidFileSetException;
 import org.objectweb.howl.log.InvalidLogBufferException;

Modified: incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/HttpRecognizer.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/HttpRecognizer.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/HttpRecognizer.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/HttpRecognizer.java Mon Dec 19 08:50:54 2005
@@ -19,7 +19,7 @@
 
 import java.util.HashSet;
 
-import org.activeio.Packet;
+import org.activeio.packet.Packet;
 
 
 public class HttpRecognizer implements ProtocolRecognizer {

Modified: incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/IIOPRecognizer.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/IIOPRecognizer.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/IIOPRecognizer.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/IIOPRecognizer.java Mon Dec 19 08:50:54 2005
@@ -17,7 +17,7 @@
  **/
 package org.activeio.oneport;
 
-import org.activeio.Packet;
+import org.activeio.packet.Packet;
 
 
 public class IIOPRecognizer implements ProtocolRecognizer {

Modified: incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/OnePortAsyncChannelServer.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/OnePortAsyncChannelServer.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/OnePortAsyncChannelServer.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/OnePortAsyncChannelServer.java Mon Dec 19 08:50:54 2005
@@ -22,18 +22,18 @@
 import java.util.Iterator;
 
 import org.activeio.AcceptListener;
-import org.activeio.AsyncChannel;
-import org.activeio.AsyncChannelListener;
-import org.activeio.AsyncChannelServer;
 import org.activeio.Channel;
-import org.activeio.FilterAsyncChannel;
-import org.activeio.FilterAsyncChannelServer;
-import org.activeio.Packet;
-import org.activeio.SyncChannel;
 import org.activeio.adapter.AsyncToSyncChannel;
 import org.activeio.adapter.SyncToAsyncChannel;
-import org.activeio.filter.PushbackSyncChannel;
 import org.activeio.packet.AppendedPacket;
+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.packet.async.FilterAsyncChannel;
+import org.activeio.packet.async.FilterAsyncChannelServer;
+import org.activeio.packet.sync.SyncChannel;
+import org.activeio.packet.sync.filter.PushbackSyncChannel;
 
 import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
 
@@ -121,7 +121,7 @@
                     // packets wiil get
                     // delivered.
                     try {
-                        stop(NO_WAIT_TIMEOUT);
+                        stop();
                         setAsyncChannelListener(null);
                     } catch (IOException e) {                        
                         getAsyncChannelListener().onPacketError(e);
@@ -176,7 +176,7 @@
         public void start() throws IOException {
             started = true;
         }
-        public void stop(long timeout) throws IOException {
+        public void stop() throws IOException {
             started = false;
         }
         

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

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

Copied: incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/jetty/JettyOnePortSocketListener.java (from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/JettyOnePortSocketListener.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/jetty/JettyOnePortSocketListener.java?p2=incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/jetty/JettyOnePortSocketListener.java&p1=incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/JettyOnePortSocketListener.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/JettyOnePortSocketListener.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/jetty/JettyOnePortSocketListener.java Mon Dec 19 08:50:54 2005
@@ -15,14 +15,16 @@
  * limitations under the License. 
  * 
  **/
-package org.activeio.oneport;
+package org.activeio.oneport.jetty;
 
 import java.io.IOException;
 import java.net.ServerSocket;
 
-import org.activeio.SyncChannelServer;
 import org.activeio.adapter.AsyncToSyncChannelServer;
 import org.activeio.adapter.SyncChannelServerToServerSocket;
+import org.activeio.oneport.HttpRecognizer;
+import org.activeio.oneport.OnePortAsyncChannelServer;
+import org.activeio.packet.sync.SyncChannelServer;
 import org.mortbay.http.SocketListener;
 import org.mortbay.util.InetAddrPort;
 

Copied: incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/openorb/OpenORBOpenPortFeatureInitializer.java (from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/OpenORBOpenPortFeatureInitializer.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/openorb/OpenORBOpenPortFeatureInitializer.java?p2=incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/openorb/OpenORBOpenPortFeatureInitializer.java&p1=incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/OpenORBOpenPortFeatureInitializer.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/OpenORBOpenPortFeatureInitializer.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/openorb/OpenORBOpenPortFeatureInitializer.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 org.omg.PortableInterceptor.ORBInitInfo;
 import org.openorb.orb.pi.FeatureInitInfo;

Copied: incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/openorb/OpenORBOpenPortSocketFactory.java (from r357173, incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/OpenORBOpenPortSocketFactory.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/openorb/OpenORBOpenPortSocketFactory.java?p2=incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/openorb/OpenORBOpenPortSocketFactory.java&p1=incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/OpenORBOpenPortSocketFactory.java&r1=357173&r2=357725&rev=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/OpenORBOpenPortSocketFactory.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/oneport/openorb/OpenORBOpenPortSocketFactory.java Mon Dec 19 08:50:54 2005
@@ -15,16 +15,18 @@
  * limitations under the License. 
  * 
  **/
-package org.activeio.oneport;
+package org.activeio.oneport.openorb;
 
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
 
-import org.activeio.SyncChannelServer;
 import org.activeio.adapter.AsyncToSyncChannelServer;
 import org.activeio.adapter.SyncChannelServerToServerSocket;
+import org.activeio.oneport.IIOPRecognizer;
+import org.activeio.oneport.OnePortAsyncChannelServer;
+import org.activeio.packet.sync.SyncChannelServer;
 import org.openorb.orb.net.SocketFactory;
 
 /**

Modified: incubator/activemq/trunk/activeio/src/java/org/activeio/packet/AppendedPacket.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/src/java/org/activeio/packet/AppendedPacket.java?rev=357725&r1=357724&r2=357725&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/src/java/org/activeio/packet/AppendedPacket.java (original)
+++ incubator/activemq/trunk/activeio/src/java/org/activeio/packet/AppendedPacket.java Mon Dec 19 08:50:54 2005
@@ -21,8 +21,6 @@
 import java.io.OutputStream;
 import java.lang.reflect.Constructor;
 
-import org.activeio.ByteSequence;
-import org.activeio.Packet;
 
 /**
  * Appends two packets together.
@@ -154,7 +152,7 @@
 
 
     /**
-     * @see org.activeio.Packet#read()
+     * @see org.activeio.packet.Packet#read()
      */
     public int read() {
         if( first.hasRemaining() ) {
@@ -167,7 +165,7 @@
     }
 
     /**
-     * @see org.activeio.Packet#read(byte[], int, int)
+     * @see org.activeio.packet.Packet#read(byte[], int, int)
      */
     public int read(byte[] data, int offset, int length) {        
         
@@ -183,7 +181,7 @@
     }
 
     /**
-     * @see org.activeio.Packet#write(int)
+     * @see org.activeio.packet.Packet#write(int)
      */
     public boolean write(int data) {
         if( first.hasRemaining() ) {
@@ -196,7 +194,7 @@
     }
 
     /**
-     * @see org.activeio.Packet#write(byte[], int, int)
+     * @see org.activeio.packet.Packet#write(byte[], int, int)
      */
     public int write(byte[] data, int offset, int length) {
         int rc1 = first.write(data, offset, length);        



Mime
View raw message