You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/02/07 18:38:24 UTC
svn commit: r1782048 [5/12] - in /qpid: java/trunk/ java/trunk/bdbstore/
java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/
java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/
java/trunk/bdbstore/src...
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java Tue Feb 7 18:38:14 2017
@@ -45,7 +45,7 @@ import com.google.common.util.concurrent
import com.google.common.util.concurrent.SettableFuture;
import org.slf4j.Logger;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
import org.apache.qpid.server.message.EnqueueableMessage;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.plugin.MessageMetaDataType;
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJsonFileStore.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJsonFileStore.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJsonFileStore.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJsonFileStore.java Tue Feb 7 18:38:14 2017
@@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
import org.apache.qpid.server.util.BaseAction;
import org.apache.qpid.server.util.FileHelper;
-import org.apache.qpid.util.FileUtils;
+import org.apache.qpid.server.util.FileUtils;
public abstract class AbstractJsonFileStore
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/MessageHandle.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/MessageHandle.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/MessageHandle.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/MessageHandle.java Tue Feb 7 18:38:14 2017
@@ -20,7 +20,7 @@
*/
package org.apache.qpid.server.store;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
public interface MessageHandle<M extends StorableMessageMetaData>
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StorableMessageMetaData.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StorableMessageMetaData.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StorableMessageMetaData.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StorableMessageMetaData.java Tue Feb 7 18:38:14 2017
@@ -20,7 +20,7 @@
*/
package org.apache.qpid.server.store;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
import org.apache.qpid.server.plugin.MessageMetaDataType;
public interface StorableMessageMetaData
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StoredMemoryMessage.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StoredMemoryMessage.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StoredMemoryMessage.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StoredMemoryMessage.java Tue Feb 7 18:38:14 2017
@@ -24,7 +24,7 @@ package org.apache.qpid.server.store;
import java.util.Collection;
import java.util.Collections;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
public class StoredMemoryMessage<T extends StorableMessageMetaData> implements StoredMessage<T>, MessageHandle<T>
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StoredMessage.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StoredMessage.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StoredMessage.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StoredMessage.java Tue Feb 7 18:38:14 2017
@@ -22,7 +22,7 @@ package org.apache.qpid.server.store;
import java.util.Collection;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
public interface StoredMessage<M extends StorableMessageMetaData>
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/serializer/v1/Deserializer.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/serializer/v1/Deserializer.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/serializer/v1/Deserializer.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/serializer/v1/Deserializer.java Tue Feb 7 18:38:14 2017
@@ -28,7 +28,7 @@ import java.security.NoSuchAlgorithmExce
import java.util.Arrays;
import java.util.UUID;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
class Deserializer
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/serializer/v1/MessageRecord.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/serializer/v1/MessageRecord.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/serializer/v1/MessageRecord.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/serializer/v1/MessageRecord.java Tue Feb 7 18:38:14 2017
@@ -22,7 +22,7 @@ package org.apache.qpid.server.store.ser
import java.io.IOException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
import org.apache.qpid.server.store.StoredMessage;
class MessageRecord implements Record
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/serializer/v1/MessageStoreSerializer_v1.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/serializer/v1/MessageStoreSerializer_v1.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/serializer/v1/MessageStoreSerializer_v1.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/serializer/v1/MessageStoreSerializer_v1.java Tue Feb 7 18:38:14 2017
@@ -28,7 +28,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
import org.apache.qpid.server.message.EnqueueableMessage;
import org.apache.qpid.server.plugin.MessageMetaDataType;
import org.apache.qpid.server.plugin.PluggableService;
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/streams/CompositeInputStream.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/streams/CompositeInputStream.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/streams/CompositeInputStream.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/streams/CompositeInputStream.java Tue Feb 7 18:38:14 2017
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.qpid.streams;
+package org.apache.qpid.server.streams;
import java.io.IOException;
import java.io.InputStream;
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/thread/DefaultThreadFactory.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/thread/DefaultThreadFactory.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/thread/DefaultThreadFactory.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/thread/DefaultThreadFactory.java Tue Feb 7 18:38:14 2017
@@ -19,7 +19,7 @@
*
*/
-package org.apache.qpid.thread;
+package org.apache.qpid.server.thread;
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/thread/LoggingUncaughtExceptionHandler.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/thread/LoggingUncaughtExceptionHandler.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/thread/LoggingUncaughtExceptionHandler.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/thread/LoggingUncaughtExceptionHandler.java Tue Feb 7 18:38:14 2017
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.thread;
+package org.apache.qpid.server.thread;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/thread/QpidThreadExecutor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/thread/QpidThreadExecutor.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/thread/QpidThreadExecutor.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/thread/QpidThreadExecutor.java Tue Feb 7 18:38:14 2017
@@ -19,7 +19,7 @@
*
*/
-package org.apache.qpid.thread;
+package org.apache.qpid.server.thread;
import java.util.concurrent.Executor;
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/thread/RealtimeThreadFactory.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/thread/RealtimeThreadFactory.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/thread/RealtimeThreadFactory.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/thread/RealtimeThreadFactory.java Tue Feb 7 18:38:14 2017
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.thread;
+package org.apache.qpid.server.thread;
import java.lang.reflect.Constructor;
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/thread/ThreadFactory.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/thread/ThreadFactory.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/thread/ThreadFactory.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/thread/ThreadFactory.java Tue Feb 7 18:38:14 2017
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.thread;
+package org.apache.qpid.server.thread;
public interface ThreadFactory
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/thread/Threading.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/thread/Threading.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/thread/Threading.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/thread/Threading.java Tue Feb 7 18:38:14 2017
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.thread;
+package org.apache.qpid.server.thread;
public final class Threading
@@ -34,7 +34,7 @@ public final class Threading
{
Class threadFactoryClass =
Class.forName(System.getProperty("qpid.thread_factory",
- "org.apache.qpid.thread.DefaultThreadFactory"));
+ "org.apache.qpid.server.thread.DefaultThreadFactory"));
threadFactory = (ThreadFactory)threadFactoryClass.newInstance();
}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java Tue Feb 7 18:38:14 2017
@@ -71,8 +71,8 @@ import org.apache.qpid.server.stats.Stat
import org.apache.qpid.server.stats.StatisticsGatherer;
import org.apache.qpid.server.util.Action;
import org.apache.qpid.server.util.FixedKeyMapCreator;
-import org.apache.qpid.transport.network.NetworkConnection;
-import org.apache.qpid.transport.network.Ticker;
+import org.apache.qpid.server.transport.network.NetworkConnection;
+import org.apache.qpid.server.transport.network.Ticker;
public abstract class AbstractAMQPConnection<C extends AbstractAMQPConnection<C,T>, T>
extends AbstractConfiguredObject<C>
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Acquired.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/Acquired.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Acquired.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Acquired.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/Acquired.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/Acquired.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Acquired.java Tue Feb 7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,8 +24,8 @@ package org.apache.qpid.transport;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/AggregateTicker.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/AggregateTicker.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/AggregateTicker.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/AggregateTicker.java Tue Feb 7 18:38:14 2017
@@ -22,7 +22,7 @@ package org.apache.qpid.server.transport
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.qpid.transport.network.Ticker;
+import org.apache.qpid.server.transport.network.Ticker;
public class AggregateTicker implements Ticker, SchedulingDelayNotificationListener
{
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Binary.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/Binary.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Binary.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Binary.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/Binary.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/Binary.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Binary.java Tue Feb 7 18:38:14 2017
@@ -18,9 +18,9 @@
* under the License.
*
*/
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
-import static org.apache.qpid.transport.util.Functions.str;
+import static org.apache.qpid.server.transport.util.Functions.str;
import java.nio.ByteBuffer;
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ByteBufferReceiver.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ByteBufferReceiver.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ByteBufferReceiver.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ByteBufferReceiver.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ByteBufferReceiver.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ByteBufferReceiver.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ByteBufferReceiver.java Tue Feb 7 18:38:14 2017
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
import java.nio.ByteBuffer;
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ByteBufferSender.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ByteBufferSender.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ByteBufferSender.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ByteBufferSender.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ByteBufferSender.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ByteBufferSender.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ByteBufferSender.java Tue Feb 7 18:38:14 2017
@@ -18,9 +18,9 @@
* under the License.
*
*/
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
public interface ByteBufferSender
{
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ClientDelegate.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ClientDelegate.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ClientDelegate.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ClientDelegate.java Tue Feb 7 18:38:14 2017
@@ -18,10 +18,10 @@
* under the License.
*
*/
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
-import static org.apache.qpid.transport.Connection.State.OPEN;
-import static org.apache.qpid.transport.Connection.State.RESUMING;
+import static org.apache.qpid.server.transport.Connection.State.OPEN;
+import static org.apache.qpid.server.transport.Connection.State.RESUMING;
import java.util.HashMap;
import java.util.List;
@@ -30,12 +30,12 @@ import java.util.Map;
import javax.security.sasl.SaslClient;
import javax.security.sasl.SaslException;
-import org.apache.qpid.configuration.CommonProperties;
+import org.apache.qpid.server.configuration.CommonProperties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.configuration.ClientProperties;
-import org.apache.qpid.properties.ConnectionStartProperties;
+import org.apache.qpid.server.configuration.ClientProperties;
+import org.apache.qpid.server.properties.ConnectionStartProperties;
/**
@@ -43,7 +43,7 @@ import org.apache.qpid.properties.Connec
*
*/
-public class ClientDelegate extends ConnectionDelegate
+public class ClientDelegate extends org.apache.qpid.server.transport.ConnectionDelegate
{
private static final Logger LOGGER = LoggerFactory.getLogger(ClientDelegate.class);
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Connection.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/Connection.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Connection.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Connection.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/Connection.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/Connection.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Connection.java Tue Feb 7 18:38:14 2017
@@ -18,13 +18,13 @@
* under the License.
*
*/
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
-import static org.apache.qpid.transport.Connection.State.CLOSED;
-import static org.apache.qpid.transport.Connection.State.CLOSING;
-import static org.apache.qpid.transport.Connection.State.NEW;
-import static org.apache.qpid.transport.Connection.State.OPEN;
-import static org.apache.qpid.transport.Connection.State.OPENING;
+import static org.apache.qpid.server.transport.Connection.State.CLOSED;
+import static org.apache.qpid.server.transport.Connection.State.CLOSING;
+import static org.apache.qpid.server.transport.Connection.State.NEW;
+import static org.apache.qpid.server.transport.Connection.State.OPEN;
+import static org.apache.qpid.server.transport.Connection.State.OPENING;
import java.net.SocketAddress;
import java.util.ArrayList;
@@ -43,17 +43,17 @@ import javax.security.sasl.SaslServer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.properties.ConnectionStartProperties;
-import org.apache.qpid.transport.network.Assembler;
-import org.apache.qpid.transport.network.Disassembler;
-import org.apache.qpid.transport.network.InputHandler;
-import org.apache.qpid.transport.network.NetworkConnection;
-import org.apache.qpid.transport.network.TransportActivity;
-import org.apache.qpid.transport.network.io.IoNetworkTransport;
-import org.apache.qpid.transport.network.security.SecurityLayer;
-import org.apache.qpid.transport.network.security.SecurityLayerFactory;
-import org.apache.qpid.transport.util.Waiter;
-import org.apache.qpid.util.Strings;
+import org.apache.qpid.server.properties.ConnectionStartProperties;
+import org.apache.qpid.server.transport.network.Assembler;
+import org.apache.qpid.server.transport.network.Disassembler;
+import org.apache.qpid.server.transport.network.InputHandler;
+import org.apache.qpid.server.transport.network.NetworkConnection;
+import org.apache.qpid.server.transport.network.TransportActivity;
+import org.apache.qpid.server.transport.network.io.IoNetworkTransport;
+import org.apache.qpid.server.transport.network.security.SecurityLayer;
+import org.apache.qpid.server.transport.network.security.SecurityLayerFactory;
+import org.apache.qpid.server.transport.util.Waiter;
+import org.apache.qpid.server.util.Strings;
/**
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionClose.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionClose.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionClose.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionClose.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionClose.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionClose.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionClose.java Tue Feb 7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
public final class ConnectionClose extends Method {
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionCloseCode.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionCloseCode.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionCloseCode.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionCloseCode.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionCloseCode.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionCloseCode.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionCloseCode.java Tue Feb 7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionCloseOk.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionCloseOk.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionCloseOk.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionCloseOk.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionCloseOk.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionCloseOk.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionCloseOk.java Tue Feb 7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
public final class ConnectionCloseOk extends Method {
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionDelegate.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionDelegate.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionDelegate.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionDelegate.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionDelegate.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionDelegate.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionDelegate.java Tue Feb 7 18:38:14 2017
@@ -18,9 +18,9 @@
* under the License.
*
*/
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
-import static org.apache.qpid.transport.Connection.State.CLOSE_RCVD;
+import static org.apache.qpid.server.transport.Connection.State.CLOSE_RCVD;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionException.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionException.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionException.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionException.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionException.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionException.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionException.java Tue Feb 7 18:38:14 2017
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
/**
@@ -26,7 +26,7 @@ package org.apache.qpid.transport;
*
*/
-public class ConnectionException extends TransportException
+public class ConnectionException extends org.apache.qpid.server.transport.TransportException
{
private ConnectionClose close;
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionHeartbeat.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionHeartbeat.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionHeartbeat.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionHeartbeat.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionHeartbeat.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionHeartbeat.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionHeartbeat.java Tue Feb 7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
public final class ConnectionHeartbeat extends Method {
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionInvoker.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionInvoker.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionInvoker.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionInvoker.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionInvoker.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionInvoker.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionInvoker.java Tue Feb 7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionListener.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionListener.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionListener.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionListener.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionListener.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionListener.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionListener.java Tue Feb 7 18:38:14 2017
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
import java.util.List;
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionOpen.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionOpen.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionOpen.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionOpen.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionOpen.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionOpen.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionOpen.java Tue Feb 7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
public final class ConnectionOpen extends Method {
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionOpenOk.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionOpenOk.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionOpenOk.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionOpenOk.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionOpenOk.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionOpenOk.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionOpenOk.java Tue Feb 7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
public final class ConnectionOpenOk extends Method {
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionRedirect.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionRedirect.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionRedirect.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionRedirect.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionRedirect.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionRedirect.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionRedirect.java Tue Feb 7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
public final class ConnectionRedirect extends Method {
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionSecure.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionSecure.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionSecure.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionSecure.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionSecure.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionSecure.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionSecure.java Tue Feb 7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
public final class ConnectionSecure extends Method {
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionSecureOk.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionSecureOk.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionSecureOk.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionSecureOk.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionSecureOk.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionSecureOk.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionSecureOk.java Tue Feb 7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
public final class ConnectionSecureOk extends Method {
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionSettings.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionSettings.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionSettings.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionSettings.java Tue Feb 7 18:38:14 2017
@@ -18,25 +18,25 @@
* under the License.
*
*/
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
-import static org.apache.qpid.transport.LegacyClientProperties.AMQJ_HEARTBEAT_DELAY;
-import static org.apache.qpid.transport.LegacyClientProperties.AMQJ_HEARTBEAT_TIMEOUT_FACTOR;
-import static org.apache.qpid.transport.LegacyClientProperties.IDLE_TIMEOUT_PROP_NAME;
-import static org.apache.qpid.configuration.ClientProperties.QPID_HEARTBEAT_INTERVAL;
-import static org.apache.qpid.configuration.ClientProperties.QPID_HEARTBEAT_INTERVAL_010_DEFAULT;
-import static org.apache.qpid.configuration.ClientProperties.QPID_HEARTBEAT_TIMEOUT_FACTOR;
-import static org.apache.qpid.configuration.ClientProperties.QPID_HEARTBEAT_TIMEOUT_FACTOR_DEFAULT;
-import static org.apache.qpid.transport.LegacyClientProperties.AMQJ_TCP_NODELAY_PROP_NAME;
-import static org.apache.qpid.configuration.ClientProperties.QPID_SSL_KEY_MANAGER_FACTORY_ALGORITHM_PROP_NAME;
-import static org.apache.qpid.transport.LegacyClientProperties.QPID_SSL_KEY_STORE_CERT_TYPE_PROP_NAME;
-import static org.apache.qpid.configuration.ClientProperties.QPID_SSL_TRUST_MANAGER_FACTORY_ALGORITHM_PROP_NAME;
-import static org.apache.qpid.transport.LegacyClientProperties.QPID_SSL_TRUST_STORE_CERT_TYPE_PROP_NAME;
-import static org.apache.qpid.configuration.ClientProperties.QPID_TCP_NODELAY_PROP_NAME;
-import static org.apache.qpid.configuration.ClientProperties.RECEIVE_BUFFER_SIZE_PROP_NAME;
-import static org.apache.qpid.configuration.ClientProperties.SEND_BUFFER_SIZE_PROP_NAME;
-import static org.apache.qpid.transport.LegacyClientProperties.LEGACY_RECEIVE_BUFFER_SIZE_PROP_NAME;
-import static org.apache.qpid.transport.LegacyClientProperties.LEGACY_SEND_BUFFER_SIZE_PROP_NAME;
+import static org.apache.qpid.server.transport.LegacyClientProperties.AMQJ_HEARTBEAT_DELAY;
+import static org.apache.qpid.server.transport.LegacyClientProperties.AMQJ_HEARTBEAT_TIMEOUT_FACTOR;
+import static org.apache.qpid.server.transport.LegacyClientProperties.IDLE_TIMEOUT_PROP_NAME;
+import static org.apache.qpid.server.configuration.ClientProperties.QPID_HEARTBEAT_INTERVAL;
+import static org.apache.qpid.server.configuration.ClientProperties.QPID_HEARTBEAT_INTERVAL_010_DEFAULT;
+import static org.apache.qpid.server.configuration.ClientProperties.QPID_HEARTBEAT_TIMEOUT_FACTOR;
+import static org.apache.qpid.server.configuration.ClientProperties.QPID_HEARTBEAT_TIMEOUT_FACTOR_DEFAULT;
+import static org.apache.qpid.server.transport.LegacyClientProperties.AMQJ_TCP_NODELAY_PROP_NAME;
+import static org.apache.qpid.server.configuration.ClientProperties.QPID_SSL_KEY_MANAGER_FACTORY_ALGORITHM_PROP_NAME;
+import static org.apache.qpid.server.transport.LegacyClientProperties.QPID_SSL_KEY_STORE_CERT_TYPE_PROP_NAME;
+import static org.apache.qpid.server.configuration.ClientProperties.QPID_SSL_TRUST_MANAGER_FACTORY_ALGORITHM_PROP_NAME;
+import static org.apache.qpid.server.transport.LegacyClientProperties.QPID_SSL_TRUST_STORE_CERT_TYPE_PROP_NAME;
+import static org.apache.qpid.server.configuration.ClientProperties.QPID_TCP_NODELAY_PROP_NAME;
+import static org.apache.qpid.server.configuration.ClientProperties.RECEIVE_BUFFER_SIZE_PROP_NAME;
+import static org.apache.qpid.server.configuration.ClientProperties.SEND_BUFFER_SIZE_PROP_NAME;
+import static org.apache.qpid.server.transport.LegacyClientProperties.LEGACY_RECEIVE_BUFFER_SIZE_PROP_NAME;
+import static org.apache.qpid.server.transport.LegacyClientProperties.LEGACY_SEND_BUFFER_SIZE_PROP_NAME;
import java.io.FileInputStream;
import java.io.IOException;
@@ -58,10 +58,10 @@ import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.TrustManager;
import javax.net.ssl.TrustManagerFactory;
-import org.apache.qpid.configuration.QpidProperty;
-import org.apache.qpid.ssl.SSLContextFactory;
-import org.apache.qpid.transport.network.security.ssl.QpidClientX509KeyManager;
-import org.apache.qpid.transport.network.security.ssl.SSLUtil;
+import org.apache.qpid.server.configuration.QpidProperty;
+import org.apache.qpid.server.ssl.SSLContextFactory;
+import org.apache.qpid.server.transport.network.security.ssl.QpidClientX509KeyManager;
+import org.apache.qpid.server.transport.network.security.ssl.SSLUtil;
/**
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionStart.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionStart.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionStart.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionStart.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionStart.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionStart.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionStart.java Tue Feb 7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
public final class ConnectionStart extends Method {
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionStartOk.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionStartOk.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionStartOk.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionStartOk.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionStartOk.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionStartOk.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionStartOk.java Tue Feb 7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
public final class ConnectionStartOk extends Method {
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionTune.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionTune.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionTune.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionTune.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionTune.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionTune.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionTune.java Tue Feb 7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
public final class ConnectionTune extends Method {
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionTuneOk.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionTuneOk.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionTuneOk.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionTuneOk.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionTuneOk.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ConnectionTuneOk.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionTuneOk.java Tue Feb 7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
public final class ConnectionTuneOk extends Method {
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Constant.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/Constant.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Constant.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Constant.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/Constant.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/Constant.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Constant.java Tue Feb 7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DeliveryProperties.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/DeliveryProperties.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DeliveryProperties.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DeliveryProperties.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/DeliveryProperties.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/DeliveryProperties.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DeliveryProperties.java Tue Feb 7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -26,8 +26,8 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxCommit.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/DtxCommit.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxCommit.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxCommit.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/DtxCommit.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/DtxCommit.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxCommit.java Tue Feb 7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
public final class DtxCommit extends Method {
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxEnd.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/DtxEnd.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxEnd.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxEnd.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/DtxEnd.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/DtxEnd.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxEnd.java Tue Feb 7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
public final class DtxEnd extends Method {
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxForget.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/DtxForget.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxForget.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxForget.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/DtxForget.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/DtxForget.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxForget.java Tue Feb 7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
public final class DtxForget extends Method {
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxGetTimeout.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/DtxGetTimeout.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxGetTimeout.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxGetTimeout.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/DtxGetTimeout.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/DtxGetTimeout.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxGetTimeout.java Tue Feb 7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
public final class DtxGetTimeout extends Method {
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxPrepare.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/DtxPrepare.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxPrepare.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxPrepare.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/DtxPrepare.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/DtxPrepare.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxPrepare.java Tue Feb 7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
public final class DtxPrepare extends Method {
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxRecover.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/DtxRecover.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxRecover.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxRecover.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/DtxRecover.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/DtxRecover.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxRecover.java Tue Feb 7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
public final class DtxRecover extends Method {
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxRollback.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/DtxRollback.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxRollback.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxRollback.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/DtxRollback.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/DtxRollback.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxRollback.java Tue Feb 7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
public final class DtxRollback extends Method {
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxSelect.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/DtxSelect.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxSelect.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxSelect.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/DtxSelect.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/DtxSelect.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxSelect.java Tue Feb 7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
public final class DtxSelect extends Method {
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxSetTimeout.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/DtxSetTimeout.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxSetTimeout.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxSetTimeout.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/DtxSetTimeout.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/DtxSetTimeout.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxSetTimeout.java Tue Feb 7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
public final class DtxSetTimeout extends Method {
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxStart.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/DtxStart.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxStart.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxStart.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/DtxStart.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/DtxStart.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxStart.java Tue Feb 7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
public final class DtxStart extends Method {
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxXaStatus.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/DtxXaStatus.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxXaStatus.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxXaStatus.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/DtxXaStatus.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/DtxXaStatus.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/DtxXaStatus.java Tue Feb 7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExceptionHandlingByteBufferReceiver.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ExceptionHandlingByteBufferReceiver.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExceptionHandlingByteBufferReceiver.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExceptionHandlingByteBufferReceiver.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ExceptionHandlingByteBufferReceiver.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ExceptionHandlingByteBufferReceiver.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExceptionHandlingByteBufferReceiver.java Tue Feb 7 18:38:14 2017
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
public interface ExceptionHandlingByteBufferReceiver extends ByteBufferReceiver
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExchangeBind.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ExchangeBind.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExchangeBind.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExchangeBind.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ExchangeBind.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ExchangeBind.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExchangeBind.java Tue Feb 7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
public final class ExchangeBind extends Method {
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExchangeBound.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ExchangeBound.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExchangeBound.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExchangeBound.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ExchangeBound.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ExchangeBound.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExchangeBound.java Tue Feb 7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
public final class ExchangeBound extends Method {
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExchangeBoundResult.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ExchangeBoundResult.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExchangeBoundResult.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExchangeBoundResult.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ExchangeBoundResult.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ExchangeBoundResult.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExchangeBoundResult.java Tue Feb 7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,8 +24,8 @@ package org.apache.qpid.transport;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExchangeDeclare.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ExchangeDeclare.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExchangeDeclare.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExchangeDeclare.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ExchangeDeclare.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ExchangeDeclare.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExchangeDeclare.java Tue Feb 7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
public final class ExchangeDeclare extends Method {
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExchangeDelete.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ExchangeDelete.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExchangeDelete.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExchangeDelete.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ExchangeDelete.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ExchangeDelete.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExchangeDelete.java Tue Feb 7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
public final class ExchangeDelete extends Method {
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExchangeQuery.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ExchangeQuery.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExchangeQuery.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExchangeQuery.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ExchangeQuery.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ExchangeQuery.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExchangeQuery.java Tue Feb 7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
public final class ExchangeQuery extends Method {
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExchangeQueryResult.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ExchangeQueryResult.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExchangeQueryResult.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExchangeQueryResult.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ExchangeQueryResult.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ExchangeQueryResult.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExchangeQueryResult.java Tue Feb 7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,8 +24,8 @@ package org.apache.qpid.transport;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExchangeUnbind.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ExchangeUnbind.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExchangeUnbind.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExchangeUnbind.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ExchangeUnbind.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ExchangeUnbind.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExchangeUnbind.java Tue Feb 7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
public final class ExchangeUnbind extends Method {
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExecutionErrorCode.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ExecutionErrorCode.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExecutionErrorCode.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExecutionErrorCode.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ExecutionErrorCode.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ExecutionErrorCode.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExecutionErrorCode.java Tue Feb 7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExecutionException.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ExecutionException.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExecutionException.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExecutionException.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ExecutionException.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ExecutionException.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ExecutionException.java Tue Feb 7 18:38:14 2017
@@ -1,4 +1,4 @@
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ package org.apache.qpid.transport;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.apache.qpid.transport.codec.Decoder;
-import org.apache.qpid.transport.codec.Encoder;
+import org.apache.qpid.server.transport.codec.Decoder;
+import org.apache.qpid.server.transport.codec.Encoder;
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
public final class ExecutionException extends Method {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org