You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2005/12/22 18:53:13 UTC
svn commit: r358596 [2/5] - in /incubator/activemq/trunk/activeio: ./
activeio-aio/src/main/java/org/activeio/packet/async/aio/
activeio-aio/src/main/java/org/apache/
activeio-aio/src/main/java/org/apache/activeio/
activeio-aio/src/main/java/org/apache...
Modified: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/adapter/SyncToAsyncChannel.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/adapter/SyncToAsyncChannel.java?rev=358596&r1=358590&r2=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/adapter/SyncToAsyncChannel.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/adapter/SyncToAsyncChannel.java Thu Dec 22 09:51:34 2005
@@ -14,29 +14,29 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.adapter;
+package org.apache.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 org.activeio.Channel;
-import org.activeio.ChannelFactory;
-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 org.apache.activeio.Channel;
+import org.apache.activeio.ChannelFactory;
+import org.apache.activeio.packet.EOSPacket;
+import org.apache.activeio.packet.Packet;
+import org.apache.activeio.packet.async.AsyncChannel;
+import org.apache.activeio.packet.async.AsyncChannelListener;
+import org.apache.activeio.packet.sync.SyncChannel;
import java.io.IOException;
/**
- * Adapts a {@see org.activeio.SynchChannel} so that it provides an
- * {@see org.activeio.AsyncChannel} interface. When this channel
- * is started, a background thread is used to poll the {@see org.activeio.SynchChannel}
+ * Adapts a {@see org.apache.activeio.SynchChannel} so that it provides an
+ * {@see org.apache.activeio.AsyncChannel} interface. When this channel
+ * is started, a background thread is used to poll the {@see org.apache.activeio.SynchChannel}
* for packets comming up the channel which are then delivered to the
- * {@see org.activeio.ChannelConsumer}.
+ * {@see org.apache.activeio.ChannelConsumer}.
*
* @version $Revision$
*/
@@ -146,7 +146,7 @@
}
/**
- * @see org.activeio.packet.async.AsyncChannel#setAsyncChannelListener(org.activeio.UpPacketListener)
+ * @see org.apache.activeio.packet.async.AsyncChannel#setAsyncChannelListener(org.apache.activeio.UpPacketListener)
*/
public void setAsyncChannelListener(AsyncChannelListener channelListener) {
if (running.get())
@@ -155,21 +155,21 @@
}
/**
- * @see org.activeio.Channel#write(org.activeio.packet.Packet)
+ * @see org.apache.activeio.Channel#write(org.apache.activeio.packet.Packet)
*/
- public void write(org.activeio.packet.Packet packet) throws IOException {
+ public void write(org.apache.activeio.packet.Packet packet) throws IOException {
syncChannel.write(packet);
}
/**
- * @see org.activeio.Channel#flush()
+ * @see org.apache.activeio.Channel#flush()
*/
public void flush() throws IOException {
syncChannel.flush();
}
/**
- * @see org.activeio.Disposable#dispose()
+ * @see org.apache.activeio.Disposable#dispose()
*/
public void dispose() {
try {
Modified: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/adapter/SyncToAsyncChannelFactory.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/adapter/SyncToAsyncChannelFactory.java?rev=358596&r1=358590&r2=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/adapter/SyncToAsyncChannelFactory.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/adapter/SyncToAsyncChannelFactory.java Thu Dec 22 09:51:34 2005
@@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.adapter;
+package org.apache.activeio.adapter;
import java.io.IOException;
import java.net.URI;
-import org.activeio.ChannelFactory;
-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 org.apache.activeio.ChannelFactory;
+import org.apache.activeio.packet.async.AsyncChannel;
+import org.apache.activeio.packet.async.AsyncChannelFactory;
+import org.apache.activeio.packet.async.AsyncChannelServer;
+import org.apache.activeio.packet.sync.SyncChannelFactory;
import edu.emory.mathcs.backport.java.util.concurrent.Executor;
Modified: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/adapter/SyncToAsyncChannelServer.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/adapter/SyncToAsyncChannelServer.java?rev=358596&r1=358590&r2=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/adapter/SyncToAsyncChannelServer.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/adapter/SyncToAsyncChannelServer.java Thu Dec 22 09:51:34 2005
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package org.activeio.adapter;
+package org.apache.activeio.adapter;
import java.io.IOException;
import java.net.URI;
-import org.activeio.AcceptListener;
-import org.activeio.Channel;
-import org.activeio.ChannelFactory;
-import org.activeio.ChannelServer;
-import org.activeio.packet.async.AsyncChannelServer;
-import org.activeio.packet.sync.SyncChannelServer;
+import org.apache.activeio.AcceptListener;
+import org.apache.activeio.Channel;
+import org.apache.activeio.ChannelFactory;
+import org.apache.activeio.ChannelServer;
+import org.apache.activeio.packet.async.AsyncChannelServer;
+import org.apache.activeio.packet.sync.SyncChannelServer;
import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
import edu.emory.mathcs.backport.java.util.concurrent.Executor;
@@ -33,10 +33,10 @@
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
/**
- * Adapts a {@see org.activeio,SynchChannelServer} so that it provides an
- * {@see org.activeio.AsyncChannelServer} interface. When this channel
- * is started, a background thread is used to poll the (@see org.activeio.SynchChannelServer}
- * for accepted channel connections which are then delivered to the {@see org.activeio.AcceptConsumer}.
+ * Adapts a {@see org.apache.activeio,SynchChannelServer} so that it provides an
+ * {@see org.apache.activeio.AsyncChannelServer} interface. When this channel
+ * is started, a background thread is used to poll the (@see org.apache.activeio.SynchChannelServer}
+ * for accepted channel connections which are then delivered to the {@see org.apache.activeio.AcceptConsumer}.
*
* @version $Revision$
*/
@@ -127,7 +127,7 @@
}
/**
- * @see org.activeio.packet.async.AsyncChannelServer#setAcceptListener(org.activeio.AcceptListener)
+ * @see org.apache.activeio.packet.async.AsyncChannelServer#setAcceptListener(org.apache.activeio.AcceptListener)
*/
public void setAcceptListener(AcceptListener acceptListener) {
if(running.get())
@@ -136,7 +136,7 @@
}
/**
- * @see org.activeio.Disposable#dispose()
+ * @see org.apache.activeio.Disposable#dispose()
*/
public void dispose() {
try {
Modified: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/adapter/SynchToAsynchChannelAdapter.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/adapter/SynchToAsynchChannelAdapter.java?rev=358596&r1=358590&r2=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/adapter/SynchToAsynchChannelAdapter.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/adapter/SynchToAsynchChannelAdapter.java Thu Dec 22 09:51:34 2005
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.adapter;
+package org.apache.activeio.adapter;
-import org.activeio.Channel;
-import org.activeio.packet.async.AsyncChannel;
-import org.activeio.packet.sync.SyncChannel;
+import org.apache.activeio.Channel;
+import org.apache.activeio.packet.async.AsyncChannel;
+import org.apache.activeio.packet.sync.SyncChannel;
import edu.emory.mathcs.backport.java.util.concurrent.Executor;
@@ -45,7 +45,7 @@
return ((AsyncToSyncChannel)channel).getAsyncChannel();
}
// Can we just just undo the adaptor
- if( channel.getClass() == org.activeio.adapter.SynchToAsynchChannelAdapter.class ) {
+ if( channel.getClass() == org.apache.activeio.adapter.SynchToAsynchChannelAdapter.class ) {
return ((AsyncToSyncChannel)channel).getAsyncChannel();
}
Modified: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/command/AsyncChannelToAsyncCommandChannel.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/command/AsyncChannelToAsyncCommandChannel.java?rev=358596&r1=358590&r2=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/command/AsyncChannelToAsyncCommandChannel.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/command/AsyncChannelToAsyncCommandChannel.java Thu Dec 22 09:51:34 2005
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.command;
+package org.apache.activeio.command;
-import org.activeio.packet.EOSPacket;
-import org.activeio.packet.Packet;
-import org.activeio.packet.async.AsyncChannel;
-import org.activeio.packet.async.AsyncChannelListener;
+import org.apache.activeio.packet.EOSPacket;
+import org.apache.activeio.packet.Packet;
+import org.apache.activeio.packet.async.AsyncChannel;
+import org.apache.activeio.packet.async.AsyncChannelListener;
import java.io.EOFException;
import java.io.IOException;
Modified: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/command/AsyncCommandChannel.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/command/AsyncCommandChannel.java?rev=358596&r1=358590&r2=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/command/AsyncCommandChannel.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/command/AsyncCommandChannel.java Thu Dec 22 09:51:34 2005
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.command;
+package org.apache.activeio.command;
-import org.activeio.Channel;
+import org.apache.activeio.Channel;
import java.io.IOException;
Modified: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/command/ClassLoading.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/command/ClassLoading.java?rev=358596&r1=358590&r2=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/command/ClassLoading.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/command/ClassLoading.java Thu Dec 22 09:51:34 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.command;
+package org.apache.activeio.command;
import java.lang.reflect.Array;
import java.util.HashMap;
Modified: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/command/ClassLoadingAwareObjectInputStream.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/command/ClassLoadingAwareObjectInputStream.java?rev=358596&r1=358590&r2=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/command/ClassLoadingAwareObjectInputStream.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/command/ClassLoadingAwareObjectInputStream.java Thu Dec 22 09:51:34 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.command;
+package org.apache.activeio.command;
import java.io.IOException;
import java.io.InputStream;
@@ -23,7 +23,7 @@
import java.lang.reflect.Proxy;
/**
- * An input stream which uses the {@link org.activeio.command.ClassLoading} helper class
+ * An input stream which uses the {@link org.apache.activeio.command.ClassLoading} helper class
*
* @version $Revision: 1.1 $
*/
Modified: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/command/CommandListener.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/command/CommandListener.java?rev=358596&r1=358590&r2=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/command/CommandListener.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/command/CommandListener.java Thu Dec 22 09:51:34 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.command;
+package org.apache.activeio.command;
/**
Modified: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/command/DefaultWireFormat.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/command/DefaultWireFormat.java?rev=358596&r1=358590&r2=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/command/DefaultWireFormat.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/command/DefaultWireFormat.java Thu Dec 22 09:51:34 2005
@@ -14,17 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.command;
+package org.apache.activeio.command;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.ObjectOutputStream;
-import org.activeio.adapter.PacketToInputStream;
-import org.activeio.packet.ByteArrayPacket;
-import org.activeio.packet.Packet;
-import org.activeio.util.ByteArrayOutputStream;
+import org.apache.activeio.adapter.PacketToInputStream;
+import org.apache.activeio.packet.ByteArrayPacket;
+import org.apache.activeio.packet.Packet;
+import org.apache.activeio.util.ByteArrayOutputStream;
/**
* A default implementation which uses serialization
Modified: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/command/WireFormat.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/command/WireFormat.java?rev=358596&r1=358590&r2=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/command/WireFormat.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/command/WireFormat.java Thu Dec 22 09:51:34 2005
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.command;
+package org.apache.activeio.command;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import org.activeio.packet.Packet;
+import org.apache.activeio.packet.Packet;
/**
* Provides a mechanism to marshal commands into and out of packets
Modified: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/command/WireFormatFactory.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/command/WireFormatFactory.java?rev=358596&r1=358590&r2=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/command/WireFormatFactory.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/command/WireFormatFactory.java Thu Dec 22 09:51:34 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.command;
+package org.apache.activeio.command;
public interface WireFormatFactory {
WireFormat createWireFormat();
Copied: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/InvalidRecordLocationException.java (from r358590, incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/journal/InvalidRecordLocationException.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/InvalidRecordLocationException.java?p2=incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/InvalidRecordLocationException.java&p1=incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/journal/InvalidRecordLocationException.java&r1=358590&r2=358596&rev=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/journal/InvalidRecordLocationException.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/InvalidRecordLocationException.java Thu Dec 22 09:51:34 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.journal;
+package org.apache.activeio.journal;
/**
* Exception thrown by a Journal to indicate that an invalid RecordLocation was detected.
Copied: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/Journal.java (from r358590, incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/journal/Journal.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/Journal.java?p2=incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/Journal.java&p1=incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/journal/Journal.java&r1=358590&r2=358596&rev=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/journal/Journal.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/Journal.java Thu Dec 22 09:51:34 2005
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.journal;
+package org.apache.activeio.journal;
import java.io.IOException;
-import org.activeio.packet.Packet;
+import org.apache.activeio.packet.Packet;
/**
* A Journal is a record logging Interface that can be used to implement
Copied: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/JournalEventListener.java (from r358590, incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/journal/JournalEventListener.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/JournalEventListener.java?p2=incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/JournalEventListener.java&p1=incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/journal/JournalEventListener.java&r1=358590&r2=358596&rev=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/journal/JournalEventListener.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/JournalEventListener.java Thu Dec 22 09:51:34 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.journal;
+package org.apache.activeio.journal;
/**
* Defines an object which listens for Journal Events.
Copied: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/RecordLocation.java (from r358590, incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/journal/RecordLocation.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/RecordLocation.java?p2=incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/RecordLocation.java&p1=incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/journal/RecordLocation.java&r1=358590&r2=358596&rev=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/journal/RecordLocation.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/RecordLocation.java Thu Dec 22 09:51:34 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.journal;
+package org.apache.activeio.journal;
/**
* A RecordLocation is used to locate data records that have been
Modified: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/active/BatchedWrite.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/active/BatchedWrite.java?rev=358596&r1=358590&r2=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/active/BatchedWrite.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/active/BatchedWrite.java Thu Dec 22 09:51:34 2005
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.journal.active;
+package org.apache.activeio.journal.active;
-import org.activeio.packet.Packet;
+import org.apache.activeio.packet.Packet;
import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
Modified: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/active/ControlFile.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/active/ControlFile.java?rev=358596&r1=358590&r2=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/active/ControlFile.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/active/ControlFile.java Thu Dec 22 09:51:34 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.journal.active;
+package org.apache.activeio.journal.active;
import java.io.File;
import java.io.IOException;
@@ -26,8 +26,8 @@
import java.util.Properties;
import java.util.Set;
-import org.activeio.packet.ByteBufferPacket;
-import org.activeio.packet.Packet;
+import org.apache.activeio.packet.ByteBufferPacket;
+import org.apache.activeio.packet.Packet;
/**
* Control file holds the last known good state of the journal. It stores the state in
@@ -100,11 +100,11 @@
if ( lockSet == null ) {
Properties properties = System.getProperties();
synchronized(properties) {
- lockSet = (Set) properties.get("org.activeio.journal.active.lockMap");
+ lockSet = (Set) properties.get("org.apache.activeio.journal.active.lockMap");
if( lockSet == null ) {
lockSet = new HashSet();
}
- properties.put("org.activeio.journal.active.lockMap", lockSet);
+ properties.put("org.apache.activeio.journal.active.lockMap", lockSet);
}
}
return lockSet;
Modified: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/active/JournalImpl.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/active/JournalImpl.java?rev=358596&r1=358590&r2=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/active/JournalImpl.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/active/JournalImpl.java Thu Dec 22 09:51:34 2005
@@ -14,19 +14,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.journal.active;
+package org.apache.activeio.journal.active;
import java.io.File;
import java.io.IOException;
import java.io.InterruptedIOException;
-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 org.apache.activeio.journal.InvalidRecordLocationException;
+import org.apache.activeio.journal.Journal;
+import org.apache.activeio.journal.JournalEventListener;
+import org.apache.activeio.journal.RecordLocation;
+import org.apache.activeio.packet.ByteArrayPacket;
+import org.apache.activeio.packet.ByteBufferPacketPool;
+import org.apache.activeio.packet.Packet;
import edu.emory.mathcs.backport.java.util.concurrent.Callable;
import edu.emory.mathcs.backport.java.util.concurrent.ExecutionException;
@@ -60,8 +60,8 @@
*/
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)));
+ public static final int DEFAULT_POOL_SIZE = Integer.parseInt(System.getProperty("org.apache.activeio.journal.active.DefaultPoolSize", ""+(5)));
+ public static final int DEFAULT_PACKET_SIZE = Integer.parseInt(System.getProperty("org.apache.activeio.journal.active.DefaultPacketSize", ""+(1024*1024*4)));
static final private int OVERFLOW_RENOTIFICATION_DELAY = 500;
Modified: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/active/Location.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/active/Location.java?rev=358596&r1=358590&r2=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/active/Location.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/active/Location.java Thu Dec 22 09:51:34 2005
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.journal.active;
+package org.apache.activeio.journal.active;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
-import org.activeio.journal.RecordLocation;
-import org.activeio.packet.Packet;
-import org.activeio.packet.PacketData;
+import org.apache.activeio.journal.RecordLocation;
+import org.apache.activeio.packet.Packet;
+import org.apache.activeio.packet.PacketData;
/**
* Defines a where a record can be located in the Journal.
Modified: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/active/LogFile.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/active/LogFile.java?rev=358596&r1=358590&r2=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/active/LogFile.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/active/LogFile.java Thu Dec 22 09:51:34 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.journal.active;
+package org.apache.activeio.journal.active;
import java.io.File;
import java.io.FileOutputStream;
Modified: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/active/LogFileManager.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/active/LogFileManager.java?rev=358596&r1=358590&r2=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/active/LogFileManager.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/active/LogFileManager.java Thu Dec 22 09:51:34 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.journal.active;
+package org.apache.activeio.journal.active;
import java.io.DataInput;
import java.io.DataInputStream;
@@ -26,12 +26,12 @@
import java.text.NumberFormat;
import java.util.HashMap;
-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 org.apache.activeio.adapter.PacketOutputStream;
+import org.apache.activeio.adapter.PacketToInputStream;
+import org.apache.activeio.journal.InvalidRecordLocationException;
+import org.apache.activeio.packet.ByteArrayPacket;
+import org.apache.activeio.packet.ByteBufferPacket;
+import org.apache.activeio.packet.Packet;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
@@ -44,8 +44,8 @@
*/
final public class LogFileManager {
- public static final int DEFAULT_LOGFILE_COUNT = Integer.parseInt(System.getProperty("org.activeio.journal.active.DefaultLogFileCount", ""+(2)));
- public static final int DEFAULT_LOGFILE_SIZE = Integer.parseInt(System.getProperty("org.activeio.journal.active.DefaultLogFileSize", ""+(1024*1024*20)));
+ public static final int DEFAULT_LOGFILE_COUNT = Integer.parseInt(System.getProperty("org.apache.activeio.journal.active.DefaultLogFileCount", ""+(2)));
+ public static final int DEFAULT_LOGFILE_SIZE = Integer.parseInt(System.getProperty("org.apache.activeio.journal.active.DefaultLogFileSize", ""+(1024*1024*20)));
static final public int SERIALIZED_SIZE = 6+Location.SERIALIZED_SIZE;
Modified: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/active/LogFileNode.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/active/LogFileNode.java?rev=358596&r1=358590&r2=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/active/LogFileNode.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/active/LogFileNode.java Thu Dec 22 09:51:34 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.journal.active;
+package org.apache.activeio.journal.active;
import java.io.DataInput;
import java.io.DataOutput;
Modified: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/active/Record.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/active/Record.java?rev=358596&r1=358590&r2=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/active/Record.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/active/Record.java Thu Dec 22 09:51:34 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.journal.active;
+package org.apache.activeio.journal.active;
import java.io.DataInput;
import java.io.DataInputStream;
@@ -23,10 +23,10 @@
import java.io.IOException;
import java.util.zip.CRC32;
-import org.activeio.adapter.PacketOutputStream;
-import org.activeio.adapter.PacketToInputStream;
-import org.activeio.packet.ByteArrayPacket;
-import org.activeio.packet.Packet;
+import org.apache.activeio.adapter.PacketOutputStream;
+import org.apache.activeio.adapter.PacketToInputStream;
+import org.apache.activeio.packet.ByteArrayPacket;
+import org.apache.activeio.packet.Packet;
/**
@@ -49,7 +49,7 @@
static final public int CRC32_CHECKSUM_ALGORITHIM=2;
static {
- String type = System.getProperty("org.activeio.journal.active.SELECTED_CHECKSUM_ALGORITHIM", "none");
+ String type = System.getProperty("org.apache.activeio.journal.active.SELECTED_CHECKSUM_ALGORITHIM", "none");
if( "none".equals(type) ) {
SELECTED_CHECKSUM_ALGORITHIM = NO_CHECKSUM_ALGORITHIM;
} else if( "crc32".equals(type) ) {
@@ -57,7 +57,7 @@
} else if( "hash".equals(type) ) {
SELECTED_CHECKSUM_ALGORITHIM = HASH_CHECKSUM_ALGORITHIM;
} else {
- System.err.println("System property 'org.activeio.journal.active.SELECTED_CHECKSUM_ALGORITHIM' not set properly. Valid values are: 'none', 'hash', or 'crc32'");
+ System.err.println("System property 'org.apache.activeio.journal.active.SELECTED_CHECKSUM_ALGORITHIM' not set properly. Valid values are: 'none', 'hash', or 'crc32'");
SELECTED_CHECKSUM_ALGORITHIM = NO_CHECKSUM_ALGORITHIM;
}
}
Modified: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/active/RecordInfo.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/active/RecordInfo.java?rev=358596&r1=358590&r2=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/active/RecordInfo.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/active/RecordInfo.java Thu Dec 22 09:51:34 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.journal.active;
+package org.apache.activeio.journal.active;
/**
* @version $Revision: 1.1 $
Modified: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/howl/HowlJournal.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/howl/HowlJournal.java?rev=358596&r1=358590&r2=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/howl/HowlJournal.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/howl/HowlJournal.java Thu Dec 22 09:51:34 2005
@@ -14,17 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.journal.howl;
+package org.apache.activeio.journal.howl;
import java.io.IOException;
import java.io.InterruptedIOException;
-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.apache.activeio.journal.InvalidRecordLocationException;
+import org.apache.activeio.journal.Journal;
+import org.apache.activeio.journal.JournalEventListener;
+import org.apache.activeio.journal.RecordLocation;
+import org.apache.activeio.packet.ByteArrayPacket;
+import org.apache.activeio.packet.Packet;
import org.objectweb.howl.log.Configuration;
import org.objectweb.howl.log.InvalidFileSetException;
import org.objectweb.howl.log.InvalidLogBufferException;
@@ -60,7 +60,7 @@
}
/**
- * @see org.activeio.journal.Journal#write(byte[], boolean)
+ * @see org.apache.activeio.journal.Journal#write(byte[], boolean)
*/
public RecordLocation write(Packet packet, boolean sync) throws IOException {
try {
@@ -77,7 +77,7 @@
}
/**
- * @see org.activeio.journal.Journal#setMark(org.codehaus.activemq.journal.RecordLocation, boolean)
+ * @see org.apache.activeio.journal.Journal#setMark(org.codehaus.activemq.journal.RecordLocation, boolean)
*/
public void setMark(RecordLocation recordLocator, boolean force)
throws InvalidRecordLocationException, IOException {
@@ -115,14 +115,14 @@
}
/**
- * @see org.activeio.journal.Journal#getMark()
+ * @see org.apache.activeio.journal.Journal#getMark()
*/
public RecordLocation getMark() {
return lastMark;
}
/**
- * @see org.activeio.journal.Journal#close()
+ * @see org.apache.activeio.journal.Journal#close()
*/
public void close() throws IOException {
try {
@@ -139,7 +139,7 @@
}
/**
- * @see org.activeio.journal.Journal#setJournalEventListener(org.codehaus.activemq.journal.JournalEventListener)
+ * @see org.apache.activeio.journal.Journal#setJournalEventListener(org.codehaus.activemq.journal.JournalEventListener)
*/
public void setJournalEventListener(final JournalEventListener eventListener) {
logger.setLogEventListener(new LogEventListener() {
@@ -150,7 +150,7 @@
}
/**
- * @see org.activeio.journal.Journal#getNextRecordLocation(org.codehaus.activemq.journal.RecordLocation)
+ * @see org.apache.activeio.journal.Journal#getNextRecordLocation(org.codehaus.activemq.journal.RecordLocation)
*/
public RecordLocation getNextRecordLocation(RecordLocation lastLocation)
throws InvalidRecordLocationException {
@@ -181,7 +181,7 @@
}
/**
- * @see org.activeio.journal.Journal#read(org.codehaus.activemq.journal.RecordLocation)
+ * @see org.apache.activeio.journal.Journal#read(org.codehaus.activemq.journal.RecordLocation)
*/
public Packet read(RecordLocation location)
throws InvalidRecordLocationException, IOException {
Modified: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/howl/LongRecordLocation.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/howl/LongRecordLocation.java?rev=358596&r1=358590&r2=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/howl/LongRecordLocation.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/journal/howl/LongRecordLocation.java Thu Dec 22 09:51:34 2005
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.journal.howl;
+package org.apache.activeio.journal.howl;
-import org.activeio.journal.RecordLocation;
+import org.apache.activeio.journal.RecordLocation;
/**
* Provides a RecordLocation implementation for the long based
Copied: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/oneport/HttpRecognizer.java (from r358590, incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/oneport/HttpRecognizer.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/oneport/HttpRecognizer.java?p2=incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/oneport/HttpRecognizer.java&p1=incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/oneport/HttpRecognizer.java&r1=358590&r2=358596&rev=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/oneport/HttpRecognizer.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/oneport/HttpRecognizer.java Thu Dec 22 09:51:34 2005
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.oneport;
+package org.apache.activeio.oneport;
import java.util.HashSet;
-import org.activeio.packet.Packet;
+import org.apache.activeio.packet.Packet;
public class HttpRecognizer implements ProtocolRecognizer {
Copied: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/oneport/IIOPRecognizer.java (from r358590, incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/oneport/IIOPRecognizer.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/oneport/IIOPRecognizer.java?p2=incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/oneport/IIOPRecognizer.java&p1=incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/oneport/IIOPRecognizer.java&r1=358590&r2=358596&rev=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/oneport/IIOPRecognizer.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/oneport/IIOPRecognizer.java Thu Dec 22 09:51:34 2005
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.oneport;
+package org.apache.activeio.oneport;
-import org.activeio.packet.Packet;
+import org.apache.activeio.packet.Packet;
public class IIOPRecognizer implements ProtocolRecognizer {
Copied: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/oneport/OnePortAsyncChannelServer.java (from r358590, incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/oneport/OnePortAsyncChannelServer.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/oneport/OnePortAsyncChannelServer.java?p2=incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/oneport/OnePortAsyncChannelServer.java&p1=incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/oneport/OnePortAsyncChannelServer.java&r1=358590&r2=358596&rev=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/oneport/OnePortAsyncChannelServer.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/oneport/OnePortAsyncChannelServer.java Thu Dec 22 09:51:34 2005
@@ -14,25 +14,25 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.oneport;
+package org.apache.activeio.oneport;
import java.io.IOException;
import java.net.URI;
import java.util.Iterator;
-import org.activeio.AcceptListener;
-import org.activeio.Channel;
-import org.activeio.adapter.AsyncToSyncChannel;
-import org.activeio.adapter.SyncToAsyncChannel;
-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 org.apache.activeio.AcceptListener;
+import org.apache.activeio.Channel;
+import org.apache.activeio.adapter.AsyncToSyncChannel;
+import org.apache.activeio.adapter.SyncToAsyncChannel;
+import org.apache.activeio.packet.AppendedPacket;
+import org.apache.activeio.packet.Packet;
+import org.apache.activeio.packet.async.AsyncChannel;
+import org.apache.activeio.packet.async.AsyncChannelListener;
+import org.apache.activeio.packet.async.AsyncChannelServer;
+import org.apache.activeio.packet.async.FilterAsyncChannel;
+import org.apache.activeio.packet.async.FilterAsyncChannelServer;
+import org.apache.activeio.packet.sync.SyncChannel;
+import org.apache.activeio.packet.sync.filter.PushbackSyncChannel;
import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
Copied: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/oneport/ProtocolRecognizer.java (from r358590, incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/oneport/ProtocolRecognizer.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/oneport/ProtocolRecognizer.java?p2=incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/oneport/ProtocolRecognizer.java&p1=incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/oneport/ProtocolRecognizer.java&r1=358590&r2=358596&rev=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/oneport/ProtocolRecognizer.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/oneport/ProtocolRecognizer.java Thu Dec 22 09:51:34 2005
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.oneport;
+package org.apache.activeio.oneport;
-import org.activeio.packet.Packet;
+import org.apache.activeio.packet.Packet;
/**
*
Copied: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/oneport/UnknownRecognizer.java (from r358590, incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/oneport/UnknownRecognizer.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/oneport/UnknownRecognizer.java?p2=incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/oneport/UnknownRecognizer.java&p1=incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/oneport/UnknownRecognizer.java&r1=358590&r2=358596&rev=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/oneport/UnknownRecognizer.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/oneport/UnknownRecognizer.java Thu Dec 22 09:51:34 2005
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.oneport;
+package org.apache.activeio.oneport;
-import org.activeio.packet.Packet;
+import org.apache.activeio.packet.Packet;
class UnknownRecognizer implements ProtocolRecognizer {
Modified: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/oneport/jetty/JettyOnePortSocketListener.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/oneport/jetty/JettyOnePortSocketListener.java?rev=358596&r1=358590&r2=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/oneport/jetty/JettyOnePortSocketListener.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/oneport/jetty/JettyOnePortSocketListener.java Thu Dec 22 09:51:34 2005
@@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.oneport.jetty;
+package org.apache.activeio.oneport.jetty;
import java.io.IOException;
import java.net.ServerSocket;
-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.apache.activeio.adapter.AsyncToSyncChannelServer;
+import org.apache.activeio.adapter.SyncChannelServerToServerSocket;
+import org.apache.activeio.oneport.HttpRecognizer;
+import org.apache.activeio.oneport.OnePortAsyncChannelServer;
+import org.apache.activeio.packet.sync.SyncChannelServer;
import org.mortbay.http.SocketListener;
import org.mortbay.util.InetAddrPort;
Modified: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/oneport/openorb/OpenORBOpenPortFeatureInitializer.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/oneport/openorb/OpenORBOpenPortFeatureInitializer.java?rev=358596&r1=358590&r2=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/oneport/openorb/OpenORBOpenPortFeatureInitializer.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/oneport/openorb/OpenORBOpenPortFeatureInitializer.java Thu Dec 22 09:51:34 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.oneport.openorb;
+package org.apache.activeio.oneport.openorb;
import org.omg.PortableInterceptor.ORBInitInfo;
import org.openorb.orb.pi.FeatureInitInfo;
Modified: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/oneport/openorb/OpenORBOpenPortSocketFactory.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/oneport/openorb/OpenORBOpenPortSocketFactory.java?rev=358596&r1=358590&r2=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/oneport/openorb/OpenORBOpenPortSocketFactory.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/oneport/openorb/OpenORBOpenPortSocketFactory.java Thu Dec 22 09:51:34 2005
@@ -14,18 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.oneport.openorb;
+package org.apache.activeio.oneport.openorb;
import java.io.IOException;
import java.net.InetAddress;
import java.net.ServerSocket;
import java.net.Socket;
-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.apache.activeio.adapter.AsyncToSyncChannelServer;
+import org.apache.activeio.adapter.SyncChannelServerToServerSocket;
+import org.apache.activeio.oneport.IIOPRecognizer;
+import org.apache.activeio.oneport.OnePortAsyncChannelServer;
+import org.apache.activeio.packet.sync.SyncChannelServer;
import org.openorb.orb.net.SocketFactory;
/**
Copied: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/AppendedPacket.java (from r358590, incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/AppendedPacket.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/AppendedPacket.java?p2=incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/AppendedPacket.java&p1=incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/AppendedPacket.java&r1=358590&r2=358596&rev=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/AppendedPacket.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/AppendedPacket.java Thu Dec 22 09:51:34 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.packet;
+package org.apache.activeio.packet;
import java.io.DataOutput;
import java.io.IOException;
@@ -152,7 +152,7 @@
/**
- * @see org.activeio.packet.Packet#read()
+ * @see org.apache.activeio.packet.Packet#read()
*/
public int read() {
if( first.hasRemaining() ) {
@@ -165,7 +165,7 @@
}
/**
- * @see org.activeio.packet.Packet#read(byte[], int, int)
+ * @see org.apache.activeio.packet.Packet#read(byte[], int, int)
*/
public int read(byte[] data, int offset, int length) {
@@ -181,7 +181,7 @@
}
/**
- * @see org.activeio.packet.Packet#write(int)
+ * @see org.apache.activeio.packet.Packet#write(int)
*/
public boolean write(int data) {
if( first.hasRemaining() ) {
@@ -194,7 +194,7 @@
}
/**
- * @see org.activeio.packet.Packet#write(byte[], int, int)
+ * @see org.apache.activeio.packet.Packet#write(byte[], int, int)
*/
public int write(byte[] data, int offset, int length) {
int rc1 = first.write(data, offset, length);
Copied: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/ByteArrayPacket.java (from r358590, incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/ByteArrayPacket.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/ByteArrayPacket.java?p2=incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/ByteArrayPacket.java&p1=incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/ByteArrayPacket.java&r1=358590&r2=358596&rev=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/ByteArrayPacket.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/ByteArrayPacket.java Thu Dec 22 09:51:34 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.packet;
+package org.apache.activeio.packet;
import java.io.DataOutput;
import java.io.IOException;
@@ -133,7 +133,7 @@
}
/**
- * @see org.activeio.packet.Packet#read()
+ * @see org.apache.activeio.packet.Packet#read()
*/
public int read() {
if( !(remaining > 0) )
@@ -145,7 +145,7 @@
}
/**
- * @see org.activeio.packet.Packet#read(byte[], int, int)
+ * @see org.apache.activeio.packet.Packet#read(byte[], int, int)
*/
public int read(byte[] data, int offset, int length) {
if( !(remaining > 0) )
@@ -159,7 +159,7 @@
}
/**
- * @see org.activeio.packet.Packet#write(int)
+ * @see org.apache.activeio.packet.Packet#write(int)
*/
public boolean write(int data) {
if( !(remaining > 0) )
@@ -171,7 +171,7 @@
}
/**
- * @see org.activeio.packet.Packet#write(byte[], int, int)
+ * @see org.apache.activeio.packet.Packet#write(byte[], int, int)
*/
public int write(byte[] data, int offset, int length) {
if( !(remaining > 0) )
@@ -189,7 +189,7 @@
}
/**
- * @see org.activeio.packet.Packet#sliceAsBytes()
+ * @see org.apache.activeio.packet.Packet#sliceAsBytes()
*/
public byte[] sliceAsBytes() {
if( buffer.length == remaining ) {
Copied: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/ByteBufferPacket.java (from r358590, incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/ByteBufferPacket.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/ByteBufferPacket.java?p2=incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/ByteBufferPacket.java&p1=incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/ByteBufferPacket.java&r1=358590&r2=358596&rev=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/ByteBufferPacket.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/ByteBufferPacket.java Thu Dec 22 09:51:34 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.packet;
+package org.apache.activeio.packet;
import java.io.DataOutput;
import java.io.IOException;
@@ -30,8 +30,8 @@
*/
final public class ByteBufferPacket implements Packet {
- public static final int DEFAULT_BUFFER_SIZE = Integer.parseInt(System.getProperty("org.activeio.DefaultByteBufferSize", ""+(64*1024)));
- public static final int DEFAULT_DIRECT_BUFFER_SIZE = Integer.parseInt(System.getProperty("org.activeio.DefaultDirectByteBufferSize", ""+(8*1024)));
+ public static final int DEFAULT_BUFFER_SIZE = Integer.parseInt(System.getProperty("org.apache.activeio.DefaultByteBufferSize", ""+(64*1024)));
+ public static final int DEFAULT_DIRECT_BUFFER_SIZE = Integer.parseInt(System.getProperty("org.apache.activeio.DefaultDirectByteBufferSize", ""+(8*1024)));
private final ByteBuffer buffer;
private static final int TEMP_BUFFER_SIZE = 64*1024;
@@ -172,7 +172,7 @@
/**
- * @see org.activeio.packet.Packet#read()
+ * @see org.apache.activeio.packet.Packet#read()
*/
public int read() {
if( !buffer.hasRemaining() )
@@ -181,7 +181,7 @@
}
/**
- * @see org.activeio.packet.Packet#read(byte[], int, int)
+ * @see org.apache.activeio.packet.Packet#read(byte[], int, int)
*/
public int read(byte[] data, int offset, int length) {
if( !hasRemaining() )
@@ -193,7 +193,7 @@
}
/**
- * @see org.activeio.packet.Packet#write(int)
+ * @see org.apache.activeio.packet.Packet#write(int)
*/
public boolean write(int data) {
if( !buffer.hasRemaining() )
@@ -203,7 +203,7 @@
}
/**
- * @see org.activeio.packet.Packet#write(byte[], int, int)
+ * @see org.apache.activeio.packet.Packet#write(byte[], int, int)
*/
public int write(byte[] data, int offset, int length) {
if( !hasRemaining() )
@@ -215,7 +215,7 @@
}
/**
- * @see org.activeio.packet.Packet#asByteSequence()
+ * @see org.apache.activeio.packet.Packet#asByteSequence()
*/
public ByteSequence asByteSequence() {
if( buffer.hasArray() ) {
@@ -227,7 +227,7 @@
}
/**
- * @see org.activeio.packet.Packet#sliceAsBytes()
+ * @see org.apache.activeio.packet.Packet#sliceAsBytes()
*/
public byte[] sliceAsBytes() {
// TODO Auto-generated method stub
Copied: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/ByteBufferPacketPool.java (from r358590, incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/ByteBufferPacketPool.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/ByteBufferPacketPool.java?p2=incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/ByteBufferPacketPool.java&p1=incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/ByteBufferPacketPool.java&r1=358590&r2=358596&rev=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/ByteBufferPacketPool.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/ByteBufferPacketPool.java Thu Dec 22 09:51:34 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.packet;
+package org.apache.activeio.packet;
import java.nio.ByteBuffer;
Copied: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/BytePacket.java (from r358590, incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/BytePacket.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/BytePacket.java?p2=incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/BytePacket.java&p1=incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/BytePacket.java&r1=358590&r2=358596&rev=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/BytePacket.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/BytePacket.java Thu Dec 22 09:51:34 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.packet;
+package org.apache.activeio.packet;
import java.io.DataOutput;
import java.io.IOException;
@@ -118,7 +118,7 @@
}
/**
- * @see org.activeio.packet.Packet#read()
+ * @see org.apache.activeio.packet.Packet#read()
*/
public int read() {
if( !hasRemaining() )
@@ -128,7 +128,7 @@
}
/**
- * @see org.activeio.packet.Packet#read(byte[], int, int)
+ * @see org.apache.activeio.packet.Packet#read(byte[], int, int)
*/
public int read(byte[] data, int offset, int length) {
if( !hasRemaining() )
@@ -143,7 +143,7 @@
}
/**
- * @see org.activeio.packet.Packet#write(int)
+ * @see org.apache.activeio.packet.Packet#write(int)
*/
public boolean write(int data) {
if( !hasRemaining() )
@@ -155,7 +155,7 @@
}
/**
- * @see org.activeio.packet.Packet#write(byte[], int, int)
+ * @see org.apache.activeio.packet.Packet#write(byte[], int, int)
*/
public int write(byte[] data, int offset, int length) {
if( !hasRemaining() )
@@ -174,7 +174,7 @@
}
/**
- * @see org.activeio.packet.Packet#sliceAsBytes()
+ * @see org.apache.activeio.packet.Packet#sliceAsBytes()
*/
public byte[] sliceAsBytes() {
return null;
Copied: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/ByteSequence.java (from r358590, incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/ByteSequence.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/ByteSequence.java?p2=incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/ByteSequence.java&p1=incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/ByteSequence.java&r1=358590&r2=358596&rev=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/ByteSequence.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/ByteSequence.java Thu Dec 22 09:51:34 2005
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.activeio.packet;
+package org.apache.activeio.packet;
public class ByteSequence {
final byte[] data;
Copied: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/EOSPacket.java (from r358590, incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/EOSPacket.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/EOSPacket.java?p2=incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/EOSPacket.java&p1=incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/EOSPacket.java&r1=358590&r2=358596&rev=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/EOSPacket.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/EOSPacket.java Thu Dec 22 09:51:34 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.packet;
+package org.apache.activeio.packet;
import java.io.DataOutput;
import java.io.IOException;
@@ -91,28 +91,28 @@
}
/**
- * @see org.activeio.packet.Packet#read()
+ * @see org.apache.activeio.packet.Packet#read()
*/
public int read() {
return -1;
}
/**
- * @see org.activeio.packet.Packet#read(byte[], int, int)
+ * @see org.apache.activeio.packet.Packet#read(byte[], int, int)
*/
public int read(byte[] data, int offset, int length) {
return -1;
}
/**
- * @see org.activeio.packet.Packet#write(int)
+ * @see org.apache.activeio.packet.Packet#write(int)
*/
public boolean write(int data) {
return false;
}
/**
- * @see org.activeio.packet.Packet#write(byte[], int, int)
+ * @see org.apache.activeio.packet.Packet#write(byte[], int, int)
*/
public int write(byte[] data, int offset, int length) {
return -1;
Copied: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/EmptyPacket.java (from r358590, incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/EmptyPacket.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/EmptyPacket.java?p2=incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/EmptyPacket.java&p1=incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/EmptyPacket.java&r1=358590&r2=358596&rev=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/EmptyPacket.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/EmptyPacket.java Thu Dec 22 09:51:34 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.packet;
+package org.apache.activeio.packet;
import java.io.DataOutput;
import java.io.IOException;
@@ -93,28 +93,28 @@
}
/**
- * @see org.activeio.packet.Packet#read()
+ * @see org.apache.activeio.packet.Packet#read()
*/
public int read() {
return -1;
}
/**
- * @see org.activeio.packet.Packet#read(byte[], int, int)
+ * @see org.apache.activeio.packet.Packet#read(byte[], int, int)
*/
public int read(byte[] data, int offset, int length) {
return -1;
}
/**
- * @see org.activeio.packet.Packet#write(int)
+ * @see org.apache.activeio.packet.Packet#write(int)
*/
public boolean write(int data) {
return false;
}
/**
- * @see org.activeio.packet.Packet#write(byte[], int, int)
+ * @see org.apache.activeio.packet.Packet#write(byte[], int, int)
*/
public int write(byte[] data, int offset, int length) {
return -1;
Copied: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/FilterPacket.java (from r358590, incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/FilterPacket.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/FilterPacket.java?p2=incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/FilterPacket.java&p1=incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/FilterPacket.java&r1=358590&r2=358596&rev=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/FilterPacket.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/FilterPacket.java Thu Dec 22 09:51:34 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.packet;
+package org.apache.activeio.packet;
import java.io.DataOutput;
import java.io.IOException;
Copied: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/Packet.java (from r358590, incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/Packet.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/Packet.java?p2=incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/Packet.java&p1=incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/Packet.java&r1=358590&r2=358596&rev=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/Packet.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/Packet.java Thu Dec 22 09:51:34 2005
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.packet;
+package org.apache.activeio.packet;
import java.io.DataOutput;
import java.io.IOException;
import java.io.OutputStream;
-import org.activeio.Adaptable;
+import org.apache.activeio.Adaptable;
/**
* Provides a ByteBuffer like interface to work with IO channel packets of data.
Copied: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/PacketData.java (from r358590, incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/PacketData.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/PacketData.java?p2=incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/PacketData.java&p1=incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/PacketData.java&r1=358590&r2=358596&rev=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/PacketData.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/PacketData.java Thu Dec 22 09:51:34 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.packet;
+package org.apache.activeio.packet;
import java.io.EOFException;
import java.io.IOException;
Copied: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/PacketPool.java (from r358590, incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/PacketPool.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/PacketPool.java?p2=incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/PacketPool.java&p1=incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/PacketPool.java&r1=358590&r2=358596&rev=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/PacketPool.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/PacketPool.java Thu Dec 22 09:51:34 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.packet;
+package org.apache.activeio.packet;
import java.util.ArrayList;
@@ -28,8 +28,8 @@
*/
abstract public class PacketPool {
- 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)));
+ public static final int DEFAULT_POOL_SIZE = Integer.parseInt(System.getProperty("org.apache.activeio.journal.active.DefaultPoolSize", ""+(5)));
+ public static final int DEFAULT_PACKET_SIZE = Integer.parseInt(System.getProperty("org.apache.activeio.journal.active.DefaultPacketSize", ""+(1024*1024*4)));
private final ArrayList pool = new ArrayList();
private final int maxPackets;
Copied: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/async/AsyncChannel.java (from r358590, incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/async/AsyncChannel.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/async/AsyncChannel.java?p2=incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/async/AsyncChannel.java&p1=incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/async/AsyncChannel.java&r1=358590&r2=358596&rev=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/async/AsyncChannel.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/async/AsyncChannel.java Thu Dec 22 09:51:34 2005
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package org.activeio.packet.async;
+package org.apache.activeio.packet.async;
import java.io.IOException;
-import org.activeio.Channel;
-import org.activeio.packet.Packet;
+import org.apache.activeio.Channel;
+import org.apache.activeio.packet.Packet;
/**
- * AsyncChannel objects asynchronously push 'up' {@see org.activeio.Packet} objects
- * to a registered {@see org.activeio.ChannelConsumer}.
+ * AsyncChannel objects asynchronously push 'up' {@see org.apache.activeio.Packet} objects
+ * to a registered {@see org.apache.activeio.ChannelConsumer}.
*
* @version $Revision$
*/
Copied: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/async/AsyncChannelFactory.java (from r358590, incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/async/AsyncChannelFactory.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/async/AsyncChannelFactory.java?p2=incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/async/AsyncChannelFactory.java&p1=incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/async/AsyncChannelFactory.java&r1=358590&r2=358596&rev=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/async/AsyncChannelFactory.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/async/AsyncChannelFactory.java Thu Dec 22 09:51:34 2005
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.packet.async;
+package org.apache.activeio.packet.async;
import java.io.IOException;
import java.net.URI;
/**
- * AsyncChannelFactory objects can create {@see org.activeio.AsyncChannel}
- * and {@see org.activeio.AsyncChannelServer} objects.
+ * AsyncChannelFactory objects can create {@see org.apache.activeio.AsyncChannel}
+ * and {@see org.apache.activeio.AsyncChannelServer} objects.
*
* @version $Revision$
*/
Copied: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/async/AsyncChannelListener.java (from r358590, incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/async/AsyncChannelListener.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/async/AsyncChannelListener.java?p2=incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/async/AsyncChannelListener.java&p1=incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/async/AsyncChannelListener.java&r1=358590&r2=358596&rev=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/async/AsyncChannelListener.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/async/AsyncChannelListener.java Thu Dec 22 09:51:34 2005
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.packet.async;
+package org.apache.activeio.packet.async;
import java.io.IOException;
-import org.activeio.packet.Packet;
+import org.apache.activeio.packet.Packet;
/**
- * A ChannelConsumer object is used to receive 'up' {@see org.activeio.Packet} objects.
+ * A ChannelConsumer object is used to receive 'up' {@see org.apache.activeio.Packet} objects.
*
* TODO: describe the threading model so that the implementor of this interface can know if
* the methods in this interface can block for a long time or not. I'm thinking that it would
Copied: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/async/AsyncChannelServer.java (from r358590, incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/async/AsyncChannelServer.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/async/AsyncChannelServer.java?p2=incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/async/AsyncChannelServer.java&p1=incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/async/AsyncChannelServer.java&r1=358590&r2=358596&rev=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/async/AsyncChannelServer.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/async/AsyncChannelServer.java Thu Dec 22 09:51:34 2005
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.packet.async;
+package org.apache.activeio.packet.async;
-import org.activeio.AcceptListener;
-import org.activeio.ChannelServer;
+import org.apache.activeio.AcceptListener;
+import org.apache.activeio.ChannelServer;
/**
- * AsyncChannelServer objects asynchronously accept and create {@see org.activeio.Channel} objects
- * and then delivers those objects to a {@see org.activeio.AcceptConsumer}.
+ * AsyncChannelServer objects asynchronously accept and create {@see org.apache.activeio.Channel} objects
+ * and then delivers those objects to a {@see org.apache.activeio.AcceptConsumer}.
*
* @version $Revision$
*/
Copied: incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/async/FilterAsyncChannel.java (from r358590, incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/async/FilterAsyncChannel.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/async/FilterAsyncChannel.java?p2=incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/async/FilterAsyncChannel.java&p1=incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/async/FilterAsyncChannel.java&r1=358590&r2=358596&rev=358596&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/async/FilterAsyncChannel.java (original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/java/org/apache/activeio/packet/async/FilterAsyncChannel.java Thu Dec 22 09:51:34 2005
@@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.activeio.packet.async;
+package org.apache.activeio.packet.async;
import java.io.IOException;
-import org.activeio.packet.Packet;
+import org.apache.activeio.packet.Packet;
/**
- * A AsyncChannelFilter can be used as a filter between a {@see org.activeio.AsyncChannel}
- * and it's {@see org.activeio.ChannelConsumer}. Most {@see org.activeio.AsyncChannel}
+ * A AsyncChannelFilter can be used as a filter between a {@see org.apache.activeio.AsyncChannel}
+ * and it's {@see org.apache.activeio.ChannelConsumer}. Most {@see org.apache.activeio.AsyncChannel}
* that are not directly accessing the network will extends the AsyncChannelFilter since they act as a
* filter between the client and the network. O
*
@@ -57,14 +57,14 @@
}
/**
- * @see org.activeio.Disposable#dispose()
+ * @see org.apache.activeio.Disposable#dispose()
*/
public void dispose() {
next.dispose();
}
/**
- * @see org.activeio.Service#start()
+ * @see org.apache.activeio.Service#start()
* @throws IOException if the next channel has not been set.
*/
public void start() throws IOException {
@@ -76,21 +76,21 @@
}
/**
- * @see org.activeio.Service#stop()
+ * @see org.apache.activeio.Service#stop()
*/
public void stop() throws IOException {
next.stop();
}
/**
- * @see org.activeio.packet.async.AsyncChannelListener#onPacket(org.activeio.packet.Packet)
+ * @see org.apache.activeio.packet.async.AsyncChannelListener#onPacket(org.apache.activeio.packet.Packet)
*/
public void onPacket(Packet packet) {
channelListener.onPacket(packet);
}
/**
- * @see org.activeio.packet.async.AsyncChannelListener#onPacketError(org.activeio.ChannelException)
+ * @see org.apache.activeio.packet.async.AsyncChannelListener#onPacketError(org.apache.activeio.ChannelException)
*/
public void onPacketError(IOException error) {
channelListener.onPacketError(error);