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 [4/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/framing/FieldArray.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/FieldArray.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/FieldArray.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/FieldArray.java Tue Feb 7 18:38:14 2017
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.framing;
+package org.apache.qpid.server.framing;
import java.math.BigDecimal;
import java.util.AbstractCollection;
@@ -31,7 +31,7 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
public class FieldArray<T> extends AbstractCollection<T>
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/FieldTable.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/FieldTable.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/FieldTable.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/FieldTable.java Tue Feb 7 18:38:14 2017
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.framing;
+package org.apache.qpid.server.framing;
import java.math.BigDecimal;
import java.util.Collection;
@@ -35,8 +35,8 @@ import java.util.Set;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.AMQPInvalidClassException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.AMQPInvalidClassException;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
public class FieldTable
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/FieldTableFactory.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/FieldTableFactory.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/FieldTableFactory.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/FieldTableFactory.java Tue Feb 7 18:38:14 2017
@@ -18,7 +18,7 @@
*
*
*/
-package org.apache.qpid.framing;
+package org.apache.qpid.server.framing;
public class FieldTableFactory
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/FrameCreatingMethodProcessor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/FrameCreatingMethodProcessor.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/FrameCreatingMethodProcessor.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/FrameCreatingMethodProcessor.java Tue Feb 7 18:38:14 2017
@@ -18,12 +18,12 @@
* under the License.
*
*/
-package org.apache.qpid.framing;
+package org.apache.qpid.server.framing;
import java.util.ArrayList;
import java.util.List;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
public class FrameCreatingMethodProcessor implements MethodProcessor<FrameCreatingMethodProcessor.ClientAndServerChannelMethodProcessor>,
ClientMethodProcessor<FrameCreatingMethodProcessor.ClientAndServerChannelMethodProcessor>,
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/HeartbeatBody.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/HeartbeatBody.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/HeartbeatBody.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/HeartbeatBody.java Tue Feb 7 18:38:14 2017
@@ -18,15 +18,15 @@
* under the License.
*
*/
-package org.apache.qpid.framing;
+package org.apache.qpid.server.framing;
import java.io.DataInputStream;
import java.io.IOException;
-import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.protocol.AMQVersionAwareProtocolSession;
-import org.apache.qpid.transport.ByteBufferSender;
+import org.apache.qpid.server.QpidException;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.protocol.AMQVersionAwareProtocolSession;
+import org.apache.qpid.server.transport.ByteBufferSender;
public class HeartbeatBody implements AMQBody
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/MessagePublishInfo.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/MessagePublishInfo.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/MessagePublishInfo.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/MessagePublishInfo.java Tue Feb 7 18:38:14 2017
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.framing;
+package org.apache.qpid.server.framing;
public final class MessagePublishInfo
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/MethodDispatcher.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/MethodDispatcher.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/MethodDispatcher.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/MethodDispatcher.java Tue Feb 7 18:38:14 2017
@@ -27,7 +27,7 @@
* 8-0
*/
-package org.apache.qpid.framing;
+package org.apache.qpid.server.framing;
public interface MethodDispatcher extends
ClientMethodDispatcher, ServerMethodDispatcher
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/MethodProcessor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/MethodProcessor.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/MethodProcessor.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/MethodProcessor.java Tue Feb 7 18:38:14 2017
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.framing;
+package org.apache.qpid.server.framing;
public interface MethodProcessor<T extends ChannelMethodProcessor>
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/MethodRegistry.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/MethodRegistry.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/MethodRegistry.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/MethodRegistry.java Tue Feb 7 18:38:14 2017
@@ -27,7 +27,7 @@
* 8-0
*/
-package org.apache.qpid.framing;
+package org.apache.qpid.server.framing;
import java.util.Map;
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ProtocolInitiation.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ProtocolInitiation.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ProtocolInitiation.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ProtocolInitiation.java Tue Feb 7 18:38:14 2017
@@ -18,15 +18,15 @@
* under the License.
*
*/
-package org.apache.qpid.framing;
+package org.apache.qpid.server.framing;
import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
-import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.transport.ByteBufferSender;
+import org.apache.qpid.server.QpidException;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.transport.ByteBufferSender;
public class ProtocolInitiation extends AMQDataBlock implements EncodableAMQDataBlock
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ProtocolVersion.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ProtocolVersion.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ProtocolVersion.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ProtocolVersion.java Tue Feb 7 18:38:14 2017
@@ -27,7 +27,7 @@
* 8-0
*/
-package org.apache.qpid.framing;
+package org.apache.qpid.server.framing;
import java.util.SortedSet;
import java.util.Collections;
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueBindBody.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueBindBody.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueBindBody.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueBindBody.java Tue Feb 7 18:38:14 2017
@@ -25,10 +25,10 @@
* 8-0
*/
-package org.apache.qpid.framing;
+package org.apache.qpid.server.framing;
-import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.QpidException;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
public class QueueBindBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueBindOkBody.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueBindOkBody.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueBindOkBody.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueBindOkBody.java Tue Feb 7 18:38:14 2017
@@ -25,10 +25,10 @@
* 8-0
*/
-package org.apache.qpid.framing;
+package org.apache.qpid.server.framing;
-import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.QpidException;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
public class QueueBindOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueDeclareBody.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueDeclareBody.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueDeclareBody.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueDeclareBody.java Tue Feb 7 18:38:14 2017
@@ -25,10 +25,10 @@
* 8-0
*/
-package org.apache.qpid.framing;
+package org.apache.qpid.server.framing;
-import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.QpidException;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
public class QueueDeclareBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueDeclareOkBody.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueDeclareOkBody.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueDeclareOkBody.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueDeclareOkBody.java Tue Feb 7 18:38:14 2017
@@ -25,10 +25,10 @@
* 8-0
*/
-package org.apache.qpid.framing;
+package org.apache.qpid.server.framing;
-import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.QpidException;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
public class QueueDeclareOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueDeleteBody.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueDeleteBody.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueDeleteBody.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueDeleteBody.java Tue Feb 7 18:38:14 2017
@@ -25,10 +25,10 @@
* 8-0
*/
-package org.apache.qpid.framing;
+package org.apache.qpid.server.framing;
-import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.QpidException;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
public class QueueDeleteBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueDeleteOkBody.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueDeleteOkBody.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueDeleteOkBody.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueDeleteOkBody.java Tue Feb 7 18:38:14 2017
@@ -25,10 +25,10 @@
* 8-0
*/
-package org.apache.qpid.framing;
+package org.apache.qpid.server.framing;
-import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.QpidException;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
public class QueueDeleteOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueuePurgeBody.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueuePurgeBody.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueuePurgeBody.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueuePurgeBody.java Tue Feb 7 18:38:14 2017
@@ -25,10 +25,10 @@
* 8-0
*/
-package org.apache.qpid.framing;
+package org.apache.qpid.server.framing;
-import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.QpidException;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
public class QueuePurgeBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueuePurgeOkBody.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueuePurgeOkBody.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueuePurgeOkBody.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueuePurgeOkBody.java Tue Feb 7 18:38:14 2017
@@ -25,10 +25,10 @@
* 8-0
*/
-package org.apache.qpid.framing;
+package org.apache.qpid.server.framing;
-import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.QpidException;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
public class QueuePurgeOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueUnbindBody.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueUnbindBody.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueUnbindBody.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueUnbindBody.java Tue Feb 7 18:38:14 2017
@@ -25,10 +25,10 @@
* 0-91
*/
-package org.apache.qpid.framing;
+package org.apache.qpid.server.framing;
-import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.QpidException;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
public class QueueUnbindBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueUnbindOkBody.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueUnbindOkBody.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueUnbindOkBody.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/QueueUnbindOkBody.java Tue Feb 7 18:38:14 2017
@@ -25,10 +25,10 @@
* 0-91
*/
-package org.apache.qpid.framing;
+package org.apache.qpid.server.framing;
-import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.QpidException;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
public class QueueUnbindOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ServerChannelMethodProcessor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ServerChannelMethodProcessor.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ServerChannelMethodProcessor.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ServerChannelMethodProcessor.java Tue Feb 7 18:38:14 2017
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.framing;
+package org.apache.qpid.server.framing;
public interface ServerChannelMethodProcessor extends ChannelMethodProcessor
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ServerMethodDispatcher.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ServerMethodDispatcher.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ServerMethodDispatcher.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ServerMethodDispatcher.java Tue Feb 7 18:38:14 2017
@@ -27,9 +27,9 @@
* 8-0
*/
-package org.apache.qpid.framing;
+package org.apache.qpid.server.framing;
-import org.apache.qpid.QpidException;
+import org.apache.qpid.server.QpidException;
public interface ServerMethodDispatcher
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ServerMethodProcessor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ServerMethodProcessor.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ServerMethodProcessor.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/ServerMethodProcessor.java Tue Feb 7 18:38:14 2017
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.framing;
+package org.apache.qpid.server.framing;
public interface ServerMethodProcessor<T extends ServerChannelMethodProcessor> extends MethodProcessor<T>
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/TxCommitBody.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/TxCommitBody.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/TxCommitBody.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/TxCommitBody.java Tue Feb 7 18:38:14 2017
@@ -25,10 +25,10 @@
* 8-0
*/
-package org.apache.qpid.framing;
+package org.apache.qpid.server.framing;
-import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.QpidException;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
public class TxCommitBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/TxCommitOkBody.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/TxCommitOkBody.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/TxCommitOkBody.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/TxCommitOkBody.java Tue Feb 7 18:38:14 2017
@@ -25,10 +25,10 @@
* 8-0
*/
-package org.apache.qpid.framing;
+package org.apache.qpid.server.framing;
-import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.QpidException;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
public class TxCommitOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/TxRollbackBody.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/TxRollbackBody.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/TxRollbackBody.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/TxRollbackBody.java Tue Feb 7 18:38:14 2017
@@ -25,10 +25,10 @@
* 8-0
*/
-package org.apache.qpid.framing;
+package org.apache.qpid.server.framing;
-import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.QpidException;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
public class TxRollbackBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/TxRollbackOkBody.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/TxRollbackOkBody.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/TxRollbackOkBody.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/TxRollbackOkBody.java Tue Feb 7 18:38:14 2017
@@ -25,10 +25,10 @@
* 8-0
*/
-package org.apache.qpid.framing;
+package org.apache.qpid.server.framing;
-import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.QpidException;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
public class TxRollbackOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/TxSelectBody.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/TxSelectBody.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/TxSelectBody.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/TxSelectBody.java Tue Feb 7 18:38:14 2017
@@ -25,10 +25,10 @@
* 8-0
*/
-package org.apache.qpid.framing;
+package org.apache.qpid.server.framing;
-import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.QpidException;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
public class TxSelectBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/TxSelectOkBody.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/TxSelectOkBody.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/TxSelectOkBody.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/framing/TxSelectOkBody.java Tue Feb 7 18:38:14 2017
@@ -25,10 +25,10 @@
* 8-0
*/
-package org.apache.qpid.framing;
+package org.apache.qpid.server.framing;
-import org.apache.qpid.QpidException;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.QpidException;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
public class TxSelectOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/AbstractServerMessageImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/AbstractServerMessageImpl.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/AbstractServerMessageImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/AbstractServerMessageImpl.java Tue Feb 7 18:38:14 2017
@@ -28,7 +28,7 @@ import java.util.UUID;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
import org.apache.qpid.server.store.StorableMessageMetaData;
import org.apache.qpid.server.store.StoredMessage;
import org.apache.qpid.server.store.TransactionLogResource;
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/MessageContentSource.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/MessageContentSource.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/MessageContentSource.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/MessageContentSource.java Tue Feb 7 18:38:14 2017
@@ -23,7 +23,7 @@ package org.apache.qpid.server.message;
import java.util.Collection;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
public interface MessageContentSource
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessage.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessage.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessage.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessage.java Tue Feb 7 18:38:14 2017
@@ -32,7 +32,7 @@ import java.util.LinkedHashMap;
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.AMQMessageHeader;
import org.apache.qpid.server.message.AbstractServerMessageImpl;
import org.apache.qpid.server.store.MessageHandle;
@@ -40,8 +40,8 @@ import org.apache.qpid.server.store.Mess
import org.apache.qpid.server.store.StoredMessage;
import org.apache.qpid.server.store.TransactionLogResource;
import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
-import org.apache.qpid.util.ByteBufferInputStream;
-import org.apache.qpid.util.ByteBufferUtils;
+import org.apache.qpid.server.util.ByteBufferInputStream;
+import org.apache.qpid.server.util.ByteBufferUtils;
public class InternalMessage extends AbstractServerMessageImpl<InternalMessage, InternalMessageMetaData>
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessageMetaData.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessageMetaData.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessageMetaData.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessageMetaData.java Tue Feb 7 18:38:14 2017
@@ -24,7 +24,7 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.ObjectOutputStream;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
import org.apache.qpid.server.store.StorableMessageMetaData;
import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessageMetaDataType.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessageMetaDataType.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessageMetaDataType.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessageMetaDataType.java Tue Feb 7 18:38:14 2017
@@ -23,7 +23,7 @@ package org.apache.qpid.server.message.i
import java.io.IOException;
import java.io.ObjectInputStream;
-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-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java Tue Feb 7 18:38:14 2017
@@ -90,7 +90,7 @@ import org.apache.qpid.server.store.Conf
import org.apache.qpid.server.store.preferences.UserPreferencesCreator;
import org.apache.qpid.server.util.Action;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
-import org.apache.qpid.util.Strings;
+import org.apache.qpid.server.util.Strings;
public abstract class AbstractConfiguredObject<X extends ConfiguredObject<X>> implements ConfiguredObject<X>
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractContainer.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractContainer.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractContainer.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractContainer.java Tue Feb 7 18:38:14 2017
@@ -45,7 +45,7 @@ import java.util.regex.Pattern;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.configuration.CommonProperties;
+import org.apache.qpid.server.configuration.CommonProperties;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.messages.BrokerMessages;
@@ -54,7 +54,7 @@ import org.apache.qpid.server.plugin.Plu
import org.apache.qpid.server.plugin.QpidServiceLoader;
import org.apache.qpid.server.util.HousekeepingExecutor;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
-import org.apache.qpid.util.SystemUtils;
+import org.apache.qpid.server.util.SystemUtils;
public abstract class AbstractContainer<X extends AbstractContainer<X>> extends AbstractConfiguredObject<X> implements Container<X>
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AncestorAttributeResolver.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AncestorAttributeResolver.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AncestorAttributeResolver.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AncestorAttributeResolver.java Tue Feb 7 18:38:14 2017
@@ -29,7 +29,7 @@ import java.util.Set;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.qpid.util.Strings;
+import org.apache.qpid.server.util.Strings;
public class AncestorAttributeResolver implements Strings.Resolver
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AttributeValueConverter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AttributeValueConverter.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AttributeValueConverter.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AttributeValueConverter.java Tue Feb 7 18:38:14 2017
@@ -56,7 +56,7 @@ import com.google.common.base.Defaults;
import org.apache.qpid.server.model.preferences.GenericPrincipal;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
-import org.apache.qpid.util.Strings;
+import org.apache.qpid.server.util.Strings;
abstract class AttributeValueConverter<T>
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java Tue Feb 7 18:38:14 2017
@@ -28,7 +28,7 @@ import java.util.Set;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
-import org.apache.qpid.configuration.CommonProperties;
+import org.apache.qpid.server.configuration.CommonProperties;
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.EventLoggerProvider;
import org.apache.qpid.server.security.auth.SocketConnectionMetaData;
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java Tue Feb 7 18:38:14 2017
@@ -50,8 +50,8 @@ import com.google.common.util.concurrent
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.configuration.CommonProperties;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.configuration.CommonProperties;
import org.apache.qpid.server.BrokerPrincipal;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.configuration.updater.TaskExecutor;
@@ -87,7 +87,7 @@ import org.apache.qpid.server.store.pref
import org.apache.qpid.server.util.HousekeepingExecutor;
import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
import org.apache.qpid.server.virtualhost.VirtualHostPropertiesNodeCreator;
-import org.apache.qpid.util.SystemUtils;
+import org.apache.qpid.server.util.SystemUtils;
@ManagedObject( category = false, type = "Broker" )
public class BrokerImpl extends AbstractContainer<BrokerImpl> implements Broker<BrokerImpl>
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFinder.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFinder.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFinder.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFinder.java Tue Feb 7 18:38:14 2017
@@ -38,7 +38,7 @@ import java.util.Set;
import java.util.regex.Pattern;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
-import org.apache.qpid.util.Strings;
+import org.apache.qpid.server.util.Strings;
public class ConfiguredObjectFinder
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java Tue Feb 7 18:38:14 2017
@@ -54,7 +54,7 @@ import org.apache.qpid.server.plugin.Con
import org.apache.qpid.server.plugin.ConfiguredObjectTypeFactory;
import org.apache.qpid.server.util.Action;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
-import org.apache.qpid.util.Strings;
+import org.apache.qpid.server.util.Strings;
public class ConfiguredObjectTypeRegistry
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/OwnAttributeResolver.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/OwnAttributeResolver.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/OwnAttributeResolver.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/OwnAttributeResolver.java Tue Feb 7 18:38:14 2017
@@ -29,7 +29,7 @@ import java.util.Set;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.qpid.util.Strings;
+import org.apache.qpid.server.util.Strings;
public class OwnAttributeResolver implements Strings.Resolver
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Port.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Port.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Port.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Port.java Tue Feb 7 18:38:14 2017
@@ -26,7 +26,7 @@ import java.util.Set;
import com.google.common.util.concurrent.ListenableFuture;
-import org.apache.qpid.configuration.CommonProperties;
+import org.apache.qpid.server.configuration.CommonProperties;
@ManagedContextDependency({CommonProperties.QPID_SECURITY_TLS_PROTOCOL_WHITE_LIST, CommonProperties.QPID_SECURITY_TLS_CIPHER_SUITE_BLACK_LIST})
@ManagedObject( description = Port.CLASS_DESCRIPTION, amqpName = "org.apache.qpid.Port")
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java Tue Feb 7 18:38:14 2017
@@ -32,7 +32,7 @@ import com.google.common.util.concurrent
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.configuration.CommonProperties;
+import org.apache.qpid.server.configuration.CommonProperties;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.messages.PortMessages;
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java Tue Feb 7 18:38:14 2017
@@ -75,8 +75,8 @@ import org.apache.qpid.server.transport.
import org.apache.qpid.server.transport.TransportProvider;
import org.apache.qpid.server.util.PortUtil;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
-import org.apache.qpid.transport.network.security.ssl.QpidMultipleTrustManager;
-import org.apache.qpid.transport.network.security.ssl.SSLUtil;
+import org.apache.qpid.server.transport.network.security.ssl.QpidMultipleTrustManager;
+import org.apache.qpid.server.transport.network.security.ssl.SSLUtil;
public class AmqpPortImpl extends AbstractClientAuthCapablePortWithAuthProvider<AmqpPortImpl> implements AmqpPort<AmqpPortImpl>
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/plugin/MessageFormat.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/plugin/MessageFormat.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/plugin/MessageFormat.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/plugin/MessageFormat.java Tue Feb 7 18:38:14 2017
@@ -22,7 +22,7 @@ package org.apache.qpid.server.plugin;
import java.util.List;
-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.store.MessageStore;
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/plugin/MessageMetaDataType.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/plugin/MessageMetaDataType.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/plugin/MessageMetaDataType.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/plugin/MessageMetaDataType.java Tue Feb 7 18:38:14 2017
@@ -20,7 +20,7 @@
*/
package org.apache.qpid.server.plugin;
-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.store.StorableMessageMetaData;
import org.apache.qpid.server.store.StoredMessage;
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/pool/SuppressingInheritedAccessControlContextThreadFactory.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/pool/SuppressingInheritedAccessControlContextThreadFactory.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/pool/SuppressingInheritedAccessControlContextThreadFactory.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/pool/SuppressingInheritedAccessControlContextThreadFactory.java Tue Feb 7 18:38:14 2017
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.pool;
+package org.apache.qpid.server.pool;
import javax.security.auth.Subject;
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/properties/ConnectionStartProperties.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/properties/ConnectionStartProperties.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/properties/ConnectionStartProperties.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/properties/ConnectionStartProperties.java Tue Feb 7 18:38:14 2017
@@ -18,12 +18,12 @@
*
*
*/
-package org.apache.qpid.properties;
+package org.apache.qpid.server.properties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.util.SystemUtils;
+import org.apache.qpid.server.util.SystemUtils;
/**
* Constants for the various properties clients can
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQMethodEvent.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/protocol/AMQMethodEvent.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQMethodEvent.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQMethodEvent.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/protocol/AMQMethodEvent.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/protocol/AMQMethodEvent.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQMethodEvent.java Tue Feb 7 18:38:14 2017
@@ -18,9 +18,9 @@
* under the License.
*
*/
-package org.apache.qpid.protocol;
+package org.apache.qpid.server.protocol;
-import org.apache.qpid.framing.AMQMethodBody;
+import org.apache.qpid.server.framing.AMQMethodBody;
/**
* AMQMethodEvent encapsulates an AMQP method call, and the channel on which that method call occurred.
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQMethodListener.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/protocol/AMQMethodListener.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQMethodListener.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQMethodListener.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/protocol/AMQMethodListener.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/protocol/AMQMethodListener.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQMethodListener.java Tue Feb 7 18:38:14 2017
@@ -18,10 +18,10 @@
* under the License.
*
*/
-package org.apache.qpid.protocol;
+package org.apache.qpid.server.protocol;
-import org.apache.qpid.QpidException;
-import org.apache.qpid.framing.AMQMethodBody;
+import org.apache.qpid.server.QpidException;
+import org.apache.qpid.server.framing.AMQMethodBody;
/**
* AMQMethodListener is a listener that receives notifications of AMQP methods. The methods are packaged as events in
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQProtocolWriter.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/protocol/AMQProtocolWriter.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQProtocolWriter.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQProtocolWriter.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/protocol/AMQProtocolWriter.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/protocol/AMQProtocolWriter.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQProtocolWriter.java Tue Feb 7 18:38:14 2017
@@ -18,9 +18,9 @@
* under the License.
*
*/
-package org.apache.qpid.protocol;
+package org.apache.qpid.server.protocol;
-import org.apache.qpid.framing.AMQDataBlock;
+import org.apache.qpid.server.framing.AMQDataBlock;
/**
* AMQProtocolWriter provides a method to write a frame of data 'to the wire', in the context of the object
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQVersionAwareProtocolSession.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/protocol/AMQVersionAwareProtocolSession.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQVersionAwareProtocolSession.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQVersionAwareProtocolSession.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/protocol/AMQVersionAwareProtocolSession.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/protocol/AMQVersionAwareProtocolSession.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQVersionAwareProtocolSession.java Tue Feb 7 18:38:14 2017
@@ -18,15 +18,15 @@
* under the License.
*
*/
-package org.apache.qpid.protocol;
+package org.apache.qpid.server.protocol;
-import org.apache.qpid.QpidException;
-import org.apache.qpid.framing.AMQMethodBody;
-import org.apache.qpid.framing.ContentBody;
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.HeartbeatBody;
-import org.apache.qpid.framing.MethodRegistry;
-import org.apache.qpid.transport.ByteBufferSender;
+import org.apache.qpid.server.QpidException;
+import org.apache.qpid.server.framing.AMQMethodBody;
+import org.apache.qpid.server.framing.ContentBody;
+import org.apache.qpid.server.framing.ContentHeaderBody;
+import org.apache.qpid.server.framing.HeartbeatBody;
+import org.apache.qpid.server.framing.MethodRegistry;
+import org.apache.qpid.server.transport.ByteBufferSender;
/**
@@ -37,7 +37,7 @@ import org.apache.qpid.transport.ByteBuf
* interface and one of them eliminated? Move getRegistry method to ProtocolVersionAware, make the sessions
* implement AMQProtocolWriter directly and drop this interface.
*/
-public interface AMQVersionAwareProtocolSession extends AMQProtocolWriter, ProtocolVersionAware
+public interface AMQVersionAwareProtocolSession extends org.apache.qpid.server.protocol.AMQProtocolWriter, ProtocolVersionAware
{
/**
* Gets the method registry for a specific version of the AMQP.
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/ConnectionClosingTicker.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/ConnectionClosingTicker.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/ConnectionClosingTicker.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/ConnectionClosingTicker.java Tue Feb 7 18:38:14 2017
@@ -21,7 +21,7 @@
package org.apache.qpid.server.protocol;
import org.apache.qpid.server.transport.ServerNetworkConnection;
-import org.apache.qpid.transport.network.Ticker;
+import org.apache.qpid.server.transport.network.Ticker;
public class ConnectionClosingTicker implements Ticker
{
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/ErrorCodes.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/protocol/ErrorCodes.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/ErrorCodes.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/ErrorCodes.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/protocol/ErrorCodes.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/protocol/ErrorCodes.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/ErrorCodes.java Tue Feb 7 18:38:14 2017
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.protocol;
+package org.apache.qpid.server.protocol;
/**
* Defines constants for AMQP codes
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/MessageFormatRegistry.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/MessageFormatRegistry.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/MessageFormatRegistry.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/MessageFormatRegistry.java Tue Feb 7 18:38:14 2017
@@ -25,7 +25,7 @@ import java.util.HashMap;
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.plugin.MessageFormat;
import org.apache.qpid.server.plugin.QpidServiceLoader;
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/ProtocolVersionAware.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/protocol/ProtocolVersionAware.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/ProtocolVersionAware.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/ProtocolVersionAware.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/protocol/ProtocolVersionAware.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/protocol/ProtocolVersionAware.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/protocol/ProtocolVersionAware.java Tue Feb 7 18:38:14 2017
@@ -18,9 +18,9 @@
* under the License.
*
*/
-package org.apache.qpid.protocol;
+package org.apache.qpid.server.protocol;
-import org.apache.qpid.framing.ProtocolVersion;
+import org.apache.qpid.server.framing.ProtocolVersion;
/**
* ProtocolVersionAware is implemented by all AMQP handling classes, that need to provide an awareness to callers of
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java Tue Feb 7 18:38:14 2017
@@ -19,7 +19,7 @@
package org.apache.qpid.server.queue;
import static org.apache.qpid.server.util.ParameterizedTypes.MAP_OF_STRING_STRING;
-import static org.apache.qpid.util.GZIPUtils.GZIP_CONTENT_ENCODING;
+import static org.apache.qpid.server.util.GZIPUtils.GZIP_CONTENT_ENCODING;
import java.io.IOException;
import java.io.InputStream;
@@ -65,10 +65,10 @@ import com.google.common.util.concurrent
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.bytebuffer.QpidByteBufferInputStream;
-import org.apache.qpid.filter.SelectorParsingException;
-import org.apache.qpid.filter.selector.ParseException;
-import org.apache.qpid.filter.selector.TokenMgrError;
+import org.apache.qpid.server.bytebuffer.QpidByteBufferInputStream;
+import org.apache.qpid.server.filter.SelectorParsingException;
+import org.apache.qpid.server.filter.selector.ParseException;
+import org.apache.qpid.server.filter.selector.TokenMgrError;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.configuration.updater.Task;
import org.apache.qpid.server.connection.SessionPrincipal;
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java Tue Feb 7 18:38:14 2017
@@ -37,7 +37,7 @@ import com.google.common.util.concurrent
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.filter.SelectorParsingException;
+import org.apache.qpid.server.filter.SelectorParsingException;
import org.apache.qpid.server.consumer.ConsumerOption;
import org.apache.qpid.server.consumer.ConsumerTarget;
import org.apache.qpid.server.filter.FilterManager;
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/SuspendedConsumerLoggingTicker.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/SuspendedConsumerLoggingTicker.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/SuspendedConsumerLoggingTicker.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/SuspendedConsumerLoggingTicker.java Tue Feb 7 18:38:14 2017
@@ -20,7 +20,7 @@
*/
package org.apache.qpid.server.queue;
-import org.apache.qpid.transport.network.Ticker;
+import org.apache.qpid.server.transport.network.Ticker;
abstract public class SuspendedConsumerLoggingTicker implements Ticker
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java Tue Feb 7 18:38:14 2017
@@ -74,8 +74,8 @@ import org.apache.qpid.server.model.Port
import org.apache.qpid.server.model.RestContentHeader;
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.StateTransition;
-import org.apache.qpid.transport.network.security.ssl.SSLUtil;
-import org.apache.qpid.util.Strings;
+import org.apache.qpid.server.transport.network.security.ssl.SSLUtil;
+import org.apache.qpid.server.util.Strings;
public class AutoGeneratedSelfSignedKeyStoreImpl
extends AbstractConfiguredObject<AutoGeneratedSelfSignedKeyStoreImpl>
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java Tue Feb 7 18:38:14 2017
@@ -52,8 +52,8 @@ import org.apache.qpid.server.model.Stat
import org.apache.qpid.server.model.StateTransition;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
import org.apache.qpid.server.util.urlstreamhandler.data.Handler;
-import org.apache.qpid.transport.network.security.ssl.QpidClientX509KeyManager;
-import org.apache.qpid.transport.network.security.ssl.SSLUtil;
+import org.apache.qpid.server.transport.network.security.ssl.QpidClientX509KeyManager;
+import org.apache.qpid.server.transport.network.security.ssl.SSLUtil;
@ManagedObject( category = false )
public class FileKeyStoreImpl extends AbstractKeyStore<FileKeyStoreImpl> implements FileKeyStore<FileKeyStoreImpl>
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java Tue Feb 7 18:38:14 2017
@@ -60,9 +60,9 @@ import org.apache.qpid.server.model.Trus
import org.apache.qpid.server.model.VirtualHostNode;
import org.apache.qpid.server.security.auth.manager.SimpleLDAPAuthenticationManager;
import org.apache.qpid.server.util.urlstreamhandler.data.Handler;
-import org.apache.qpid.transport.network.security.ssl.QpidMultipleTrustManager;
-import org.apache.qpid.transport.network.security.ssl.QpidPeersOnlyTrustManager;
-import org.apache.qpid.transport.network.security.ssl.SSLUtil;
+import org.apache.qpid.server.transport.network.security.ssl.QpidMultipleTrustManager;
+import org.apache.qpid.server.transport.network.security.ssl.QpidPeersOnlyTrustManager;
+import org.apache.qpid.server.transport.network.security.ssl.SSLUtil;
public class FileTrustStoreImpl extends AbstractConfiguredObject<FileTrustStoreImpl> implements FileTrustStore<FileTrustStoreImpl>
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/ManagedPeerCertificateTrustStoreImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/ManagedPeerCertificateTrustStoreImpl.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/ManagedPeerCertificateTrustStoreImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/ManagedPeerCertificateTrustStoreImpl.java Tue Feb 7 18:38:14 2017
@@ -65,8 +65,8 @@ import org.apache.qpid.server.model.Stat
import org.apache.qpid.server.model.TrustStore;
import org.apache.qpid.server.model.VirtualHostNode;
import org.apache.qpid.server.security.auth.manager.SimpleLDAPAuthenticationManager;
-import org.apache.qpid.transport.network.security.ssl.QpidMultipleTrustManager;
-import org.apache.qpid.transport.network.security.ssl.QpidPeersOnlyTrustManager;
+import org.apache.qpid.server.transport.network.security.ssl.QpidMultipleTrustManager;
+import org.apache.qpid.server.transport.network.security.ssl.QpidPeersOnlyTrustManager;
@ManagedObject( category = false )
public class ManagedPeerCertificateTrustStoreImpl
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java Tue Feb 7 18:38:14 2017
@@ -58,7 +58,7 @@ import org.apache.qpid.server.model.Mana
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.StateTransition;
import org.apache.qpid.server.util.urlstreamhandler.data.Handler;
-import org.apache.qpid.transport.network.security.ssl.SSLUtil;
+import org.apache.qpid.server.transport.network.security.ssl.SSLUtil;
@ManagedObject( category = false )
public class NonJavaKeyStoreImpl extends AbstractKeyStore<NonJavaKeyStoreImpl> implements NonJavaKeyStore<NonJavaKeyStoreImpl>
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaTrustStoreImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaTrustStoreImpl.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaTrustStoreImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaTrustStoreImpl.java Tue Feb 7 18:38:14 2017
@@ -64,7 +64,7 @@ import org.apache.qpid.server.model.Trus
import org.apache.qpid.server.model.VirtualHostNode;
import org.apache.qpid.server.security.auth.manager.SimpleLDAPAuthenticationManager;
import org.apache.qpid.server.util.urlstreamhandler.data.Handler;
-import org.apache.qpid.transport.network.security.ssl.SSLUtil;
+import org.apache.qpid.server.transport.network.security.ssl.SSLUtil;
@ManagedObject( category = false )
public class NonJavaTrustStoreImpl
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/SiteSpecificTrustStoreImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/SiteSpecificTrustStoreImpl.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/SiteSpecificTrustStoreImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/SiteSpecificTrustStoreImpl.java Tue Feb 7 18:38:14 2017
@@ -73,9 +73,9 @@ import org.apache.qpid.server.model.Stat
import org.apache.qpid.server.model.TrustStore;
import org.apache.qpid.server.model.VirtualHostNode;
import org.apache.qpid.server.security.auth.manager.SimpleLDAPAuthenticationManager;
-import org.apache.qpid.transport.network.security.ssl.SSLUtil;
-import org.apache.qpid.transport.util.Functions;
-import org.apache.qpid.util.Strings;
+import org.apache.qpid.server.transport.network.security.ssl.SSLUtil;
+import org.apache.qpid.server.transport.util.Functions;
+import org.apache.qpid.server.util.Strings;
@ManagedObject( category = false )
public class SiteSpecificTrustStoreImpl
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/HashedUser.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/HashedUser.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/HashedUser.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/HashedUser.java Tue Feb 7 18:38:14 2017
@@ -29,7 +29,7 @@ import javax.xml.bind.DatatypeConverter;
import org.apache.qpid.server.model.AuthenticationProvider;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
-import org.apache.qpid.util.Strings;
+import org.apache.qpid.server.util.Strings;
public class HashedUser implements PasswordPrincipal
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractScramAuthenticationManager.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractScramAuthenticationManager.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractScramAuthenticationManager.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractScramAuthenticationManager.java Tue Feb 7 18:38:14 2017
@@ -50,7 +50,7 @@ import org.apache.qpid.server.security.a
import org.apache.qpid.server.security.auth.sasl.plain.PlainNegotiator;
import org.apache.qpid.server.security.auth.sasl.scram.ScramNegotiator;
import org.apache.qpid.server.security.auth.sasl.scram.ScramSaslServerSource;
-import org.apache.qpid.util.Strings;
+import org.apache.qpid.server.util.Strings;
public abstract class AbstractScramAuthenticationManager<X extends AbstractScramAuthenticationManager<X>>
extends ConfigModelPasswordManagingAuthenticationProvider<X>
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerImpl.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerImpl.java Tue Feb 7 18:38:14 2017
@@ -52,7 +52,7 @@ import com.google.common.util.concurrent
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.configuration.CommonProperties;
+import org.apache.qpid.server.configuration.CommonProperties;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.Container;
@@ -71,7 +71,7 @@ import org.apache.qpid.server.security.g
import org.apache.qpid.server.util.CipherSuiteAndProtocolRestrictingSSLSocketFactory;
import org.apache.qpid.server.util.ParameterizedTypes;
import org.apache.qpid.server.util.StringUtil;
-import org.apache.qpid.transport.network.security.ssl.SSLUtil;
+import org.apache.qpid.server.transport.network.security.ssl.SSLUtil;
public class SimpleLDAPAuthenticationManagerImpl extends AbstractAuthenticationManager<SimpleLDAPAuthenticationManagerImpl>
implements SimpleLDAPAuthenticationManager<SimpleLDAPAuthenticationManagerImpl>
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/oauth2/OAuth2AuthenticationProviderImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/oauth2/OAuth2AuthenticationProviderImpl.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/oauth2/OAuth2AuthenticationProviderImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/oauth2/OAuth2AuthenticationProviderImpl.java Tue Feb 7 18:38:14 2017
@@ -43,7 +43,7 @@ import com.fasterxml.jackson.databind.Ob
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.configuration.CommonProperties;
+import org.apache.qpid.server.configuration.CommonProperties;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.Container;
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CramMd5Base64HashedNegotiator.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CramMd5Base64HashedNegotiator.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CramMd5Base64HashedNegotiator.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CramMd5Base64HashedNegotiator.java Tue Feb 7 18:38:14 2017
@@ -22,7 +22,7 @@ package org.apache.qpid.server.security.
import org.apache.qpid.server.model.PasswordCredentialManagingAuthenticationProvider;
import org.apache.qpid.server.security.auth.sasl.PasswordSource;
-import org.apache.qpid.util.Strings;
+import org.apache.qpid.server.util.Strings;
public class CramMd5Base64HashedNegotiator extends AbstractCramMd5Negotiator
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CramMd5Base64HexNegotiator.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CramMd5Base64HexNegotiator.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CramMd5Base64HexNegotiator.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CramMd5Base64HexNegotiator.java Tue Feb 7 18:38:14 2017
@@ -22,7 +22,7 @@ package org.apache.qpid.server.security.
import org.apache.qpid.server.model.PasswordCredentialManagingAuthenticationProvider;
import org.apache.qpid.server.security.auth.sasl.PasswordSource;
-import org.apache.qpid.util.Strings;
+import org.apache.qpid.server.util.Strings;
public class CramMd5Base64HexNegotiator extends AbstractCramMd5Negotiator
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/external/ExternalNegotiator.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/external/ExternalNegotiator.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/external/ExternalNegotiator.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/external/ExternalNegotiator.java Tue Feb 7 18:38:14 2017
@@ -32,7 +32,7 @@ import org.apache.qpid.server.security.a
import org.apache.qpid.server.security.auth.manager.ExternalAuthenticationManager;
import org.apache.qpid.server.security.auth.manager.ExternalAuthenticationManagerImpl;
import org.apache.qpid.server.security.auth.sasl.SaslNegotiator;
-import org.apache.qpid.transport.network.security.ssl.SSLUtil;
+import org.apache.qpid.server.transport.network.security.ssl.SSLUtil;
public class ExternalNegotiator implements SaslNegotiator
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/scram/ScramSaslServer.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/scram/ScramSaslServer.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/scram/ScramSaslServer.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/scram/ScramSaslServer.java Tue Feb 7 18:38:14 2017
@@ -34,7 +34,7 @@ import javax.security.sasl.SaslException
import javax.security.sasl.SaslServer;
import javax.xml.bind.DatatypeConverter;
-import org.apache.qpid.util.Strings;
+import org.apache.qpid.server.util.Strings;
class ScramSaslServer implements SaslServer
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypter.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypter.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypter.java Tue Feb 7 18:38:14 2017
@@ -36,7 +36,7 @@ import javax.crypto.SecretKey;
import javax.crypto.spec.IvParameterSpec;
import javax.xml.bind.DatatypeConverter;
-import org.apache.qpid.util.Strings;
+import org.apache.qpid.server.util.Strings;
class AESKeyFileEncrypter implements ConfigurationSecretEncrypter
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/group/cloudfoundry/CloudFoundryDashboardManagementGroupProviderImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/group/cloudfoundry/CloudFoundryDashboardManagementGroupProviderImpl.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/group/cloudfoundry/CloudFoundryDashboardManagementGroupProviderImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/group/cloudfoundry/CloudFoundryDashboardManagementGroupProviderImpl.java Tue Feb 7 18:38:14 2017
@@ -20,10 +20,10 @@
*/
package org.apache.qpid.server.security.group.cloudfoundry;
-import static org.apache.qpid.configuration.CommonProperties.QPID_SECURITY_TLS_CIPHER_SUITE_BLACK_LIST;
-import static org.apache.qpid.configuration.CommonProperties.QPID_SECURITY_TLS_CIPHER_SUITE_WHITE_LIST;
-import static org.apache.qpid.configuration.CommonProperties.QPID_SECURITY_TLS_PROTOCOL_BLACK_LIST;
-import static org.apache.qpid.configuration.CommonProperties.QPID_SECURITY_TLS_PROTOCOL_WHITE_LIST;
+import static org.apache.qpid.server.configuration.CommonProperties.QPID_SECURITY_TLS_CIPHER_SUITE_BLACK_LIST;
+import static org.apache.qpid.server.configuration.CommonProperties.QPID_SECURITY_TLS_CIPHER_SUITE_WHITE_LIST;
+import static org.apache.qpid.server.configuration.CommonProperties.QPID_SECURITY_TLS_PROTOCOL_BLACK_LIST;
+import static org.apache.qpid.server.configuration.CommonProperties.QPID_SECURITY_TLS_PROTOCOL_WHITE_LIST;
import static org.apache.qpid.server.util.ParameterizedTypes.LIST_OF_STRINGS;
import java.io.IOException;
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/session/AMQPSession.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/session/AMQPSession.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/session/AMQPSession.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/session/AMQPSession.java Tue Feb 7 18:38:14 2017
@@ -31,7 +31,7 @@ import org.apache.qpid.server.model.Queu
import org.apache.qpid.server.model.Session;
import org.apache.qpid.server.transport.AMQPConnection;
import org.apache.qpid.server.util.Deletable;
-import org.apache.qpid.transport.network.Ticker;
+import org.apache.qpid.server.transport.network.Ticker;
public interface AMQPSession<S extends org.apache.qpid.server.session.AMQPSession<S, X>,
X extends ConsumerTarget<X>> extends Session<S>,
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/session/AbstractAMQPSession.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/session/AbstractAMQPSession.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/session/AbstractAMQPSession.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/session/AbstractAMQPSession.java Tue Feb 7 18:38:14 2017
@@ -60,7 +60,7 @@ import org.apache.qpid.server.transport.
import org.apache.qpid.server.transport.TransactionTimeoutTicker;
import org.apache.qpid.server.util.Action;
import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
-import org.apache.qpid.transport.network.Ticker;
+import org.apache.qpid.server.transport.network.Ticker;
public abstract class AbstractAMQPSession<S extends AbstractAMQPSession<S, X>,
X extends ConsumerTarget<X>>
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/ssl/SSLContextFactory.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/ssl/SSLContextFactory.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/ssl/SSLContextFactory.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/ssl/SSLContextFactory.java Tue Feb 7 18:38:14 2017
@@ -18,10 +18,10 @@
* under the License.
*
*/
-package org.apache.qpid.ssl;
+package org.apache.qpid.server.ssl;
-import org.apache.qpid.transport.network.security.ssl.QpidClientX509KeyManager;
-import org.apache.qpid.transport.network.security.ssl.SSLUtil;
+import org.apache.qpid.server.transport.network.security.ssl.QpidClientX509KeyManager;
+import org.apache.qpid.server.transport.network.security.ssl.SSLUtil;
import javax.net.ssl.KeyManager;
import javax.net.ssl.KeyManagerFactory;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org