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 [9/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...
Copied: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/RangeSetTest.java (from r1781779, qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/RangeSetTest.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/RangeSetTest.java?p2=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/RangeSetTest.java&p1=qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/RangeSetTest.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/RangeSetTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/RangeSetTest.java Tue Feb 7 18:38:14 2017
@@ -18,12 +18,12 @@
* under the License.
*
*/
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
import org.apache.qpid.test.utils.QpidTestCase;
-import static org.apache.qpid.util.Serial.COMPARATOR;
-import static org.apache.qpid.util.Serial.eq;
+import static org.apache.qpid.server.util.Serial.COMPARATOR;
+import static org.apache.qpid.server.util.Serial.eq;
import java.util.ArrayList;
import java.util.Collections;
Copied: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/SessionTimeoutTest.java (from r1781779, qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/SessionTimeoutTest.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/SessionTimeoutTest.java?p2=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/SessionTimeoutTest.java&p1=qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/SessionTimeoutTest.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/SessionTimeoutTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/SessionTimeoutTest.java Tue Feb 7 18:38:14 2017
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpid.transport;
+package org.apache.qpid.server.transport;
-import org.apache.qpid.configuration.ClientProperties;
+import org.apache.qpid.server.configuration.ClientProperties;
import org.apache.qpid.test.utils.QpidTestCase;
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/codec/BBEncoderTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/codec/BBEncoderTest.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/codec/BBEncoderTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/codec/BBEncoderTest.java Tue Feb 7 18:38:14 2017
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.transport.codec;
+package org.apache.qpid.server.transport.codec;
import org.apache.qpid.test.utils.QpidTestCase;
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/network/ConnectionBinding.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/network/ConnectionBinding.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/network/ConnectionBinding.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/network/ConnectionBinding.java Tue Feb 7 18:38:14 2017
@@ -18,16 +18,16 @@
* under the License.
*
*/
-package org.apache.qpid.transport.network;
+package org.apache.qpid.server.transport.network;
-import org.apache.qpid.transport.ByteBufferSender;
-import org.apache.qpid.transport.Connection;
-import org.apache.qpid.transport.ConnectionDelegate;
-import org.apache.qpid.transport.ConnectionListener;
-import org.apache.qpid.transport.Constant;
-import org.apache.qpid.transport.ExceptionHandlingByteBufferReceiver;
-import org.apache.qpid.transport.network.security.sasl.SASLReceiver;
-import org.apache.qpid.transport.network.security.sasl.SASLSender;
+import org.apache.qpid.server.transport.ByteBufferSender;
+import org.apache.qpid.server.transport.Connection;
+import org.apache.qpid.server.transport.ConnectionDelegate;
+import org.apache.qpid.server.transport.ConnectionListener;
+import org.apache.qpid.server.transport.Constant;
+import org.apache.qpid.server.transport.ExceptionHandlingByteBufferReceiver;
+import org.apache.qpid.server.transport.network.security.sasl.SASLReceiver;
+import org.apache.qpid.server.transport.network.security.sasl.SASLSender;
/**
* ConnectionBinding
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/network/io/IdleTimeoutTickerTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/network/io/IdleTimeoutTickerTest.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/network/io/IdleTimeoutTickerTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/network/io/IdleTimeoutTickerTest.java Tue Feb 7 18:38:14 2017
@@ -19,16 +19,17 @@
*
*/
-package org.apache.qpid.transport.network.io;
+package org.apache.qpid.server.transport.network.io;
import java.net.SocketAddress;
import java.security.Principal;
import java.security.cert.Certificate;
+import org.apache.qpid.server.transport.network.io.IdleTimeoutTicker;
import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.transport.ByteBufferSender;
-import org.apache.qpid.transport.network.NetworkConnection;
-import org.apache.qpid.transport.network.TransportActivity;
+import org.apache.qpid.server.transport.ByteBufferSender;
+import org.apache.qpid.server.transport.network.NetworkConnection;
+import org.apache.qpid.server.transport.network.TransportActivity;
public class IdleTimeoutTickerTest extends QpidTestCase implements TransportActivity, NetworkConnection
{
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/network/io/IoAcceptor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/network/io/IoAcceptor.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/network/io/IoAcceptor.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/network/io/IoAcceptor.java Tue Feb 7 18:38:14 2017
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.transport.network.io;
+package org.apache.qpid.server.transport.network.io;
import java.io.IOException;
import java.net.InetSocketAddress;
@@ -29,7 +29,7 @@ import java.net.SocketAddress;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.transport.network.ConnectionBinding;
+import org.apache.qpid.server.transport.network.ConnectionBinding;
/**
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/network/io/IoTransport.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/network/io/IoTransport.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/network/io/IoTransport.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/network/io/IoTransport.java Tue Feb 7 18:38:14 2017
@@ -17,16 +17,17 @@
* under the License.
*/
-package org.apache.qpid.transport.network.io;
+package org.apache.qpid.server.transport.network.io;
import java.net.Socket;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.transport.ByteBufferSender;
-import org.apache.qpid.transport.Connection;
-import org.apache.qpid.transport.network.ConnectionBinding;
+import org.apache.qpid.server.transport.network.io.IoSender;
+import org.apache.qpid.server.transport.ByteBufferSender;
+import org.apache.qpid.server.transport.Connection;
+import org.apache.qpid.server.transport.network.ConnectionBinding;
/**
* This class provides a socket based transport using the java.io
@@ -62,7 +63,7 @@ public final class IoTransport
private void setupTransport(Socket socket, ConnectionBinding binding)
{
- IoSender ios = new IoSender(socket, 2*writeBufferSize, timeout);
+ IoSender ios = new IoSender(socket, 2 * writeBufferSize, timeout);
ios.initiate();
this.sender = ios;
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/network/security/ssl/SSLUtilTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/network/security/ssl/SSLUtilTest.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/network/security/ssl/SSLUtilTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/transport/network/security/ssl/SSLUtilTest.java Tue Feb 7 18:38:14 2017
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.transport.network.security.ssl;
+package org.apache.qpid.server.transport.network.security.ssl;
import java.io.ByteArrayInputStream;
import java.nio.ByteBuffer;
@@ -35,7 +35,7 @@ import javax.net.ssl.TrustManagerFactory
import javax.xml.bind.DatatypeConverter;
import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.transport.TransportException;
+import org.apache.qpid.server.transport.TransportException;
public class SSLUtilTest extends QpidTestCase
{
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/txn/MockServerMessage.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/txn/MockServerMessage.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/txn/MockServerMessage.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/txn/MockServerMessage.java Tue Feb 7 18:38:14 2017
@@ -23,7 +23,7 @@ package org.apache.qpid.server.txn;
import java.util.Collection;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
import org.apache.qpid.server.message.AMQMessageHeader;
import org.apache.qpid.server.message.MessageReference;
import org.apache.qpid.server.message.ServerMessage;
Copied: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/ByteBufferInputStreamTest.java (from r1781779, qpid/java/trunk/common/src/test/java/org/apache/qpid/util/ByteBufferInputStreamTest.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/ByteBufferInputStreamTest.java?p2=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/ByteBufferInputStreamTest.java&p1=qpid/java/trunk/common/src/test/java/org/apache/qpid/util/ByteBufferInputStreamTest.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/test/java/org/apache/qpid/util/ByteBufferInputStreamTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/ByteBufferInputStreamTest.java Tue Feb 7 18:38:14 2017
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.util;
+package org.apache.qpid.server.util;
import org.apache.qpid.test.utils.QpidTestCase;
Copied: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/CommandLineParserTest.java (from r1781779, qpid/java/trunk/common/src/test/java/org/apache/qpid/util/CommandLineParserTest.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/CommandLineParserTest.java?p2=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/CommandLineParserTest.java&p1=qpid/java/trunk/common/src/test/java/org/apache/qpid/util/CommandLineParserTest.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/test/java/org/apache/qpid/util/CommandLineParserTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/CommandLineParserTest.java Tue Feb 7 18:38:14 2017
@@ -19,7 +19,7 @@
*
*/
-package org.apache.qpid.util;
+package org.apache.qpid.server.util;
import junit.framework.Test;
import junit.framework.TestSuite;
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/FileHelperTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/FileHelperTest.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/FileHelperTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/FileHelperTest.java Tue Feb 7 18:38:14 2017
@@ -31,7 +31,7 @@ import java.util.Set;
import org.apache.qpid.test.utils.QpidTestCase;
import org.apache.qpid.test.utils.TestFileUtils;
-import org.apache.qpid.util.FileUtils;
+import org.apache.qpid.server.util.FileUtils;
public class FileHelperTest extends QpidTestCase
{
Copied: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/FileUtilsTest.java (from r1781779, qpid/java/trunk/common/src/test/java/org/apache/qpid/util/FileUtilsTest.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/FileUtilsTest.java?p2=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/FileUtilsTest.java&p1=qpid/java/trunk/common/src/test/java/org/apache/qpid/util/FileUtilsTest.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/test/java/org/apache/qpid/util/FileUtilsTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/FileUtilsTest.java Tue Feb 7 18:38:14 2017
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.util;
+package org.apache.qpid.server.util;
import org.apache.qpid.test.utils.QpidTestCase;
@@ -343,8 +343,8 @@ public class FileUtilsTest extends QpidT
*/
public void testOpenFileOrDefaultResourceOpensFileOnClasspath() throws Exception
{
- final String mydefaultsResource = "org/apache/qpid/util/mydefaults.properties";
- final String defaultResource = "org/apache/qpid/util/default.properties";
+ final String mydefaultsResource = "org/apache/qpid/server/util/mydefaults.properties";
+ final String defaultResource = "org/apache/qpid/server/util/default.properties";
final InputStream is = FileUtils.openFileOrDefaultResource(mydefaultsResource, defaultResource, this.getClass().getClassLoader());
@@ -362,7 +362,7 @@ public class FileUtilsTest extends QpidT
final File fileThatDoesNotExist = new File("/does/not/exist.properties");
assertFalse("Test must not exist", fileThatDoesNotExist.exists());
- final String defaultResource = "org/apache/qpid/util/default.properties";
+ final String defaultResource = "org/apache/qpid/server/util/default.properties";
final InputStream is = FileUtils.openFileOrDefaultResource(fileThatDoesNotExist.getCanonicalPath(), defaultResource, this.getClass().getClassLoader());
assertNotNull("Stream must not be null", is);
@@ -378,8 +378,8 @@ public class FileUtilsTest extends QpidT
public void testOpenFileOrDefaultResourceReturnsNullWhenNeitherCanBeFound() throws Exception
{
- final String mydefaultsResource = "org/apache/qpid/util/doesnotexisteiether.properties";
- final String defaultResource = "org/apache/qpid/util/doesnotexisteiether.properties";
+ final String mydefaultsResource = "org/apache/qpid/server/util/doesnotexisteiether.properties";
+ final String defaultResource = "org/apache/qpid/server/util/doesnotexisteiether.properties";
final InputStream is = FileUtils.openFileOrDefaultResource(mydefaultsResource, defaultResource, this.getClass().getClassLoader());
assertNull("Stream must be null", is);
Copied: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/GZIPUtilsTest.java (from r1781779, qpid/java/trunk/common/src/test/java/org/apache/qpid/util/GZIPUtilsTest.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/GZIPUtilsTest.java?p2=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/GZIPUtilsTest.java&p1=qpid/java/trunk/common/src/test/java/org/apache/qpid/util/GZIPUtilsTest.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/test/java/org/apache/qpid/util/GZIPUtilsTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/GZIPUtilsTest.java Tue Feb 7 18:38:14 2017
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.util;
+package org.apache.qpid.server.util;
import java.io.IOException;
@@ -26,6 +26,7 @@ import java.io.InputStream;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import org.apache.qpid.server.util.GZIPUtils;
import org.apache.qpid.test.utils.QpidTestCase;
public class GZIPUtilsTest extends QpidTestCase
Copied: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/SerialTest.java (from r1781779, qpid/java/trunk/common/src/test/java/org/apache/qpid/util/SerialTest.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/SerialTest.java?p2=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/SerialTest.java&p1=qpid/java/trunk/common/src/test/java/org/apache/qpid/util/SerialTest.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/test/java/org/apache/qpid/util/SerialTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/SerialTest.java Tue Feb 7 18:38:14 2017
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.util;
+package org.apache.qpid.server.util;
import org.apache.qpid.test.utils.QpidTestCase;
Copied: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/StringsTest.java (from r1781779, qpid/java/trunk/common/src/test/java/org/apache/qpid/util/StringsTest.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/StringsTest.java?p2=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/StringsTest.java&p1=qpid/java/trunk/common/src/test/java/org/apache/qpid/util/StringsTest.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/test/java/org/apache/qpid/util/StringsTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/StringsTest.java Tue Feb 7 18:38:14 2017
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.util;
+package org.apache.qpid.server.util;
import java.util.Collections;
import java.util.LinkedHashMap;
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AbstractVirtualHostTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AbstractVirtualHostTest.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AbstractVirtualHostTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AbstractVirtualHostTest.java Tue Feb 7 18:38:14 2017
@@ -61,7 +61,7 @@ import org.apache.qpid.server.store.Mess
import org.apache.qpid.server.store.preferences.PreferenceStore;
import org.apache.qpid.test.utils.QpidTestCase;
import org.apache.qpid.test.utils.TestFileUtils;
-import org.apache.qpid.util.FileUtils;
+import org.apache.qpid.server.util.FileUtils;
public class AbstractVirtualHostTest extends QpidTestCase
{
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecovererTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecovererTest.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecovererTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecovererTest.java Tue Feb 7 18:38:14 2017
@@ -57,7 +57,7 @@ import org.apache.qpid.server.txn.DtxBra
import org.apache.qpid.server.txn.DtxRegistry;
import org.apache.qpid.server.util.Action;
import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.transport.Xid;
+import org.apache.qpid.server.transport.Xid;
public class SynchronousMessageStoreRecovererTest extends QpidTestCase
{
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostQueueCreationTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostQueueCreationTest.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostQueueCreationTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostQueueCreationTest.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.exchange.ExchangeDefaults;
+import org.apache.qpid.server.exchange.ExchangeDefaults;
import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor;
import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.logging.EventLogger;
Modified: qpid/java/trunk/broker-core/src/xsl/qmf.xsl
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/xsl/qmf.xsl?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/xsl/qmf.xsl (original)
+++ qpid/java/trunk/broker-core/src/xsl/qmf.xsl Tue Feb 7 18:38:14 2017
@@ -28,8 +28,8 @@ package org.apache.qpid.qmf.schema;
import org.apache.qpid.qmf.*;
import org.apache.qpid.server.virtualhost.VirtualHost;
import org.apache.qpid.server.message.ServerMessage;
-import org.apache.qpid.transport.codec.BBEncoder;
-import org.apache.qpid.transport.codec.BBDecoder;
+import org.apache.qpid.server.transport.codec.BBEncoder;
+import org.apache.qpid.server.transport.codec.BBDecoder;
import java.util.Arrays;
import java.util.UUID;
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10Impl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10Impl.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10Impl.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10Impl.java Tue Feb 7 18:38:14 2017
@@ -34,7 +34,7 @@ import java.util.concurrent.atomic.Atomi
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
import org.apache.qpid.server.logging.messages.ConnectionMessages;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.Protocol;
@@ -50,10 +50,10 @@ import org.apache.qpid.server.transport.
import org.apache.qpid.server.util.Action;
import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
-import org.apache.qpid.transport.ByteBufferSender;
-import org.apache.qpid.transport.ConnectionCloseCode;
-import org.apache.qpid.transport.ConnectionDelegate;
-import org.apache.qpid.transport.Constant;
+import org.apache.qpid.server.transport.ByteBufferSender;
+import org.apache.qpid.server.transport.ConnectionCloseCode;
+import org.apache.qpid.server.transport.ConnectionDelegate;
+import org.apache.qpid.server.transport.Constant;
public class AMQPConnection_0_10Impl extends AbstractAMQPConnection<AMQPConnection_0_10Impl, ServerConnection>
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java Tue Feb 7 18:38:14 2017
@@ -29,7 +29,7 @@ import java.util.concurrent.atomic.Atomi
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
import org.apache.qpid.server.consumer.AbstractConsumerTarget;
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.messages.ChannelMessages;
@@ -48,18 +48,18 @@ import org.apache.qpid.server.txn.Server
import org.apache.qpid.server.util.Action;
import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
import org.apache.qpid.server.util.StateChangeListener;
-import org.apache.qpid.transport.DeliveryProperties;
-import org.apache.qpid.transport.Header;
-import org.apache.qpid.transport.MessageAcceptMode;
-import org.apache.qpid.transport.MessageAcquireMode;
-import org.apache.qpid.transport.MessageCreditUnit;
-import org.apache.qpid.transport.MessageFlowMode;
-import org.apache.qpid.transport.MessageProperties;
-import org.apache.qpid.transport.MessageTransfer;
-import org.apache.qpid.transport.Method;
-import org.apache.qpid.transport.Option;
-import org.apache.qpid.util.ByteBufferUtils;
-import org.apache.qpid.util.GZIPUtils;
+import org.apache.qpid.server.transport.DeliveryProperties;
+import org.apache.qpid.server.transport.Header;
+import org.apache.qpid.server.transport.MessageAcceptMode;
+import org.apache.qpid.server.transport.MessageAcquireMode;
+import org.apache.qpid.server.transport.MessageCreditUnit;
+import org.apache.qpid.server.transport.MessageFlowMode;
+import org.apache.qpid.server.transport.MessageProperties;
+import org.apache.qpid.server.transport.MessageTransfer;
+import org.apache.qpid.server.transport.Method;
+import org.apache.qpid.server.transport.Option;
+import org.apache.qpid.server.util.ByteBufferUtils;
+import org.apache.qpid.server.util.GZIPUtils;
public class ConsumerTarget_0_10 extends AbstractConsumerTarget<ConsumerTarget_0_10>
{
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageAcceptCompletionListener.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageAcceptCompletionListener.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageAcceptCompletionListener.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageAcceptCompletionListener.java Tue Feb 7 18:38:14 2017
@@ -23,7 +23,7 @@ package org.apache.qpid.server.protocol.
import org.apache.qpid.server.message.MessageInstance;
import org.apache.qpid.server.message.MessageInstanceConsumer;
-import org.apache.qpid.transport.Method;
+import org.apache.qpid.server.transport.Method;
public class MessageAcceptCompletionListener implements Method.CompletionListener
{
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_Internal_to_v0_10.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_Internal_to_v0_10.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_Internal_to_v0_10.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_Internal_to_v0_10.java Tue Feb 7 18:38:14 2017
@@ -24,16 +24,16 @@ import java.util.Collection;
import java.util.Collections;
import java.util.UUID;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
import org.apache.qpid.server.message.internal.InternalMessage;
import org.apache.qpid.server.model.NamedAddressSpace;
import org.apache.qpid.server.plugin.MessageConverter;
import org.apache.qpid.server.plugin.PluggableService;
import org.apache.qpid.server.store.StoredMessage;
-import org.apache.qpid.transport.DeliveryProperties;
-import org.apache.qpid.transport.Header;
-import org.apache.qpid.transport.MessageDeliveryPriority;
-import org.apache.qpid.transport.MessageProperties;
+import org.apache.qpid.server.transport.DeliveryProperties;
+import org.apache.qpid.server.transport.Header;
+import org.apache.qpid.server.transport.MessageDeliveryPriority;
+import org.apache.qpid.server.transport.MessageProperties;
@PluggableService
public class MessageConverter_Internal_to_v0_10 implements MessageConverter<InternalMessage, MessageTransferMessage>
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10.java Tue Feb 7 18:38:14 2017
@@ -29,7 +29,7 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.message.internal.InternalMessageHeader;
import org.apache.qpid.server.model.NamedAddressSpace;
@@ -37,11 +37,11 @@ import org.apache.qpid.server.plugin.Mes
import org.apache.qpid.server.plugin.PluggableService;
import org.apache.qpid.server.store.StoredMessage;
import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
-import org.apache.qpid.transport.DeliveryProperties;
-import org.apache.qpid.transport.Header;
-import org.apache.qpid.transport.MessageDeliveryPriority;
-import org.apache.qpid.transport.MessageProperties;
-import org.apache.qpid.transport.codec.BBEncoder;
+import org.apache.qpid.server.transport.DeliveryProperties;
+import org.apache.qpid.server.transport.Header;
+import org.apache.qpid.server.transport.MessageDeliveryPriority;
+import org.apache.qpid.server.transport.MessageProperties;
+import org.apache.qpid.server.transport.codec.BBEncoder;
@PluggableService
public class MessageConverter_v0_10 implements MessageConverter<ServerMessage, MessageTransferMessage>
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10_to_Internal.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10_to_Internal.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10_to_Internal.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10_to_Internal.java Tue Feb 7 18:38:14 2017
@@ -29,19 +29,19 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
import org.apache.qpid.server.message.AMQMessageHeader;
import org.apache.qpid.server.message.internal.InternalMessage;
import org.apache.qpid.server.model.NamedAddressSpace;
import org.apache.qpid.server.plugin.MessageConverter;
import org.apache.qpid.server.plugin.PluggableService;
import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
-import org.apache.qpid.transport.MessageProperties;
-import org.apache.qpid.transport.ReplyTo;
-import org.apache.qpid.transport.codec.BBDecoder;
-import org.apache.qpid.typedmessage.TypedBytesContentReader;
-import org.apache.qpid.typedmessage.TypedBytesFormatException;
-import org.apache.qpid.util.GZIPUtils;
+import org.apache.qpid.server.transport.MessageProperties;
+import org.apache.qpid.server.transport.ReplyTo;
+import org.apache.qpid.server.transport.codec.BBDecoder;
+import org.apache.qpid.server.typedmessage.TypedBytesContentReader;
+import org.apache.qpid.server.typedmessage.TypedBytesFormatException;
+import org.apache.qpid.server.util.GZIPUtils;
@PluggableService
public class MessageConverter_v0_10_to_Internal implements MessageConverter<MessageTransferMessage, InternalMessage>
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageFormat_0_10.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageFormat_0_10.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageFormat_0_10.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageFormat_0_10.java Tue Feb 7 18:38:14 2017
@@ -24,20 +24,20 @@ import java.nio.BufferUnderflowException
import java.util.ArrayList;
import java.util.List;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.framing.AMQFrameDecodingException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.MessagePublishInfo;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.framing.AMQFrameDecodingException;
+import org.apache.qpid.server.framing.AMQShortString;
+import org.apache.qpid.server.framing.ContentHeaderBody;
+import org.apache.qpid.server.framing.MessagePublishInfo;
import org.apache.qpid.server.plugin.MessageFormat;
import org.apache.qpid.server.store.MessageHandle;
import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.store.StoredMessage;
import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
-import org.apache.qpid.transport.DeliveryProperties;
-import org.apache.qpid.transport.Header;
-import org.apache.qpid.transport.MessageProperties;
-import org.apache.qpid.transport.Struct;
+import org.apache.qpid.server.transport.DeliveryProperties;
+import org.apache.qpid.server.transport.Header;
+import org.apache.qpid.server.transport.MessageProperties;
+import org.apache.qpid.server.transport.Struct;
public class MessageFormat_0_10 implements MessageFormat<MessageTransferMessage>
{
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaDataType_0_10.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaDataType_0_10.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaDataType_0_10.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaDataType_0_10.java Tue Feb 7 18:38:14 2017
@@ -20,7 +20,7 @@
*/
package org.apache.qpid.server.protocol.v0_10;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.plugin.MessageMetaDataType;
import org.apache.qpid.server.plugin.PluggableService;
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaData_0_10.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaData_0_10.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaData_0_10.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaData_0_10.java Tue Feb 7 18:38:14 2017
@@ -24,16 +24,16 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
import org.apache.qpid.server.message.AMQMessageHeader;
import org.apache.qpid.server.plugin.MessageMetaDataType;
import org.apache.qpid.server.store.StorableMessageMetaData;
-import org.apache.qpid.transport.DeliveryProperties;
-import org.apache.qpid.transport.Header;
-import org.apache.qpid.transport.MessageDeliveryMode;
-import org.apache.qpid.transport.MessageProperties;
-import org.apache.qpid.transport.MessageTransfer;
-import org.apache.qpid.transport.Struct;
+import org.apache.qpid.server.transport.DeliveryProperties;
+import org.apache.qpid.server.transport.Header;
+import org.apache.qpid.server.transport.MessageDeliveryMode;
+import org.apache.qpid.server.transport.MessageProperties;
+import org.apache.qpid.server.transport.MessageTransfer;
+import org.apache.qpid.server.transport.Struct;
public class MessageMetaData_0_10 implements StorableMessageMetaData
{
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageTransferHeader.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageTransferHeader.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageTransferHeader.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageTransferHeader.java Tue Feb 7 18:38:14 2017
@@ -22,9 +22,9 @@ package org.apache.qpid.server.protocol.
import java.util.*;
import org.apache.qpid.server.message.AMQMessageHeader;
-import org.apache.qpid.transport.DeliveryProperties;
-import org.apache.qpid.transport.MessageDeliveryPriority;
-import org.apache.qpid.transport.MessageProperties;
+import org.apache.qpid.server.transport.DeliveryProperties;
+import org.apache.qpid.server.transport.MessageDeliveryPriority;
+import org.apache.qpid.server.transport.MessageProperties;
class MessageTransferHeader implements AMQMessageHeader
{
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageTransferMessage.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageTransferMessage.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageTransferMessage.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageTransferMessage.java Tue Feb 7 18:38:14 2017
@@ -22,12 +22,12 @@ package org.apache.qpid.server.protocol.
import java.util.Collection;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
import org.apache.qpid.server.message.AMQMessageHeader;
import org.apache.qpid.server.message.AbstractServerMessageImpl;
import org.apache.qpid.server.store.StoredMessage;
import org.apache.qpid.server.store.TransactionLogResource;
-import org.apache.qpid.transport.Header;
+import org.apache.qpid.server.transport.Header;
public class MessageTransferMessage extends AbstractServerMessageImpl<MessageTransferMessage, MessageMetaData_0_10>
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerAssembler.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerAssembler.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerAssembler.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerAssembler.java Tue Feb 7 18:38:14 2017
@@ -31,16 +31,16 @@ import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.transport.DeliveryProperties;
-import org.apache.qpid.transport.Header;
-import org.apache.qpid.transport.MessageProperties;
-import org.apache.qpid.transport.Method;
-import org.apache.qpid.transport.ProtocolError;
-import org.apache.qpid.transport.ProtocolEvent;
-import org.apache.qpid.transport.ProtocolHeader;
-import org.apache.qpid.transport.Struct;
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.transport.DeliveryProperties;
+import org.apache.qpid.server.transport.Header;
+import org.apache.qpid.server.transport.MessageProperties;
+import org.apache.qpid.server.transport.Method;
+import org.apache.qpid.server.transport.ProtocolError;
+import org.apache.qpid.server.transport.ProtocolEvent;
+import org.apache.qpid.server.transport.ProtocolHeader;
+import org.apache.qpid.server.transport.Struct;
+import org.apache.qpid.server.transport.network.Frame;
public class ServerAssembler
{
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java Tue Feb 7 18:38:14 2017
@@ -20,7 +20,7 @@
*/
package org.apache.qpid.server.protocol.v0_10;
-import static org.apache.qpid.transport.Connection.State.CLOSING;
+import static org.apache.qpid.server.transport.Connection.State.CLOSING;
import java.net.SocketAddress;
import java.security.AccessControlContext;
@@ -40,7 +40,7 @@ import java.util.concurrent.atomic.Atomi
import javax.security.auth.Subject;
-import org.apache.qpid.protocol.ErrorCodes;
+import org.apache.qpid.server.protocol.ErrorCodes;
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.NamedAddressSpace;
@@ -52,16 +52,16 @@ import org.apache.qpid.server.transport.
import org.apache.qpid.server.transport.ServerNetworkConnection;
import org.apache.qpid.server.util.Action;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
-import org.apache.qpid.transport.Connection;
-import org.apache.qpid.transport.ConnectionClose;
-import org.apache.qpid.transport.ConnectionCloseCode;
-import org.apache.qpid.transport.ConnectionCloseOk;
-import org.apache.qpid.transport.ExecutionErrorCode;
-import org.apache.qpid.transport.ExecutionException;
-import org.apache.qpid.transport.Method;
-import org.apache.qpid.transport.Option;
-import org.apache.qpid.transport.ProtocolEvent;
-import org.apache.qpid.transport.Session;
+import org.apache.qpid.server.transport.Connection;
+import org.apache.qpid.server.transport.ConnectionClose;
+import org.apache.qpid.server.transport.ConnectionCloseCode;
+import org.apache.qpid.server.transport.ConnectionCloseOk;
+import org.apache.qpid.server.transport.ExecutionErrorCode;
+import org.apache.qpid.server.transport.ExecutionException;
+import org.apache.qpid.server.transport.Method;
+import org.apache.qpid.server.transport.Option;
+import org.apache.qpid.server.transport.ProtocolEvent;
+import org.apache.qpid.server.transport.Session;
public class ServerConnection extends Connection
{
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java Tue Feb 7 18:38:14 2017
@@ -20,7 +20,7 @@
*/
package org.apache.qpid.server.protocol.v0_10;
-import static org.apache.qpid.transport.Connection.State.CLOSE_RCVD;
+import static org.apache.qpid.server.transport.Connection.State.CLOSE_RCVD;
import java.security.AccessControlException;
import java.security.Principal;
@@ -35,9 +35,9 @@ import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.common.ServerPropertyNames;
-import org.apache.qpid.configuration.CommonProperties;
-import org.apache.qpid.properties.ConnectionStartProperties;
+import org.apache.qpid.server.common.ServerPropertyNames;
+import org.apache.qpid.server.configuration.CommonProperties;
+import org.apache.qpid.server.properties.ConnectionStartProperties;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.NamedAddressSpace;
import org.apache.qpid.server.model.port.AmqpPort;
@@ -49,25 +49,25 @@ import org.apache.qpid.server.security.a
import org.apache.qpid.server.transport.AMQPConnection;
import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
import org.apache.qpid.server.virtualhost.VirtualHostUnavailableException;
-import org.apache.qpid.transport.Binary;
-import org.apache.qpid.transport.Connection;
-import org.apache.qpid.transport.ConnectionClose;
-import org.apache.qpid.transport.ConnectionCloseCode;
-import org.apache.qpid.transport.ConnectionDelegate;
-import org.apache.qpid.transport.ConnectionOpen;
-import org.apache.qpid.transport.ConnectionOpenOk;
-import org.apache.qpid.transport.ConnectionRedirect;
-import org.apache.qpid.transport.ConnectionSecureOk;
-import org.apache.qpid.transport.ConnectionStartOk;
-import org.apache.qpid.transport.ConnectionTuneOk;
-import org.apache.qpid.transport.Constant;
-import org.apache.qpid.transport.ProtocolHeader;
-import org.apache.qpid.transport.Session;
-import org.apache.qpid.transport.SessionAttach;
-import org.apache.qpid.transport.SessionDelegate;
-import org.apache.qpid.transport.SessionDetach;
-import org.apache.qpid.transport.SessionDetachCode;
-import org.apache.qpid.transport.SessionDetached;
+import org.apache.qpid.server.transport.Binary;
+import org.apache.qpid.server.transport.Connection;
+import org.apache.qpid.server.transport.ConnectionClose;
+import org.apache.qpid.server.transport.ConnectionCloseCode;
+import org.apache.qpid.server.transport.ConnectionDelegate;
+import org.apache.qpid.server.transport.ConnectionOpen;
+import org.apache.qpid.server.transport.ConnectionOpenOk;
+import org.apache.qpid.server.transport.ConnectionRedirect;
+import org.apache.qpid.server.transport.ConnectionSecureOk;
+import org.apache.qpid.server.transport.ConnectionStartOk;
+import org.apache.qpid.server.transport.ConnectionTuneOk;
+import org.apache.qpid.server.transport.Constant;
+import org.apache.qpid.server.transport.ProtocolHeader;
+import org.apache.qpid.server.transport.Session;
+import org.apache.qpid.server.transport.SessionAttach;
+import org.apache.qpid.server.transport.SessionDelegate;
+import org.apache.qpid.server.transport.SessionDetach;
+import org.apache.qpid.server.transport.SessionDetachCode;
+import org.apache.qpid.server.transport.SessionDetached;
public class ServerConnectionDelegate extends ConnectionDelegate
{
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerDecoder.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerDecoder.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerDecoder.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerDecoder.java Tue Feb 7 18:38:14 2017
@@ -22,8 +22,8 @@ package org.apache.qpid.server.protocol.
import java.util.List;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.transport.codec.AbstractDecoder;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.transport.codec.AbstractDecoder;
final class ServerDecoder extends AbstractDecoder
{
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerDisassembler.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerDisassembler.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerDisassembler.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerDisassembler.java Tue Feb 7 18:38:14 2017
@@ -21,11 +21,11 @@
package org.apache.qpid.server.protocol.v0_10;
import static java.lang.Math.min;
-import static org.apache.qpid.transport.network.Frame.FIRST_FRAME;
-import static org.apache.qpid.transport.network.Frame.FIRST_SEG;
-import static org.apache.qpid.transport.network.Frame.HEADER_SIZE;
-import static org.apache.qpid.transport.network.Frame.LAST_FRAME;
-import static org.apache.qpid.transport.network.Frame.LAST_SEG;
+import static org.apache.qpid.server.transport.network.Frame.FIRST_FRAME;
+import static org.apache.qpid.server.transport.network.Frame.FIRST_SEG;
+import static org.apache.qpid.server.transport.network.Frame.HEADER_SIZE;
+import static org.apache.qpid.server.transport.network.Frame.LAST_FRAME;
+import static org.apache.qpid.server.transport.network.Frame.LAST_SEG;
import java.util.ArrayList;
import java.util.Collection;
@@ -34,19 +34,19 @@ import java.util.Collections;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.transport.ByteBufferSender;
-import org.apache.qpid.transport.FrameSizeObserver;
-import org.apache.qpid.transport.Header;
-import org.apache.qpid.transport.Method;
-import org.apache.qpid.transport.ProtocolDelegate;
-import org.apache.qpid.transport.ProtocolError;
-import org.apache.qpid.transport.ProtocolEvent;
-import org.apache.qpid.transport.ProtocolEventSender;
-import org.apache.qpid.transport.ProtocolHeader;
-import org.apache.qpid.transport.SegmentType;
-import org.apache.qpid.transport.Struct;
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.transport.ByteBufferSender;
+import org.apache.qpid.server.transport.FrameSizeObserver;
+import org.apache.qpid.server.transport.Header;
+import org.apache.qpid.server.transport.Method;
+import org.apache.qpid.server.transport.ProtocolDelegate;
+import org.apache.qpid.server.transport.ProtocolError;
+import org.apache.qpid.server.transport.ProtocolEvent;
+import org.apache.qpid.server.transport.ProtocolEventSender;
+import org.apache.qpid.server.transport.ProtocolHeader;
+import org.apache.qpid.server.transport.SegmentType;
+import org.apache.qpid.server.transport.Struct;
+import org.apache.qpid.server.transport.network.Frame;
/**
* Disassembler
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerEncoder.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerEncoder.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerEncoder.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerEncoder.java Tue Feb 7 18:38:14 2017
@@ -24,8 +24,8 @@ import java.nio.BufferOverflowException;
import java.nio.ByteBuffer;
import java.util.UUID;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.transport.codec.AbstractEncoder;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.transport.codec.AbstractEncoder;
public final class ServerEncoder extends AbstractEncoder
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerFrame.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerFrame.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerFrame.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerFrame.java Tue Feb 7 18:38:14 2017
@@ -20,13 +20,13 @@
*/
package org.apache.qpid.server.protocol.v0_10;
-import static org.apache.qpid.transport.util.Functions.str;
+import static org.apache.qpid.server.transport.util.Functions.str;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.transport.SegmentType;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.transport.SegmentType;
public final class ServerFrame
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerInputHandler.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerInputHandler.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerInputHandler.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerInputHandler.java Tue Feb 7 18:38:14 2017
@@ -20,18 +20,18 @@
*/
package org.apache.qpid.server.protocol.v0_10;
-import static org.apache.qpid.transport.util.Functions.str;
+import static org.apache.qpid.server.transport.util.Functions.str;
import static org.apache.qpid.server.protocol.v0_10.ServerInputHandler.State.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.transport.Constant;
-import org.apache.qpid.transport.FrameSizeObserver;
-import org.apache.qpid.transport.ProtocolError;
-import org.apache.qpid.transport.ProtocolHeader;
-import org.apache.qpid.transport.SegmentType;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.transport.Constant;
+import org.apache.qpid.server.transport.FrameSizeObserver;
+import org.apache.qpid.server.transport.ProtocolError;
+import org.apache.qpid.server.transport.ProtocolHeader;
+import org.apache.qpid.server.transport.SegmentType;
public class ServerInputHandler implements FrameSizeObserver
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java Tue Feb 7 18:38:14 2017
@@ -21,7 +21,7 @@
package org.apache.qpid.server.protocol.v0_10;
import static org.apache.qpid.server.logging.subjects.LogSubjectFormat.CHANNEL_FORMAT;
-import static org.apache.qpid.util.Serial.gt;
+import static org.apache.qpid.server.util.Serial.gt;
import java.security.AccessControlContext;
import java.security.AccessController;
@@ -87,7 +87,7 @@ import org.apache.qpid.server.txn.Timeou
import org.apache.qpid.server.txn.UnknownDtxBranchException;
import org.apache.qpid.server.util.Action;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
-import org.apache.qpid.transport.*;
+import org.apache.qpid.server.transport.*;
public class ServerSession extends Session
implements LogSubject, AsyncAutoCommitTransaction.FutureRecorder
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java Tue Feb 7 18:38:14 2017
@@ -35,10 +35,10 @@ import com.google.common.util.concurrent
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.common.AMQPFilterTypes;
-import org.apache.qpid.exchange.ExchangeDefaults;
-import org.apache.qpid.protocol.ErrorCodes;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.common.AMQPFilterTypes;
+import org.apache.qpid.server.exchange.ExchangeDefaults;
+import org.apache.qpid.server.protocol.ErrorCodes;
import org.apache.qpid.server.consumer.ConsumerOption;
import org.apache.qpid.server.filter.AMQInvalidArgumentException;
import org.apache.qpid.server.filter.ArrivalTimeFilter;
@@ -82,7 +82,7 @@ import org.apache.qpid.server.virtualhos
import org.apache.qpid.server.virtualhost.RequiredExchangeException;
import org.apache.qpid.server.virtualhost.ReservedExchangeNameException;
import org.apache.qpid.server.virtualhost.VirtualHostUnavailableException;
-import org.apache.qpid.transport.*;
+import org.apache.qpid.server.transport.*;
public class ServerSessionDelegate extends SessionDelegate
{
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegateTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegateTest.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegateTest.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegateTest.java Tue Feb 7 18:38:14 2017
@@ -29,10 +29,10 @@ import static org.mockito.Mockito.when;
import org.apache.qpid.server.model.Exchange;
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.transport.ExchangeDelete;
-import org.apache.qpid.transport.ExecutionErrorCode;
-import org.apache.qpid.transport.ExecutionException;
-import org.apache.qpid.transport.Option;
+import org.apache.qpid.server.transport.ExchangeDelete;
+import org.apache.qpid.server.transport.ExecutionErrorCode;
+import org.apache.qpid.server.transport.ExecutionException;
+import org.apache.qpid.server.transport.Option;
import org.mockito.ArgumentMatcher;
public class ServerSessionDelegateTest extends QpidTestCase
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionTest.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionTest.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/ServerSessionTest.java Tue Feb 7 18:38:14 2017
@@ -41,11 +41,11 @@ import org.apache.qpid.server.model.Virt
import org.apache.qpid.server.model.port.AmqpPort;
import org.apache.qpid.server.model.BrokerTestHelper;
import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.transport.Binary;
-import org.apache.qpid.transport.ExecutionErrorCode;
-import org.apache.qpid.transport.ExecutionException;
-import org.apache.qpid.transport.MessageTransfer;
-import org.apache.qpid.transport.Method;
+import org.apache.qpid.server.transport.Binary;
+import org.apache.qpid.server.transport.ExecutionErrorCode;
+import org.apache.qpid.server.transport.ExecutionException;
+import org.apache.qpid.server.transport.MessageTransfer;
+import org.apache.qpid.server.transport.Method;
public class ServerSessionTest extends QpidTestCase
{
Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java Tue Feb 7 18:38:14 2017
@@ -20,7 +20,7 @@
*/
package org.apache.qpid.server.protocol.v0_8;
-import static org.apache.qpid.transport.util.Functions.hex;
+import static org.apache.qpid.server.transport.util.Functions.hex;
import java.security.AccessControlContext;
import java.security.AccessControlException;
@@ -51,12 +51,12 @@ import com.google.common.util.concurrent
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.AMQConnectionException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.common.AMQPFilterTypes;
-import org.apache.qpid.exchange.ExchangeDefaults;
-import org.apache.qpid.framing.*;
-import org.apache.qpid.protocol.ErrorCodes;
+import org.apache.qpid.server.AMQConnectionException;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.common.AMQPFilterTypes;
+import org.apache.qpid.server.exchange.ExchangeDefaults;
+import org.apache.qpid.server.framing.*;
+import org.apache.qpid.server.protocol.ErrorCodes;
import org.apache.qpid.server.consumer.ConsumerOption;
import org.apache.qpid.server.consumer.ConsumerTarget;
import org.apache.qpid.server.filter.AMQInvalidArgumentException;
@@ -97,7 +97,7 @@ import org.apache.qpid.server.util.Serve
import org.apache.qpid.server.virtualhost.ExchangeIsAlternateException;
import org.apache.qpid.server.virtualhost.RequiredExchangeException;
import org.apache.qpid.server.virtualhost.ReservedExchangeNameException;
-import org.apache.qpid.transport.network.Ticker;
+import org.apache.qpid.server.transport.network.Ticker;
public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0_8>
implements AsyncAutoCommitTransaction.FutureRecorder,
Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessage.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessage.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessage.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessage.java Tue Feb 7 18:38:14 2017
@@ -20,10 +20,10 @@
*/
package org.apache.qpid.server.protocol.v0_8;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.BasicContentHeaderProperties;
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.MessagePublishInfo;
+import org.apache.qpid.server.framing.AMQShortString;
+import org.apache.qpid.server.framing.BasicContentHeaderProperties;
+import org.apache.qpid.server.framing.ContentHeaderBody;
+import org.apache.qpid.server.framing.MessagePublishInfo;
import org.apache.qpid.server.message.AMQMessageHeader;
import org.apache.qpid.server.message.AbstractServerMessageImpl;
import org.apache.qpid.server.store.StoredMessage;
Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQNoMethodHandlerException.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQNoMethodHandlerException.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQNoMethodHandlerException.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQNoMethodHandlerException.java Tue Feb 7 18:38:14 2017
@@ -20,9 +20,9 @@
*/
package org.apache.qpid.server.protocol.v0_8;
-import org.apache.qpid.QpidException;
-import org.apache.qpid.framing.AMQMethodBody;
-import org.apache.qpid.protocol.AMQMethodEvent;
+import org.apache.qpid.server.QpidException;
+import org.apache.qpid.server.framing.AMQMethodBody;
+import org.apache.qpid.server.protocol.AMQMethodEvent;
/**
* AMQNoMethodHandlerException represents the case where no method handler exists to handle an AQMP method.
Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java Tue Feb 7 18:38:14 2017
@@ -20,9 +20,9 @@
*/
package org.apache.qpid.server.protocol.v0_8;
-import org.apache.qpid.framing.AMQDataBlock;
-import org.apache.qpid.framing.MethodRegistry;
-import org.apache.qpid.framing.ProtocolVersion;
+import org.apache.qpid.server.framing.AMQDataBlock;
+import org.apache.qpid.server.framing.MethodRegistry;
+import org.apache.qpid.server.framing.ProtocolVersion;
import org.apache.qpid.server.logging.EventLoggerProvider;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.ContextProvider;
Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Impl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Impl.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Impl.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Impl.java Tue Feb 7 18:38:14 2017
@@ -44,16 +44,16 @@ import java.util.regex.Pattern;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.AMQConnectionException;
-import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.codec.AMQDecoder;
-import org.apache.qpid.codec.ServerDecoder;
-import org.apache.qpid.common.ServerPropertyNames;
-import org.apache.qpid.configuration.CommonProperties;
-import org.apache.qpid.framing.*;
-import org.apache.qpid.properties.ConnectionStartProperties;
-import org.apache.qpid.protocol.ErrorCodes;
+import org.apache.qpid.server.AMQConnectionException;
+import org.apache.qpid.server.QpidException;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.codec.AMQDecoder;
+import org.apache.qpid.server.codec.ServerDecoder;
+import org.apache.qpid.server.common.ServerPropertyNames;
+import org.apache.qpid.server.configuration.CommonProperties;
+import org.apache.qpid.server.framing.*;
+import org.apache.qpid.server.properties.ConnectionStartProperties;
+import org.apache.qpid.server.protocol.ErrorCodes;
import org.apache.qpid.server.logging.messages.ConnectionMessages;
import org.apache.qpid.server.message.InstanceProperties;
import org.apache.qpid.server.message.ServerMessage;
@@ -77,8 +77,8 @@ import org.apache.qpid.server.util.Actio
import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
import org.apache.qpid.server.virtualhost.VirtualHostUnavailableException;
-import org.apache.qpid.transport.ByteBufferSender;
-import org.apache.qpid.transport.TransportException;
+import org.apache.qpid.server.transport.ByteBufferSender;
+import org.apache.qpid.server.transport.TransportException;
public class AMQPConnection_0_8Impl
extends AbstractAMQPConnection<AMQPConnection_0_8Impl, AMQPConnection_0_8Impl>
Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/BrokerDecoder.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/BrokerDecoder.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/BrokerDecoder.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/BrokerDecoder.java Tue Feb 7 18:38:14 2017
@@ -28,9 +28,9 @@ import java.security.PrivilegedException
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.codec.ServerDecoder;
-import org.apache.qpid.framing.AMQFrameDecodingException;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.codec.ServerDecoder;
+import org.apache.qpid.server.framing.AMQFrameDecodingException;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
public class BrokerDecoder extends ServerDecoder
Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/CachedFrame.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/CachedFrame.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/CachedFrame.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/CachedFrame.java Tue Feb 7 18:38:14 2017
@@ -20,9 +20,9 @@
*/
package org.apache.qpid.server.protocol.v0_8;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.framing.AMQDataBlock;
-import org.apache.qpid.transport.ByteBufferSender;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.framing.AMQDataBlock;
+import org.apache.qpid.server.transport.ByteBufferSender;
class CachedFrame extends AMQDataBlock
{
Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java Tue Feb 7 18:38:14 2017
@@ -22,10 +22,10 @@ package org.apache.qpid.server.protocol.
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.qpid.QpidException;
-import org.apache.qpid.common.AMQPFilterTypes;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.FieldTable;
+import org.apache.qpid.server.QpidException;
+import org.apache.qpid.server.common.AMQPFilterTypes;
+import org.apache.qpid.server.framing.AMQShortString;
+import org.apache.qpid.server.framing.FieldTable;
import org.apache.qpid.server.consumer.AbstractConsumerTarget;
import org.apache.qpid.server.flow.FlowCreditManager;
import org.apache.qpid.server.message.InstanceProperties;
Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/IncomingMessage.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/IncomingMessage.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/IncomingMessage.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/IncomingMessage.java Tue Feb 7 18:38:14 2017
@@ -23,10 +23,10 @@ package org.apache.qpid.server.protocol.
import java.util.ArrayList;
import java.util.List;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.ContentBody;
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.MessagePublishInfo;
+import org.apache.qpid.server.framing.AMQShortString;
+import org.apache.qpid.server.framing.ContentBody;
+import org.apache.qpid.server.framing.ContentHeaderBody;
+import org.apache.qpid.server.framing.MessagePublishInfo;
import org.apache.qpid.server.message.MessageDestination;
public class IncomingMessage
Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_Internal_to_v0_8.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_Internal_to_v0_8.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_Internal_to_v0_8.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_Internal_to_v0_8.java Tue Feb 7 18:38:14 2017
@@ -31,12 +31,12 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.BasicContentHeaderProperties;
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.framing.MessagePublishInfo;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.framing.AMQShortString;
+import org.apache.qpid.server.framing.BasicContentHeaderProperties;
+import org.apache.qpid.server.framing.ContentHeaderBody;
+import org.apache.qpid.server.framing.FieldTable;
+import org.apache.qpid.server.framing.MessagePublishInfo;
import org.apache.qpid.server.message.internal.InternalMessage;
import org.apache.qpid.server.message.internal.InternalMessageHeader;
import org.apache.qpid.server.model.NamedAddressSpace;
@@ -44,7 +44,7 @@ import org.apache.qpid.server.plugin.Mes
import org.apache.qpid.server.plugin.PluggableService;
import org.apache.qpid.server.store.StoredMessage;
import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
-import org.apache.qpid.transport.codec.BBEncoder;
+import org.apache.qpid.server.transport.codec.BBEncoder;
@PluggableService
public class MessageConverter_Internal_to_v0_8 implements MessageConverter<InternalMessage, AMQMessage>
Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_v0_8_to_Internal.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_v0_8_to_Internal.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_v0_8_to_Internal.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_v0_8_to_Internal.java Tue Feb 7 18:38:14 2017
@@ -30,18 +30,18 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
import org.apache.qpid.server.message.AMQMessageHeader;
import org.apache.qpid.server.message.internal.InternalMessage;
import org.apache.qpid.server.model.NamedAddressSpace;
import org.apache.qpid.server.plugin.MessageConverter;
import org.apache.qpid.server.plugin.PluggableService;
+import org.apache.qpid.server.transport.codec.BBDecoder;
import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
-import org.apache.qpid.transport.codec.BBDecoder;
-import org.apache.qpid.typedmessage.TypedBytesContentReader;
-import org.apache.qpid.typedmessage.TypedBytesFormatException;
-import org.apache.qpid.url.AMQBindingURL;
-import org.apache.qpid.util.GZIPUtils;
+import org.apache.qpid.server.typedmessage.TypedBytesContentReader;
+import org.apache.qpid.server.typedmessage.TypedBytesFormatException;
+import org.apache.qpid.server.url.AMQBindingURL;
+import org.apache.qpid.server.util.GZIPUtils;
@PluggableService
public class MessageConverter_v0_8_to_Internal implements MessageConverter<AMQMessage, InternalMessage>
Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageFormat_0_9_1.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageFormat_0_9_1.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageFormat_0_9_1.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageFormat_0_9_1.java Tue Feb 7 18:38:14 2017
@@ -24,12 +24,12 @@ import java.nio.BufferUnderflowException
import java.util.ArrayList;
import java.util.List;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.framing.AMQFrameDecodingException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.EncodingUtils;
-import org.apache.qpid.framing.MessagePublishInfo;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.framing.AMQFrameDecodingException;
+import org.apache.qpid.server.framing.AMQShortString;
+import org.apache.qpid.server.framing.ContentHeaderBody;
+import org.apache.qpid.server.framing.EncodingUtils;
+import org.apache.qpid.server.framing.MessagePublishInfo;
import org.apache.qpid.server.plugin.MessageFormat;
import org.apache.qpid.server.store.MessageHandle;
import org.apache.qpid.server.store.MessageStore;
Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaData.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaData.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaData.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaData.java Tue Feb 7 18:38:14 2017
@@ -23,15 +23,15 @@ package org.apache.qpid.server.protocol.
import java.util.Collection;
import java.util.Set;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.framing.AMQFrameDecodingException;
-import org.apache.qpid.framing.AMQProtocolVersionException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.BasicContentHeaderProperties;
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.EncodingUtils;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.framing.MessagePublishInfo;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.framing.AMQFrameDecodingException;
+import org.apache.qpid.server.framing.AMQProtocolVersionException;
+import org.apache.qpid.server.framing.AMQShortString;
+import org.apache.qpid.server.framing.BasicContentHeaderProperties;
+import org.apache.qpid.server.framing.ContentHeaderBody;
+import org.apache.qpid.server.framing.EncodingUtils;
+import org.apache.qpid.server.framing.FieldTable;
+import org.apache.qpid.server.framing.MessagePublishInfo;
import org.apache.qpid.server.message.AMQMessageHeader;
import org.apache.qpid.server.plugin.MessageMetaDataType;
import org.apache.qpid.server.store.StorableMessageMetaData;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org