http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/NIOSequentialFile.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/NIOSequentialFile.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/NIOSequentialFile.java index 97a70dc..4660161 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/NIOSequentialFile.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/NIOSequentialFile.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal.impl; +package org.apache.activemq.core.journal.impl; import java.io.File; import java.io.IOException; @@ -21,15 +21,15 @@ import java.util.concurrent.Executor; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQExceptionType; -import org.apache.activemq6.api.core.HornetQIOErrorException; -import org.apache.activemq6.api.core.HornetQIllegalStateException; -import org.apache.activemq6.core.journal.IOAsyncTask; -import org.apache.activemq6.core.journal.SequentialFile; -import org.apache.activemq6.core.journal.SequentialFileFactory; -import org.apache.activemq6.journal.HornetQJournalBundle; -import org.apache.activemq6.journal.HornetQJournalLogger; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQExceptionType; +import org.apache.activemq.api.core.HornetQIOErrorException; +import org.apache.activemq.api.core.HornetQIllegalStateException; +import org.apache.activemq.core.journal.IOAsyncTask; +import org.apache.activemq.core.journal.SequentialFile; +import org.apache.activemq.core.journal.SequentialFileFactory; +import org.apache.activemq.journal.HornetQJournalBundle; +import org.apache.activemq.journal.HornetQJournalLogger; /** * A NIOSequentialFile
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/NIOSequentialFileFactory.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/NIOSequentialFileFactory.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/NIOSequentialFileFactory.java index 2137477..3e2a14a 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/NIOSequentialFileFactory.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/NIOSequentialFileFactory.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal.impl; +package org.apache.activemq.core.journal.impl; import java.lang.ref.WeakReference; import java.nio.ByteBuffer; -import org.apache.activemq6.core.journal.IOCriticalErrorListener; -import org.apache.activemq6.core.journal.SequentialFile; +import org.apache.activemq.core.journal.IOCriticalErrorListener; +import org.apache.activemq.core.journal.SequentialFile; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/Reclaimer.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/Reclaimer.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/Reclaimer.java index c5d1800..4638ff5 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/Reclaimer.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/Reclaimer.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal.impl; +package org.apache.activemq.core.journal.impl; -import org.apache.activemq6.journal.HornetQJournalLogger; +import org.apache.activemq.journal.HornetQJournalLogger; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/SimpleWaitIOCallback.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/SimpleWaitIOCallback.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/SimpleWaitIOCallback.java index 26bfbe0..b33512d 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/SimpleWaitIOCallback.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/SimpleWaitIOCallback.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal.impl; +package org.apache.activemq.core.journal.impl; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQExceptionType; -import org.apache.activemq6.journal.HornetQJournalLogger; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQExceptionType; +import org.apache.activemq.journal.HornetQJournalLogger; /** * A SimpleWaitIOCallback http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/SyncIOCompletion.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/SyncIOCompletion.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/SyncIOCompletion.java index 2c344a1..713a5fd 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/SyncIOCompletion.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/SyncIOCompletion.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal.impl; +package org.apache.activemq.core.journal.impl; -import org.apache.activemq6.core.journal.IOCompletion; +import org.apache.activemq.core.journal.IOCompletion; /** * Internal class used to manage explicit syncs on the Journal through callbacks. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/SyncSpeedTest.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/SyncSpeedTest.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/SyncSpeedTest.java index b0628f2..72059af 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/SyncSpeedTest.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/SyncSpeedTest.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal.impl; +package org.apache.activemq.core.journal.impl; import java.io.File; import java.io.IOException; @@ -22,10 +22,10 @@ import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.concurrent.Executors; -import org.apache.activemq6.core.journal.IOAsyncTask; -import org.apache.activemq6.core.journal.SequentialFile; -import org.apache.activemq6.core.journal.SequentialFileFactory; -import org.apache.activemq6.journal.HornetQJournalLogger; +import org.apache.activemq.core.journal.IOAsyncTask; +import org.apache.activemq.core.journal.SequentialFile; +import org.apache.activemq.core.journal.SequentialFileFactory; +import org.apache.activemq.journal.HornetQJournalLogger; /** * A SyncSpeedTest http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/TimedBuffer.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/TimedBuffer.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/TimedBuffer.java index 1e9b3d6..2370518 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/TimedBuffer.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/TimedBuffer.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal.impl; +package org.apache.activemq.core.journal.impl; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -21,13 +21,13 @@ import java.util.TimerTask; import java.util.concurrent.Semaphore; import java.util.concurrent.atomic.AtomicLong; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.HornetQBuffers; -import org.apache.activemq6.api.core.HornetQInterruptedException; -import org.apache.activemq6.core.journal.EncodingSupport; -import org.apache.activemq6.core.journal.IOAsyncTask; -import org.apache.activemq6.core.journal.impl.dataformat.ByteArrayEncoding; -import org.apache.activemq6.journal.HornetQJournalLogger; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.HornetQBuffers; +import org.apache.activemq.api.core.HornetQInterruptedException; +import org.apache.activemq.core.journal.EncodingSupport; +import org.apache.activemq.core.journal.IOAsyncTask; +import org.apache.activemq.core.journal.impl.dataformat.ByteArrayEncoding; +import org.apache.activemq.journal.HornetQJournalLogger; /** * A TimedBuffer http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/TimedBufferObserver.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/TimedBufferObserver.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/TimedBufferObserver.java index 6560ac7..cc1a5b6 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/TimedBufferObserver.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/TimedBufferObserver.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal.impl; +package org.apache.activemq.core.journal.impl; import java.nio.ByteBuffer; import java.util.List; -import org.apache.activemq6.core.journal.IOAsyncTask; +import org.apache.activemq.core.journal.IOAsyncTask; /** * A TimedBufferObserver http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/TransactionCallback.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/TransactionCallback.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/TransactionCallback.java index ce3c157..5e29375 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/TransactionCallback.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/TransactionCallback.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal.impl; +package org.apache.activemq.core.journal.impl; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq6.core.journal.IOAsyncTask; -import org.apache.activemq6.utils.ReusableLatch; +import org.apache.activemq.core.journal.IOAsyncTask; +import org.apache.activemq.utils.ReusableLatch; /** * A TransactionCallback http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/ByteArrayEncoding.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/ByteArrayEncoding.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/ByteArrayEncoding.java index acb232b..1e3a389 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/ByteArrayEncoding.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/ByteArrayEncoding.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal.impl.dataformat; +package org.apache.activemq.core.journal.impl.dataformat; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.core.journal.EncodingSupport; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.journal.EncodingSupport; /** * A ByteArrayEncoding http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalAddRecord.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalAddRecord.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalAddRecord.java index d62eca7..05cafd9 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalAddRecord.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalAddRecord.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal.impl.dataformat; +package org.apache.activemq.core.journal.impl.dataformat; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.core.journal.EncodingSupport; -import org.apache.activemq6.core.journal.impl.JournalImpl; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.journal.EncodingSupport; +import org.apache.activemq.core.journal.impl.JournalImpl; /** * A JournalAddRecord http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalAddRecordTX.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalAddRecordTX.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalAddRecordTX.java index 7c6403f..e565264 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalAddRecordTX.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalAddRecordTX.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal.impl.dataformat; +package org.apache.activemq.core.journal.impl.dataformat; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.core.journal.EncodingSupport; -import org.apache.activemq6.core.journal.impl.JournalImpl; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.journal.EncodingSupport; +import org.apache.activemq.core.journal.impl.JournalImpl; /** * A JournalAddRecordTX http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalCompleteRecordTX.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalCompleteRecordTX.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalCompleteRecordTX.java index e7ebb3b..d59c5f4 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalCompleteRecordTX.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalCompleteRecordTX.java @@ -10,18 +10,18 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal.impl.dataformat; +package org.apache.activemq.core.journal.impl.dataformat; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.core.journal.EncodingSupport; -import org.apache.activemq6.core.journal.impl.JournalImpl; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.journal.EncodingSupport; +import org.apache.activemq.core.journal.impl.JournalImpl; /** * <p> * A transaction record (Commit or Prepare), will hold the number of elements the transaction has in * the current file. * <p> - * While loading the {@link org.apache.activemq6.core.journal.impl.JournalFile}, the number of operations found is matched against this + * While loading the {@link org.apache.activemq.core.journal.impl.JournalFile}, the number of operations found is matched against this * number. If for any reason there are missing operations, the transaction will be ignored. * <p> * We can't just use a global counter as reclaiming could delete files after the transaction was http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalDeleteRecord.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalDeleteRecord.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalDeleteRecord.java index 188418e..fc8cf1a 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalDeleteRecord.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalDeleteRecord.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal.impl.dataformat; +package org.apache.activemq.core.journal.impl.dataformat; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.core.journal.impl.JournalImpl; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.journal.impl.JournalImpl; /** * A JournalDeleteRecord http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalDeleteRecordTX.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalDeleteRecordTX.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalDeleteRecordTX.java index bdbd7ef..8f62b06 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalDeleteRecordTX.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalDeleteRecordTX.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal.impl.dataformat; +package org.apache.activemq.core.journal.impl.dataformat; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.core.journal.EncodingSupport; -import org.apache.activemq6.core.journal.impl.JournalImpl; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.journal.EncodingSupport; +import org.apache.activemq.core.journal.impl.JournalImpl; /** * A JournalDeleteRecordTX http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalInternalRecord.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalInternalRecord.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalInternalRecord.java index 5b5f707..36d8027 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalInternalRecord.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalInternalRecord.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal.impl.dataformat; +package org.apache.activemq.core.journal.impl.dataformat; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.core.journal.EncodingSupport; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.journal.EncodingSupport; /** * A InternalEncoder http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalRollbackRecordTX.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalRollbackRecordTX.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalRollbackRecordTX.java index 5f07256..d8ba571 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalRollbackRecordTX.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/dataformat/JournalRollbackRecordTX.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal.impl.dataformat; +package org.apache.activemq.core.journal.impl.dataformat; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.core.journal.impl.JournalImpl; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.journal.impl.JournalImpl; /** * A JournalRollbackRecordTX http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/journal/HornetQJournalBundle.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/journal/HornetQJournalBundle.java b/activemq-journal/src/main/java/org/apache/activemq/journal/HornetQJournalBundle.java index 6601263..dfbcee6 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/journal/HornetQJournalBundle.java +++ b/activemq-journal/src/main/java/org/apache/activemq/journal/HornetQJournalBundle.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.journal; +package org.apache.activemq.journal; -import org.apache.activemq6.api.core.HornetQIOErrorException; +import org.apache.activemq.api.core.HornetQIOErrorException; import org.jboss.logging.annotations.Message; import org.jboss.logging.annotations.MessageBundle; import org.jboss.logging.Messages; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/journal/HornetQJournalLogger.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/journal/HornetQJournalLogger.java b/activemq-journal/src/main/java/org/apache/activemq/journal/HornetQJournalLogger.java index db7a9f3..1f6cf60 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/journal/HornetQJournalLogger.java +++ b/activemq-journal/src/main/java/org/apache/activemq/journal/HornetQJournalLogger.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.journal; +package org.apache.activemq.journal; -import org.apache.activemq6.core.journal.impl.JournalFile; +import org.apache.activemq.core.journal.impl.JournalFile; import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; import org.jboss.logging.annotations.Cause; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/test/java/org/apache/activemq/tests/asyncio/LibaioDependencyCheckTest.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/test/java/org/apache/activemq/tests/asyncio/LibaioDependencyCheckTest.java b/activemq-journal/src/test/java/org/apache/activemq/tests/asyncio/LibaioDependencyCheckTest.java index 742635a..b834db3 100644 --- a/activemq-journal/src/test/java/org/apache/activemq/tests/asyncio/LibaioDependencyCheckTest.java +++ b/activemq-journal/src/test/java/org/apache/activemq/tests/asyncio/LibaioDependencyCheckTest.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.tests.asyncio; +package org.apache.activemq.tests.asyncio; import org.junit.Test; import org.junit.Assert; -import org.apache.activemq6.core.asyncio.impl.AsynchronousFileImpl; +import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl; /** * A LibaioDependencyCheckTest http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-native/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-native/pom.xml b/activemq-native/pom.xml index 1e9c268..b5a55e3 100644 --- a/activemq-native/pom.xml +++ b/activemq-native/pom.xml @@ -4,17 +4,17 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-pom</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-pom</artifactId> <version>6.0.0-SNAPSHOT</version> </parent> - <artifactId>activemq6-native</artifactId> + <artifactId>activemq-native</artifactId> <packaging>${native-package-type}</packaging> <dependencies> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-commons</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-commons</artifactId> <version>${project.version}</version> </dependency> </dependencies> @@ -108,7 +108,7 @@ <libraries> <library> <type>jni</type> - <narSystemPackage>org.apache.activemq6.core.libaio</narSystemPackage> + <narSystemPackage>org.apache.activemq.core.libaio</narSystemPackage> </library> </libraries> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-native/src/main/c/JNI_AsynchronousFileImpl.cpp ---------------------------------------------------------------------- diff --git a/activemq-native/src/main/c/JNI_AsynchronousFileImpl.cpp b/activemq-native/src/main/c/JNI_AsynchronousFileImpl.cpp index 1861d49..c8bc16e 100644 --- a/activemq-native/src/main/c/JNI_AsynchronousFileImpl.cpp +++ b/activemq-native/src/main/c/JNI_AsynchronousFileImpl.cpp @@ -94,14 +94,14 @@ JNIEXPORT jobject JNICALL Java_org.apache.activemq6_core_libaio_Native_init std::string fileName = convertJavaString(env, jstrFileName); controller = new AIOController(fileName, (int) maxIO); - controller->done = env->GetMethodID(controllerClazz,"callbackDone","(Lorg.apache.activemq6/core/asyncio/AIOCallback;JLjava/nio/ByteBuffer;)V"); + controller->done = env->GetMethodID(controllerClazz,"callbackDone","(Lorg.apache.activemq/core/asyncio/AIOCallback;JLjava/nio/ByteBuffer;)V"); if (!controller->done) { throwException (env, -1, "can't get callbackDone method"); return 0; } - controller->error = env->GetMethodID(controllerClazz, "callbackError", "(Lorg.apache.activemq6/core/asyncio/AIOCallback;JLjava/nio/ByteBuffer;ILjava/lang/String;)V"); + controller->error = env->GetMethodID(controllerClazz, "callbackError", "(Lorg.apache.activemq/core/asyncio/AIOCallback;JLjava/nio/ByteBuffer;ILjava/lang/String;)V"); if (!controller->done) { throwException (env, -1, "can't get callbackError method"); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-native/src/main/c/JavaUtilities.cpp ---------------------------------------------------------------------- diff --git a/activemq-native/src/main/c/JavaUtilities.cpp b/activemq-native/src/main/c/JavaUtilities.cpp index 138abb6..700bad2 100644 --- a/activemq-native/src/main/c/JavaUtilities.cpp +++ b/activemq-native/src/main/c/JavaUtilities.cpp @@ -26,7 +26,7 @@ void throwRuntimeException(JNIEnv * env, const char * message) void throwException(JNIEnv * env, const int code, const char * message) { - jclass exceptionClass = env->FindClass("org.apache.activemq6/api/core/HornetQException"); + jclass exceptionClass = env->FindClass("org.apache.activemq/api/core/HornetQException"); if (exceptionClass==NULL) { std::cerr << "Couldn't throw exception message:= " << message << "\n"; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-native/src/main/c/Version.h ---------------------------------------------------------------------- diff --git a/activemq-native/src/main/c/Version.h b/activemq-native/src/main/c/Version.h index 0cf3c3a..1d8c6eb 100644 --- a/activemq-native/src/main/c/Version.h +++ b/activemq-native/src/main/c/Version.h @@ -1,7 +1,7 @@ #ifndef _VERSION_NATIVE_AIO -// This definition needs to match org.apache.activemq6.core.asyncio.impl.AsynchronousFileImpl.EXPECTED_NATIVE_VERSION +// This definition needs to match org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl.EXPECTED_NATIVE_VERSION // Or else the native module won't be loaded because of version mismatches #define _VERSION_NATIVE_AIO 52 #endif http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-native/src/main/java/org/apache/activemq/core/libaio/Native.java ---------------------------------------------------------------------- diff --git a/activemq-native/src/main/java/org/apache/activemq/core/libaio/Native.java b/activemq-native/src/main/java/org/apache/activemq/core/libaio/Native.java index c7705d9..726339b 100644 --- a/activemq-native/src/main/java/org/apache/activemq/core/libaio/Native.java +++ b/activemq-native/src/main/java/org/apache/activemq/core/libaio/Native.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.libaio; +package org.apache.activemq.core.libaio; import java.nio.ByteBuffer; -import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQException; /** * @author Clebert Suconic @@ -53,7 +53,7 @@ public class Native public static native void writeInternal(ByteBuffer handle, long positionToWrite, long size, ByteBuffer bytes) throws HornetQException; /** - *This is using org.apache.activemq6.core.asyncio.AIOCallback + *This is using org.apache.activemq.core.asyncio.AIOCallback */ public static native void read(Object thisObject, ByteBuffer handle, long position, long size, ByteBuffer buffer, Object aioPackageCallback) throws HornetQException; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-amqp-protocol/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-amqp-protocol/pom.xml b/activemq-protocols/activemq-amqp-protocol/pom.xml index b066415..5090820 100644 --- a/activemq-protocols/activemq-amqp-protocol/pom.xml +++ b/activemq-protocols/activemq-amqp-protocol/pom.xml @@ -1,13 +1,13 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> - <artifactId>activemq6-protocols</artifactId> - <groupId>org.apache.activemq6</groupId> + <artifactId>activemq-protocols</artifactId> + <groupId>org.apache.activemq</groupId> <version>6.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>activemq6-amqp-protocol</artifactId> + <artifactId>activemq-amqp-protocol</artifactId> <properties> <hornetq.basedir>${project.basedir}/../..</hornetq.basedir> @@ -16,13 +16,13 @@ <dependencies> <!-- JMS Client because of some Convertions that are done --> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-jms-client</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jms-client</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-core-client</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-core-client</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -38,13 +38,13 @@ <artifactId>jboss-logging</artifactId> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-server</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-server</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-proton-plug</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-proton-plug</artifactId> <version>${project.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/HornetQProtonRemotingConnection.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/HornetQProtonRemotingConnection.java b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/HornetQProtonRemotingConnection.java index e526d52..f8c5f51 100644 --- a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/HornetQProtonRemotingConnection.java +++ b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/HornetQProtonRemotingConnection.java @@ -11,15 +11,15 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.proton; +package org.apache.activemq.core.protocol.proton; import java.util.concurrent.Executor; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.core.client.HornetQClientLogger; -import org.apache.activemq6.spi.core.protocol.AbstractRemotingConnection; -import org.apache.activemq6.spi.core.remoting.Connection; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.core.client.HornetQClientLogger; +import org.apache.activemq.spi.core.protocol.AbstractRemotingConnection; +import org.apache.activemq.spi.core.remoting.Connection; import org.proton.plug.AMQPConnectionContext; /** http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/ProtonProtocolManager.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/ProtonProtocolManager.java b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/ProtonProtocolManager.java index 8398866..8fa332c 100644 --- a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/ProtonProtocolManager.java +++ b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/ProtonProtocolManager.java @@ -11,25 +11,25 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.proton; +package org.apache.activemq.core.protocol.proton; import java.util.concurrent.Executor; import io.netty.channel.ChannelPipeline; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.core.protocol.proton.converter.ProtonMessageConverter; -import org.apache.activemq6.core.protocol.proton.plug.HornetQProtonConnectionCallback; -import org.apache.activemq6.core.remoting.impl.netty.NettyServerConnection; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.management.Notification; -import org.apache.activemq6.core.server.management.NotificationListener; -import org.apache.activemq6.spi.core.protocol.ConnectionEntry; -import org.apache.activemq6.spi.core.protocol.MessageConverter; -import org.apache.activemq6.spi.core.protocol.ProtocolManager; -import org.apache.activemq6.spi.core.protocol.RemotingConnection; -import org.apache.activemq6.spi.core.remoting.Acceptor; -import org.apache.activemq6.spi.core.remoting.Connection; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.core.protocol.proton.converter.ProtonMessageConverter; +import org.apache.activemq.core.protocol.proton.plug.HornetQProtonConnectionCallback; +import org.apache.activemq.core.remoting.impl.netty.NettyServerConnection; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.management.Notification; +import org.apache.activemq.core.server.management.NotificationListener; +import org.apache.activemq.spi.core.protocol.ConnectionEntry; +import org.apache.activemq.spi.core.protocol.MessageConverter; +import org.apache.activemq.spi.core.protocol.ProtocolManager; +import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.spi.core.remoting.Acceptor; +import org.apache.activemq.spi.core.remoting.Connection; import org.proton.plug.AMQPServerConnectionContext; import org.proton.plug.context.server.ProtonServerConnectionContextFactory; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/ProtonProtocolManagerFactory.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/ProtonProtocolManagerFactory.java b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/ProtonProtocolManagerFactory.java index 68cc9a5..e82202c 100644 --- a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/ProtonProtocolManagerFactory.java +++ b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/ProtonProtocolManagerFactory.java @@ -11,12 +11,12 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.proton; +package org.apache.activemq.core.protocol.proton; -import org.apache.activemq6.api.core.Interceptor; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.spi.core.protocol.ProtocolManager; -import org.apache.activemq6.spi.core.protocol.ProtocolManagerFactory; +import org.apache.activemq.api.core.Interceptor; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.spi.core.protocol.ProtocolManager; +import org.apache.activemq.spi.core.protocol.ProtocolManagerFactory; import java.util.List; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/HornetQJMSVendor.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/HornetQJMSVendor.java b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/HornetQJMSVendor.java index 725ecfc..4c09836 100644 --- a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/HornetQJMSVendor.java +++ b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/HornetQJMSVendor.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.proton.converter; +package org.apache.activemq.core.protocol.proton.converter; import javax.jms.BytesMessage; import javax.jms.Destination; @@ -22,15 +22,15 @@ import javax.jms.StreamMessage; import javax.jms.TextMessage; import org.apache.qpid.proton.jms.JMSVendor; -import org.apache.activemq6.core.buffers.impl.ResetLimitWrappedHornetQBuffer; -import org.apache.activemq6.core.protocol.proton.converter.jms.ServerJMSBytesMessage; -import org.apache.activemq6.core.protocol.proton.converter.jms.ServerJMSMapMessage; -import org.apache.activemq6.core.protocol.proton.converter.jms.ServerJMSMessage; -import org.apache.activemq6.core.protocol.proton.converter.jms.ServerJMSStreamMessage; -import org.apache.activemq6.core.protocol.proton.converter.jms.ServerJMSTextMessage; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.core.server.impl.ServerMessageImpl; -import org.apache.activemq6.utils.IDGenerator; +import org.apache.activemq.core.buffers.impl.ResetLimitWrappedHornetQBuffer; +import org.apache.activemq.core.protocol.proton.converter.jms.ServerJMSBytesMessage; +import org.apache.activemq.core.protocol.proton.converter.jms.ServerJMSMapMessage; +import org.apache.activemq.core.protocol.proton.converter.jms.ServerJMSMessage; +import org.apache.activemq.core.protocol.proton.converter.jms.ServerJMSStreamMessage; +import org.apache.activemq.core.protocol.proton.converter.jms.ServerJMSTextMessage; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.core.server.impl.ServerMessageImpl; +import org.apache.activemq.utils.IDGenerator; /** * @author Clebert Suconic @@ -49,25 +49,25 @@ public class HornetQJMSVendor extends JMSVendor @Override public BytesMessage createBytesMessage() { - return new ServerJMSBytesMessage(newMessage(org.apache.activemq6.api.core.Message.BYTES_TYPE), 0); + return new ServerJMSBytesMessage(newMessage(org.apache.activemq.api.core.Message.BYTES_TYPE), 0); } @Override public StreamMessage createStreamMessage() { - return new ServerJMSStreamMessage(newMessage(org.apache.activemq6.api.core.Message.STREAM_TYPE), 0); + return new ServerJMSStreamMessage(newMessage(org.apache.activemq.api.core.Message.STREAM_TYPE), 0); } @Override public Message createMessage() { - return new ServerJMSMessage(newMessage(org.apache.activemq6.api.core.Message.DEFAULT_TYPE), 0 ); + return new ServerJMSMessage(newMessage(org.apache.activemq.api.core.Message.DEFAULT_TYPE), 0 ); } @Override public TextMessage createTextMessage() { - return new ServerJMSTextMessage(newMessage(org.apache.activemq6.api.core.Message.TEXT_TYPE), 0); + return new ServerJMSTextMessage(newMessage(org.apache.activemq.api.core.Message.TEXT_TYPE), 0); } @Override @@ -79,7 +79,7 @@ public class HornetQJMSVendor extends JMSVendor @Override public MapMessage createMapMessage() { - return new ServerJMSMapMessage(newMessage(org.apache.activemq6.api.core.Message.MAP_TYPE), 0); + return new ServerJMSMapMessage(newMessage(org.apache.activemq.api.core.Message.MAP_TYPE), 0); } @Override @@ -122,13 +122,13 @@ public class HornetQJMSVendor extends JMSVendor { switch (messageType) { - case org.apache.activemq6.api.core.Message.STREAM_TYPE: + case org.apache.activemq.api.core.Message.STREAM_TYPE: return new ServerJMSStreamMessage(wrapped, deliveryCount); - case org.apache.activemq6.api.core.Message.BYTES_TYPE: + case org.apache.activemq.api.core.Message.BYTES_TYPE: return new ServerJMSBytesMessage(wrapped, deliveryCount); - case org.apache.activemq6.api.core.Message.MAP_TYPE: + case org.apache.activemq.api.core.Message.MAP_TYPE: return new ServerJMSMapMessage(wrapped, deliveryCount); - case org.apache.activemq6.api.core.Message.TEXT_TYPE: + case org.apache.activemq.api.core.Message.TEXT_TYPE: return new ServerJMSTextMessage(wrapped, deliveryCount); default: return new ServerJMSMessage(wrapped, deliveryCount); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/ProtonMessageConverter.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/ProtonMessageConverter.java b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/ProtonMessageConverter.java index 8081f6c..faf45f4 100644 --- a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/ProtonMessageConverter.java +++ b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/ProtonMessageConverter.java @@ -11,16 +11,16 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.proton.converter; +package org.apache.activemq.core.protocol.proton.converter; import org.apache.qpid.proton.jms.EncodedMessage; import org.apache.qpid.proton.jms.InboundTransformer; import org.apache.qpid.proton.jms.JMSMappingInboundTransformer; import org.apache.qpid.proton.jms.JMSMappingOutboundTransformer; -import org.apache.activemq6.core.protocol.proton.converter.jms.ServerJMSMessage; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.spi.core.protocol.MessageConverter; -import org.apache.activemq6.utils.IDGenerator; +import org.apache.activemq.core.protocol.proton.converter.jms.ServerJMSMessage; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.spi.core.protocol.MessageConverter; +import org.apache.activemq.utils.IDGenerator; /** * @author Clebert Suconic http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSBytesMessage.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSBytesMessage.java b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSBytesMessage.java index 532f721..29f9e69 100644 --- a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSBytesMessage.java +++ b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSBytesMessage.java @@ -11,38 +11,38 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.proton.converter.jms; +package org.apache.activemq.core.protocol.proton.converter.jms; import javax.jms.BytesMessage; import javax.jms.JMSException; -import org.apache.activemq6.core.message.impl.MessageImpl; -import org.apache.activemq6.core.message.impl.MessageInternal; - -import static org.apache.activemq6.reader.BytesMessageUtil.bytesMessageReset; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesReadBoolean; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesReadByte; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesReadBytes; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesReadChar; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesReadDouble; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesReadFloat; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesReadInt; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesReadLong; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesReadShort; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesReadUTF; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesReadUnsignedByte; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesReadUnsignedShort; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesWriteBoolean; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesWriteByte; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesWriteBytes; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesWriteChar; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesWriteDouble; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesWriteFloat; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesWriteInt; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesWriteLong; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesWriteObject; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesWriteShort; -import static org.apache.activemq6.reader.BytesMessageUtil.bytesWriteUTF; +import org.apache.activemq.core.message.impl.MessageImpl; +import org.apache.activemq.core.message.impl.MessageInternal; + +import static org.apache.activemq.reader.BytesMessageUtil.bytesMessageReset; +import static org.apache.activemq.reader.BytesMessageUtil.bytesReadBoolean; +import static org.apache.activemq.reader.BytesMessageUtil.bytesReadByte; +import static org.apache.activemq.reader.BytesMessageUtil.bytesReadBytes; +import static org.apache.activemq.reader.BytesMessageUtil.bytesReadChar; +import static org.apache.activemq.reader.BytesMessageUtil.bytesReadDouble; +import static org.apache.activemq.reader.BytesMessageUtil.bytesReadFloat; +import static org.apache.activemq.reader.BytesMessageUtil.bytesReadInt; +import static org.apache.activemq.reader.BytesMessageUtil.bytesReadLong; +import static org.apache.activemq.reader.BytesMessageUtil.bytesReadShort; +import static org.apache.activemq.reader.BytesMessageUtil.bytesReadUTF; +import static org.apache.activemq.reader.BytesMessageUtil.bytesReadUnsignedByte; +import static org.apache.activemq.reader.BytesMessageUtil.bytesReadUnsignedShort; +import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteBoolean; +import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteByte; +import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteBytes; +import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteChar; +import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteDouble; +import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteFloat; +import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteInt; +import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteLong; +import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteObject; +import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteShort; +import static org.apache.activemq.reader.BytesMessageUtil.bytesWriteUTF; /** http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSMapMessage.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSMapMessage.java b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSMapMessage.java index ad80904..a757ca8 100644 --- a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSMapMessage.java +++ b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSMapMessage.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.proton.converter.jms; +package org.apache.activemq.core.protocol.proton.converter.jms; import javax.jms.JMSException; import javax.jms.MapMessage; @@ -20,14 +20,14 @@ import java.util.Enumeration; import java.util.HashSet; import java.util.Set; -import org.apache.activemq6.api.core.HornetQPropertyConversionException; -import org.apache.activemq6.api.core.Message; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.message.impl.MessageInternal; -import org.apache.activemq6.utils.TypedProperties; +import org.apache.activemq.api.core.HornetQPropertyConversionException; +import org.apache.activemq.api.core.Message; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.message.impl.MessageInternal; +import org.apache.activemq.utils.TypedProperties; -import static org.apache.activemq6.reader.MapMessageUtil.readBodyMap; -import static org.apache.activemq6.reader.MapMessageUtil.writeBodyMap; +import static org.apache.activemq.reader.MapMessageUtil.readBodyMap; +import static org.apache.activemq.reader.MapMessageUtil.writeBodyMap; /** * HornetQ implementation of a JMS MapMessage. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSMessage.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSMessage.java b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSMessage.java index e6f0d8f..c90120f 100644 --- a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSMessage.java +++ b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSMessage.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.proton.converter.jms; +package org.apache.activemq.core.protocol.proton.converter.jms; import javax.jms.DeliveryMode; import javax.jms.Destination; @@ -20,12 +20,12 @@ import javax.jms.Message; import java.util.Collections; import java.util.Enumeration; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.message.impl.MessageInternal; -import org.apache.activemq6.jms.client.HornetQDestination; -import org.apache.activemq6.jms.client.HornetQQueue; -import org.apache.activemq6.reader.MessageUtil; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.message.impl.MessageInternal; +import org.apache.activemq.jms.client.HornetQDestination; +import org.apache.activemq.jms.client.HornetQQueue; +import org.apache.activemq.reader.MessageUtil; /** * @author Clebert Suconic http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSStreamMessage.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSStreamMessage.java b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSStreamMessage.java index d190d45..fcd3deb 100644 --- a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSStreamMessage.java +++ b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSStreamMessage.java @@ -10,31 +10,31 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.proton.converter.jms; +package org.apache.activemq.core.protocol.proton.converter.jms; import javax.jms.JMSException; import javax.jms.MessageEOFException; import javax.jms.MessageFormatException; import javax.jms.StreamMessage; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.Message; -import org.apache.activemq6.api.core.Pair; -import org.apache.activemq6.core.message.impl.MessageInternal; -import org.apache.activemq6.utils.DataConstants; - -import static org.apache.activemq6.reader.MessageUtil.getBodyBuffer; -import static org.apache.activemq6.reader.StreamMessageUtil.streamReadBoolean; -import static org.apache.activemq6.reader.StreamMessageUtil.streamReadByte; -import static org.apache.activemq6.reader.StreamMessageUtil.streamReadBytes; -import static org.apache.activemq6.reader.StreamMessageUtil.streamReadChar; -import static org.apache.activemq6.reader.StreamMessageUtil.streamReadDouble; -import static org.apache.activemq6.reader.StreamMessageUtil.streamReadFloat; -import static org.apache.activemq6.reader.StreamMessageUtil.streamReadInteger; -import static org.apache.activemq6.reader.StreamMessageUtil.streamReadLong; -import static org.apache.activemq6.reader.StreamMessageUtil.streamReadObject; -import static org.apache.activemq6.reader.StreamMessageUtil.streamReadShort; -import static org.apache.activemq6.reader.StreamMessageUtil.streamReadString; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.Message; +import org.apache.activemq.api.core.Pair; +import org.apache.activemq.core.message.impl.MessageInternal; +import org.apache.activemq.utils.DataConstants; + +import static org.apache.activemq.reader.MessageUtil.getBodyBuffer; +import static org.apache.activemq.reader.StreamMessageUtil.streamReadBoolean; +import static org.apache.activemq.reader.StreamMessageUtil.streamReadByte; +import static org.apache.activemq.reader.StreamMessageUtil.streamReadBytes; +import static org.apache.activemq.reader.StreamMessageUtil.streamReadChar; +import static org.apache.activemq.reader.StreamMessageUtil.streamReadDouble; +import static org.apache.activemq.reader.StreamMessageUtil.streamReadFloat; +import static org.apache.activemq.reader.StreamMessageUtil.streamReadInteger; +import static org.apache.activemq.reader.StreamMessageUtil.streamReadLong; +import static org.apache.activemq.reader.StreamMessageUtil.streamReadObject; +import static org.apache.activemq.reader.StreamMessageUtil.streamReadShort; +import static org.apache.activemq.reader.StreamMessageUtil.streamReadString; public final class ServerJMSStreamMessage extends ServerJMSMessage implements StreamMessage { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSTextMessage.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSTextMessage.java b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSTextMessage.java index 6d48427..8db24a2 100644 --- a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSTextMessage.java +++ b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/ServerJMSTextMessage.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.proton.converter.jms; +package org.apache.activemq.core.protocol.proton.converter.jms; import javax.jms.JMSException; import javax.jms.TextMessage; -import org.apache.activemq6.api.core.Message; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.message.impl.MessageInternal; +import org.apache.activemq.api.core.Message; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.message.impl.MessageInternal; -import static org.apache.activemq6.reader.TextMessageUtil.readBodyText; -import static org.apache.activemq6.reader.TextMessageUtil.writeBodyText; +import static org.apache.activemq.reader.TextMessageUtil.readBodyText; +import static org.apache.activemq.reader.TextMessageUtil.writeBodyText; /** http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/package-info.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/package-info.java b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/package-info.java index d3ea9b2..e45c8d7 100644 --- a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/package-info.java +++ b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/converter/jms/package-info.java @@ -18,4 +18,4 @@ * @author Clebert Suconic */ -package org.apache.activemq6.core.protocol.proton.converter.jms; \ No newline at end of file +package org.apache.activemq.core.protocol.proton.converter.jms; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/plug/HornetQProtonConnectionCallback.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/plug/HornetQProtonConnectionCallback.java b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/plug/HornetQProtonConnectionCallback.java index 55fb67e..185220f 100644 --- a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/plug/HornetQProtonConnectionCallback.java +++ b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/plug/HornetQProtonConnectionCallback.java @@ -11,19 +11,19 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.proton.plug; +package org.apache.activemq.core.protocol.proton.plug; import java.util.concurrent.TimeUnit; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelFutureListener; -import org.apache.activemq6.core.buffers.impl.ChannelBufferWrapper; -import org.apache.activemq6.core.protocol.proton.HornetQProtonRemotingConnection; -import org.apache.activemq6.core.protocol.proton.ProtonProtocolManager; -import org.apache.activemq6.core.protocol.proton.sasl.HornetQPlainSASL; -import org.apache.activemq6.spi.core.remoting.Connection; -import org.apache.activemq6.utils.ReusableLatch; +import org.apache.activemq.core.buffers.impl.ChannelBufferWrapper; +import org.apache.activemq.core.protocol.proton.HornetQProtonRemotingConnection; +import org.apache.activemq.core.protocol.proton.ProtonProtocolManager; +import org.apache.activemq.core.protocol.proton.sasl.HornetQPlainSASL; +import org.apache.activemq.spi.core.remoting.Connection; +import org.apache.activemq.utils.ReusableLatch; import org.proton.plug.AMQPConnectionCallback; import org.proton.plug.AMQPConnectionContext; import org.proton.plug.AMQPSessionCallback; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/plug/ProtonSessionIntegrationCallback.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/plug/ProtonSessionIntegrationCallback.java b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/plug/ProtonSessionIntegrationCallback.java index 85e3670..38c105f 100644 --- a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/plug/ProtonSessionIntegrationCallback.java +++ b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/plug/ProtonSessionIntegrationCallback.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.proton.plug; +package org.apache.activemq.core.protocol.proton.plug; import io.netty.buffer.ByteBuf; @@ -23,20 +23,20 @@ import org.apache.qpid.proton.engine.Link; import org.apache.qpid.proton.engine.Receiver; import org.apache.qpid.proton.jms.EncodedMessage; import org.apache.qpid.proton.message.ProtonJMessage; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.core.journal.IOAsyncTask; -import org.apache.activemq6.core.protocol.proton.ProtonProtocolManager; -import org.apache.activemq6.core.server.QueueQueryResult; -import org.apache.activemq6.core.server.ServerConsumer; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.core.server.ServerSession; -import org.apache.activemq6.spi.core.protocol.SessionCallback; -import org.apache.activemq6.spi.core.remoting.ReadyListener; -import org.apache.activemq6.utils.ByteUtil; -import org.apache.activemq6.utils.IDGenerator; -import org.apache.activemq6.utils.SimpleIDGenerator; -import org.apache.activemq6.utils.UUIDGenerator; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.core.journal.IOAsyncTask; +import org.apache.activemq.core.protocol.proton.ProtonProtocolManager; +import org.apache.activemq.core.server.QueueQueryResult; +import org.apache.activemq.core.server.ServerConsumer; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.core.server.ServerSession; +import org.apache.activemq.spi.core.protocol.SessionCallback; +import org.apache.activemq.spi.core.remoting.ReadyListener; +import org.apache.activemq.utils.ByteUtil; +import org.apache.activemq.utils.IDGenerator; +import org.apache.activemq.utils.SimpleIDGenerator; +import org.apache.activemq.utils.UUIDGenerator; import org.proton.plug.AMQPConnectionContext; import org.proton.plug.AMQPSessionCallback; import org.proton.plug.AMQPSessionContext; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/plug/package-info.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/plug/package-info.java b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/plug/package-info.java index 9bdf305..2fd6c4d 100644 --- a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/plug/package-info.java +++ b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/plug/package-info.java @@ -15,4 +15,4 @@ * This package contains classes for integration with the ProtonPlug * @author Clebert Suconic */ -package org.apache.activemq6.core.protocol.proton.plug; \ No newline at end of file +package org.apache.activemq.core.protocol.proton.plug; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/sasl/HornetQPlainSASL.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/sasl/HornetQPlainSASL.java b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/sasl/HornetQPlainSASL.java index b92b7ee..389a474 100644 --- a/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/sasl/HornetQPlainSASL.java +++ b/activemq-protocols/activemq-amqp-protocol/src/main/java/org/apache/activemq/core/protocol/proton/sasl/HornetQPlainSASL.java @@ -11,10 +11,10 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.proton.sasl; +package org.apache.activemq.core.protocol.proton.sasl; -import org.apache.activemq6.core.security.SecurityStore; -import org.apache.activemq6.spi.core.security.HornetQSecurityManager; +import org.apache.activemq.core.security.SecurityStore; +import org.apache.activemq.spi.core.security.HornetQSecurityManager; import org.proton.plug.sasl.ServerSASLPlain; /** http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-amqp-protocol/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-amqp-protocol/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory b/activemq-protocols/activemq-amqp-protocol/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory index e1c85c9..8f035c7 100644 --- a/activemq-protocols/activemq-amqp-protocol/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory +++ b/activemq-protocols/activemq-amqp-protocol/src/main/resources/META-INF/services/org.hornetq.spi.core.protocol.ProtocolManagerFactory @@ -1 +1 @@ -org.apache.activemq6.core.protocol.proton.ProtonProtocolManagerFactory \ No newline at end of file +org.apache.activemq.core.protocol.proton.ProtonProtocolManagerFactory \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-amqp-protocol/src/test/java/org/apache/activemq/core/protocol/proton/TestConversions.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-amqp-protocol/src/test/java/org/apache/activemq/core/protocol/proton/TestConversions.java b/activemq-protocols/activemq-amqp-protocol/src/test/java/org/apache/activemq/core/protocol/proton/TestConversions.java index c884809..b46a44d 100644 --- a/activemq-protocols/activemq-amqp-protocol/src/test/java/org/apache/activemq/core/protocol/proton/TestConversions.java +++ b/activemq-protocols/activemq-amqp-protocol/src/test/java/org/apache/activemq/core/protocol/proton/TestConversions.java @@ -11,7 +11,7 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.proton; +package org.apache.activemq.core.protocol.proton; import java.nio.ByteBuffer; import java.util.HashMap; @@ -30,17 +30,17 @@ import org.apache.qpid.proton.jms.EncodedMessage; import org.apache.qpid.proton.message.Message; import org.apache.qpid.proton.message.ProtonJMessage; import org.apache.qpid.proton.message.impl.MessageImpl; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.journal.EncodingSupport; -import org.apache.activemq6.core.protocol.proton.converter.ProtonMessageConverter; -import org.apache.activemq6.core.protocol.proton.converter.jms.ServerJMSBytesMessage; -import org.apache.activemq6.core.protocol.proton.converter.jms.ServerJMSMapMessage; -import org.apache.activemq6.core.protocol.proton.converter.jms.ServerJMSMessage; -import org.apache.activemq6.core.protocol.proton.converter.jms.ServerJMSStreamMessage; -import org.apache.activemq6.core.protocol.proton.converter.jms.ServerJMSTextMessage; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.utils.SimpleIDGenerator; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.journal.EncodingSupport; +import org.apache.activemq.core.protocol.proton.converter.ProtonMessageConverter; +import org.apache.activemq.core.protocol.proton.converter.jms.ServerJMSBytesMessage; +import org.apache.activemq.core.protocol.proton.converter.jms.ServerJMSMapMessage; +import org.apache.activemq.core.protocol.proton.converter.jms.ServerJMSMessage; +import org.apache.activemq.core.protocol.proton.converter.jms.ServerJMSStreamMessage; +import org.apache.activemq.core.protocol.proton.converter.jms.ServerJMSTextMessage; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.utils.SimpleIDGenerator; import org.junit.Assert; import org.junit.Test; import org.proton.plug.util.NettyWritable; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/pom.xml b/activemq-protocols/activemq-openwire-protocol/pom.xml index e3d858b..2e5fa30 100644 --- a/activemq-protocols/activemq-openwire-protocol/pom.xml +++ b/activemq-protocols/activemq-openwire-protocol/pom.xml @@ -1,13 +1,13 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> - <artifactId>activemq6-protocols</artifactId> - <groupId>org.apache.activemq6</groupId> + <artifactId>activemq-protocols</artifactId> + <groupId>org.apache.activemq</groupId> <version>6.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>activemq6-openwire-protocol</artifactId> + <artifactId>activemq-openwire-protocol</artifactId> <properties> <hornetq.basedir>${project.parent.parent.basedir}</hornetq.basedir> @@ -35,13 +35,13 @@ <artifactId>slf4j-api</artifactId> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-server</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-server</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-jms-client</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-jms-client</artifactId> <version>${project.version}</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/AMQConnectorImpl.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/AMQConnectorImpl.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/AMQConnectorImpl.java index 792aa0d..c3523af 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/AMQConnectorImpl.java +++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/AMQConnectorImpl.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.openwire; +package org.apache.activemq.core.protocol.openwire; import org.apache.activemq.command.BrokerInfo; import org.apache.activemq.command.ConnectionControl; -import org.apache.activemq6.core.protocol.openwire.amq.AMQConnector; -import org.apache.activemq6.core.protocol.openwire.amq.AMQConnectorStatistics; -import org.apache.activemq6.spi.core.remoting.Acceptor; +import org.apache.activemq.core.protocol.openwire.amq.AMQConnector; +import org.apache.activemq.core.protocol.openwire.amq.AMQConnectorStatistics; +import org.apache.activemq.spi.core.remoting.Acceptor; public class AMQConnectorImpl implements AMQConnector { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/AMQTransactionImpl.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/AMQTransactionImpl.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/AMQTransactionImpl.java index 6b796d1..70b03a7 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/AMQTransactionImpl.java +++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/AMQTransactionImpl.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.openwire; +package org.apache.activemq.core.protocol.openwire; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.core.server.impl.RefsOperation; -import org.apache.activemq6.core.transaction.Transaction; -import org.apache.activemq6.core.transaction.impl.TransactionImpl; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.core.server.impl.RefsOperation; +import org.apache.activemq.core.transaction.Transaction; +import org.apache.activemq.core.transaction.impl.TransactionImpl; import javax.transaction.xa.Xid; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/BrokerState.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/BrokerState.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/BrokerState.java index 4c2149a..0cb45b2 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/BrokerState.java +++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/BrokerState.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.openwire; +package org.apache.activemq.core.protocol.openwire; /** * The class holds related states of an activemq broker. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/DataInputWrapper.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/DataInputWrapper.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/DataInputWrapper.java index 10e077d..6c260e9 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/DataInputWrapper.java +++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/DataInputWrapper.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.openwire; +package org.apache.activemq.core.protocol.openwire; import java.io.DataInput; import java.io.IOException; import java.nio.ByteBuffer; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.utils.UTF8Util; -import org.apache.activemq6.utils.UTF8Util.StringUtilBuffer; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.utils.UTF8Util; +import org.apache.activemq.utils.UTF8Util.StringUtilBuffer; public class DataInputWrapper implements DataInput { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/NotEnoughBytesException.java ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/NotEnoughBytesException.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/NotEnoughBytesException.java index ce423b0..5d43930 100644 --- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/NotEnoughBytesException.java +++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/NotEnoughBytesException.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.protocol.openwire; +package org.apache.activemq.core.protocol.openwire; import java.io.IOException;
