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 [2/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/bdbstore/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/pom.xml?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/pom.xml (original)
+++ qpid/java/trunk/bdbstore/pom.xml Tue Feb  7 18:38:14 2017
@@ -89,7 +89,7 @@
     <dependency>
       <groupId>org.apache.qpid</groupId>
       <artifactId>qpid-client</artifactId>
-      <version>${project.version}</version>
+      <version>${qpid-jms-client-ampq-0-x-version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncoding.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncoding.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncoding.java (original)
+++ qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncoding.java Tue Feb  7 18:38:14 2017
@@ -23,7 +23,7 @@ package org.apache.qpid.server.store.ber
 import com.sleepycat.bind.tuple.TupleInput;
 import com.sleepycat.bind.tuple.TupleOutput;
 
-import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.server.framing.AMQShortString;
 
 public class AMQShortStringEncoding
 {

Modified: qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java (original)
+++ qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java Tue Feb  7 18:38:14 2017
@@ -45,7 +45,7 @@ import com.sleepycat.je.SequenceConfig;
 import com.sleepycat.je.Transaction;
 import org.slf4j.Logger;
 
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
 import org.apache.qpid.server.message.EnqueueableMessage;
 import org.apache.qpid.server.model.ConfiguredObject;
 import org.apache.qpid.server.store.Event;

Modified: qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackup.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackup.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackup.java (original)
+++ qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackup.java Tue Feb  7 18:38:14 2017
@@ -39,8 +39,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.store.StoreException;
-import org.apache.qpid.util.CommandLineParser;
-import org.apache.qpid.util.FileUtils;
+import org.apache.qpid.server.util.CommandLineParser;
+import org.apache.qpid.server.util.FileUtils;
 
 /**
  * BDBBackup is a utility for taking hot backups of the current state of a BDB transaction log database.

Modified: qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java (original)
+++ qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java Tue Feb  7 18:38:14 2017
@@ -61,7 +61,7 @@ import org.apache.qpid.server.store.hand
 import org.apache.qpid.server.store.preferences.PreferenceRecord;
 import org.apache.qpid.server.store.preferences.PreferenceStore;
 import org.apache.qpid.server.store.preferences.PreferenceStoreUpdater;
-import org.apache.qpid.util.FileUtils;
+import org.apache.qpid.server.util.FileUtils;
 
 /**
  * Implementation of a DurableConfigurationStore backed by BDB JE

Modified: qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java (original)
+++ qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java Tue Feb  7 18:38:14 2017
@@ -30,7 +30,7 @@ import org.apache.qpid.server.model.Conf
 import org.apache.qpid.server.store.FileBasedSettings;
 import org.apache.qpid.server.store.SizeMonitoringSettings;
 import org.apache.qpid.server.store.StoreException;
-import org.apache.qpid.util.FileUtils;
+import org.apache.qpid.server.util.FileUtils;
 
 /**
  * Implementation of a MessageStore backed by BDB JE.

Modified: qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBPreferenceStore.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBPreferenceStore.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBPreferenceStore.java (original)
+++ qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBPreferenceStore.java Tue Feb  7 18:38:14 2017
@@ -31,7 +31,7 @@ import org.apache.qpid.server.model.Conf
 import org.apache.qpid.server.store.StoreException;
 import org.apache.qpid.server.store.preferences.PreferenceRecord;
 import org.apache.qpid.server.store.preferences.PreferenceStoreUpdater;
-import org.apache.qpid.util.FileUtils;
+import org.apache.qpid.server.util.FileUtils;
 
 public class BDBPreferenceStore extends AbstractBDBPreferenceStore
 {

Modified: qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/FieldTableEncoding.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/FieldTableEncoding.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/FieldTableEncoding.java (original)
+++ qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/FieldTableEncoding.java Tue Feb  7 18:38:14 2017
@@ -24,8 +24,8 @@ import com.sleepycat.bind.tuple.TupleInp
 import com.sleepycat.bind.tuple.TupleOutput;
 import com.sleepycat.je.DatabaseException;
 
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.framing.FieldTable;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.framing.FieldTable;
 import org.apache.qpid.server.store.berkeleydb.tuple.ByteBufferBinding;
 
 import java.nio.ByteBuffer;

Modified: qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/ByteBufferBinding.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/ByteBufferBinding.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/ByteBufferBinding.java (original)
+++ qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/ByteBufferBinding.java Tue Feb  7 18:38:14 2017
@@ -26,7 +26,7 @@ import com.sleepycat.bind.tuple.TupleBin
 import com.sleepycat.bind.tuple.TupleInput;
 import com.sleepycat.bind.tuple.TupleOutput;
 
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
 
 public class ByteBufferBinding extends TupleBinding<QpidByteBuffer>
 {

Modified: qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/MessageMetaDataBinding.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/MessageMetaDataBinding.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/MessageMetaDataBinding.java (original)
+++ qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/MessageMetaDataBinding.java Tue Feb  7 18:38:14 2017
@@ -26,7 +26,7 @@ import com.sleepycat.je.DatabaseEntry;
 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.plugin.MessageMetaDataType;
 import org.apache.qpid.server.store.MessageMetaDataTypeRegistry;
 import org.apache.qpid.server.store.StorableMessageMetaData;

Modified: qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java (original)
+++ qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java Tue Feb  7 18:38:14 2017
@@ -40,15 +40,15 @@ import com.sleepycat.je.Transaction;
 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.framing.AMQFrameDecodingException;
-import org.apache.qpid.framing.AMQProtocolVersionException;
-import org.apache.qpid.framing.AMQShortString;
-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.common.AMQPFilterTypes;
+import org.apache.qpid.server.exchange.ExchangeDefaults;
+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.ContentHeaderBody;
+import org.apache.qpid.server.framing.FieldTable;
+import org.apache.qpid.server.framing.MessagePublishInfo;
 import org.apache.qpid.server.model.ConfiguredObject;
 import org.apache.qpid.server.protocol.v0_8.MessageMetaData;
 import org.apache.qpid.server.store.StorableMessageMetaData;

Modified: qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java (original)
+++ qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java Tue Feb  7 18:38:14 2017
@@ -51,9 +51,9 @@ import com.sleepycat.je.Transaction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.qpid.exchange.ExchangeDefaults;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.FieldTable;
+import org.apache.qpid.server.exchange.ExchangeDefaults;
+import org.apache.qpid.server.framing.AMQShortString;
+import org.apache.qpid.server.framing.FieldTable;
 import org.apache.qpid.server.model.Binding;
 import org.apache.qpid.server.model.ConfiguredObject;
 import org.apache.qpid.server.model.Exchange;

Modified: qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncodingTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncodingTest.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncodingTest.java (original)
+++ qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncodingTest.java Tue Feb  7 18:38:14 2017
@@ -21,7 +21,7 @@ package org.apache.qpid.server.store.ber
 import com.sleepycat.bind.tuple.TupleInput;
 import com.sleepycat.bind.tuple.TupleOutput;
 
-import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.server.framing.AMQShortString;
 import org.apache.qpid.test.utils.QpidTestCase;
 
 /**

Modified: qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java (original)
+++ qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java Tue Feb  7 18:38:14 2017
@@ -64,7 +64,7 @@ import org.apache.qpid.server.virtualhos
 import org.apache.qpid.test.utils.PortHelper;
 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 BDBHAVirtualHostNodeTest extends QpidTestCase
 {

Modified: qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java (original)
+++ qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java Tue Feb  7 18:38:14 2017
@@ -28,11 +28,11 @@ import java.nio.ByteBuffer;
 import java.util.Arrays;
 import java.util.Collections;
 
-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.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.MessagePublishInfo;
 import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.server.protocol.v0_10.MessageMetaDataType_0_10;
 import org.apache.qpid.server.protocol.v0_10.MessageMetaData_0_10;
@@ -45,15 +45,15 @@ import org.apache.qpid.server.store.Stor
 import org.apache.qpid.server.store.StoreException;
 import org.apache.qpid.server.store.StoredMessage;
 import org.apache.qpid.server.virtualhost.berkeleydb.BDBVirtualHost;
-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.MessageDeliveryMode;
-import org.apache.qpid.transport.MessageDeliveryPriority;
-import org.apache.qpid.transport.MessageProperties;
-import org.apache.qpid.transport.MessageTransfer;
-import org.apache.qpid.util.FileUtils;
+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.MessageDeliveryMode;
+import org.apache.qpid.server.transport.MessageDeliveryPriority;
+import org.apache.qpid.server.transport.MessageProperties;
+import org.apache.qpid.server.transport.MessageTransfer;
+import org.apache.qpid.server.util.FileUtils;
 
 /**
  * Subclass of MessageStoreTestCase which runs the standard tests from the superclass against

Modified: qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBPreferenceStoreTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBPreferenceStoreTest.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBPreferenceStoreTest.java (original)
+++ qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBPreferenceStoreTest.java Tue Feb  7 18:38:14 2017
@@ -50,7 +50,7 @@ import org.apache.qpid.server.store.pref
 import org.apache.qpid.server.store.preferences.PreferenceRecordImpl;
 import org.apache.qpid.server.store.preferences.PreferenceStoreUpdater;
 import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.util.FileUtils;
+import org.apache.qpid.server.util.FileUtils;
 
 public class BDBPreferenceStoreTest extends QpidTestCase
 {

Modified: qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeTest.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeTest.java (original)
+++ qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeTest.java Tue Feb  7 18:38:14 2017
@@ -30,7 +30,7 @@ import java.util.Map;
 import com.sleepycat.je.Transaction;
 
 import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.util.FileUtils;
+import org.apache.qpid.server.util.FileUtils;
 
 import com.sleepycat.je.Database;
 import com.sleepycat.je.DatabaseConfig;

Modified: qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java (original)
+++ qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java Tue Feb  7 18:38:14 2017
@@ -69,7 +69,7 @@ import org.apache.qpid.server.util.Conne
 import org.apache.qpid.test.utils.PortHelper;
 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 ReplicatedEnvironmentFacadeTest extends QpidTestCase
 {

Modified: qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractUpgradeTestCase.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractUpgradeTestCase.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractUpgradeTestCase.java (original)
+++ qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractUpgradeTestCase.java Tue Feb  7 18:38:14 2017
@@ -36,7 +36,7 @@ import org.apache.qpid.server.logging.Lo
 import org.apache.qpid.server.logging.subjects.TestBlankSubject;
 import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.util.FileUtils;
+import org.apache.qpid.server.util.FileUtils;
 
 import com.sleepycat.je.Database;
 import com.sleepycat.je.Environment;

Modified: qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4to5Test.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4to5Test.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4to5Test.java (original)
+++ qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4to5Test.java Tue Feb  7 18:38:14 2017
@@ -38,9 +38,9 @@ import java.util.concurrent.atomic.Atomi
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.apache.qpid.common.AMQPFilterTypes;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.FieldTable;
+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.store.berkeleydb.upgrade.UpgradeFrom4To5.BindingRecord;
 import org.apache.qpid.server.store.berkeleydb.upgrade.UpgradeFrom4To5.BindingTuple;
 import org.apache.qpid.server.store.berkeleydb.upgrade.UpgradeFrom4To5.MessageContentKey;

Modified: qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgraderTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgraderTest.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgraderTest.java (original)
+++ qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgraderTest.java Tue Feb  7 18:38:14 2017
@@ -24,7 +24,7 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
 import org.apache.qpid.server.store.berkeleydb.BDBConfigurationStore;
 import org.apache.qpid.server.store.berkeleydb.tuple.ByteBufferBinding;
 

Modified: qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHostImplTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHostImplTest.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHostImplTest.java (original)
+++ qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHostImplTest.java Tue Feb  7 18:38:14 2017
@@ -38,7 +38,7 @@ import org.apache.qpid.server.store.Dura
 import org.apache.qpid.server.model.BrokerTestHelper;
 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 BDBVirtualHostImplTest extends QpidTestCase
 {

Modified: qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeTestHelper.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeTestHelper.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeTestHelper.java (original)
+++ qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeTestHelper.java Tue Feb  7 18:38:14 2017
@@ -58,7 +58,7 @@ import org.apache.qpid.server.virtualhos
 import org.apache.qpid.server.virtualhost.berkeleydb.BDBVirtualHost;
 import org.apache.qpid.server.virtualhostnode.AbstractVirtualHostNode;
 import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.util.FileUtils;
+import org.apache.qpid.server.util.FileUtils;
 
 /**
  * Helper class to make the tests of BDB HA Virtual Host Nodes simpler and more concise.

Modified: qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBVirtualHostNodeTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBVirtualHostNodeTest.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBVirtualHostNodeTest.java (original)
+++ qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBVirtualHostNodeTest.java Tue Feb  7 18:38:14 2017
@@ -34,7 +34,7 @@ import org.apache.qpid.server.model.Brok
 import org.apache.qpid.server.model.BrokerTestHelper;
 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 BDBVirtualHostNodeTest extends QpidTestCase
 {

Modified: qpid/java/trunk/broker-core/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/pom.xml?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/pom.xml (original)
+++ qpid/java/trunk/broker-core/pom.xml Tue Feb  7 18:38:14 2017
@@ -30,17 +30,15 @@
 
   <properties>
     <generated-logmessages-dir>${basedir}/src/main/java</generated-logmessages-dir>
+    <qpid.name>qpid</qpid.name>
+    <qpid.version>${project.version}</qpid.version>
+    <qpid.version.suffix />
+    <buildNumber>Unversioned directory</buildNumber>
   </properties>
 
   <dependencies>
     <dependency>
       <groupId>org.apache.qpid</groupId>
-      <artifactId>qpid-common</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.qpid</groupId>
       <artifactId>qpid-broker-codegen</artifactId>
       <version>${project.version}</version>
       <optional>true</optional>
@@ -160,6 +158,54 @@
 
     <plugins>
       <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>buildnumber-maven-plugin</artifactId>
+        <version>1.3</version>
+        <executions>
+          <execution>
+            <phase>validate</phase>
+            <goals>
+              <goal>create</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <doCheck>false</doCheck>
+          <doUpdate>false</doUpdate>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <!--version specified in parent pluginManagement -->
+        <executions>
+          <execution>
+            <id>amqp-0-8-generated</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <!-- TODO re-enable/re-work code generation -->
+              <skip>true</skip>
+              <target>
+                <ant antfile="build-generate-sources.xml">
+                  <reference torefid="source.generation.classpathref" refid="maven.plugin.classpath" />
+                  <property name="build.compiler" value="extJavac" />
+                </ant>
+              </target>
+            </configuration>
+          </execution>
+        </executions>
+        <dependencies>
+          <dependency>
+            <groupId>org.python</groupId>
+            <artifactId>jython-standalone</artifactId>
+            <version>${jython-version}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <!--version specified in parent pluginManagement -->
@@ -194,6 +240,7 @@
       </activation>
       <build>
         <plugins>
+
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-antrun-plugin</artifactId>
@@ -206,6 +253,8 @@
                     <goal>run</goal>
                   </goals>
                   <configuration>
+                    <!-- TODO re-enable/re-work code generation -->
+                    <skip>true</skip>
                     <target>
                         <ant antfile="build-generate-sources.xml">
                           <reference torefid="source.generation.classpathref" refid="maven.plugin.classpath" />
@@ -232,6 +281,27 @@
               </dependency>
             </dependencies>
           </plugin>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>javacc-maven-plugin</artifactId>
+            <!--version specified in parent pluginManagement -->
+            <executions>
+              <execution>
+                <id>jms-selector-generated</id>
+                <phase>generate-sources</phase>
+                <goals>
+                  <goal>javacc</goal>
+                </goals>
+                <configuration>
+                  <outputDirectory>${selector.output.dir}</outputDirectory>
+                  <sourceDirectory>src/main/grammar</sourceDirectory>
+                  <includes>
+                    <include>SelectorParser.jj</include>
+                  </includes>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
         </plugins>
       </build>
     </profile>

Modified: qpid/java/trunk/broker-core/src/main/grammar/SelectorParser.jj
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/grammar/SelectorParser.jj?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/grammar/SelectorParser.jj (original)
+++ qpid/java/trunk/broker-core/src/main/grammar/SelectorParser.jj Tue Feb  7 18:38:14 2017
@@ -60,20 +60,20 @@ PARSER_BEGIN(SelectorParser)
  *
  */
 
-package org.apache.qpid.filter.selector;
+package org.apache.qpid.server.filter.selector;
 
 import java.io.StringReader;
 import java.util.ArrayList;
 
-import org.apache.qpid.filter.ArithmeticExpression;
-import org.apache.qpid.filter.BooleanExpression;
-import org.apache.qpid.filter.ComparisonExpression;
-import org.apache.qpid.filter.ConstantExpression;
-import org.apache.qpid.filter.Expression;
-import org.apache.qpid.filter.LogicExpression;
-import org.apache.qpid.filter.PropertyExpression;
-import org.apache.qpid.filter.PropertyExpressionFactory;
-import org.apache.qpid.filter.UnaryExpression;
+import org.apache.qpid.server.filter.ArithmeticExpression;
+import org.apache.qpid.server.filter.BooleanExpression;
+import org.apache.qpid.server.filter.ComparisonExpression;
+import org.apache.qpid.server.filter.ConstantExpression;
+import org.apache.qpid.server.filter.Expression;
+import org.apache.qpid.server.filter.LogicExpression;
+import org.apache.qpid.server.filter.PropertyExpression;
+import org.apache.qpid.server.filter.PropertyExpressionFactory;
+import org.apache.qpid.server.filter.UnaryExpression;
 
 /**
  * JMS Selector Parser generated by JavaCC

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/AMQConnectionException.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/AMQConnectionException.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/AMQConnectionException.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/AMQConnectionException.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/AMQConnectionException.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/AMQConnectionException.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/AMQConnectionException.java Tue Feb  7 18:38:14 2017
@@ -19,11 +19,12 @@
  *
  */
 
-package org.apache.qpid;
+package org.apache.qpid.server;
 
-import org.apache.qpid.framing.AMQFrame;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.MethodRegistry;
+import org.apache.qpid.server.framing.AMQFrame;
+import org.apache.qpid.server.framing.AMQShortString;
+import org.apache.qpid.server.framing.MethodRegistry;
+import org.apache.qpid.server.AMQException;
 
 /**
  * AMQConnectionException indicates that an error that requires the channel to be closed has occurred.

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/AMQException.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/AMQException.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/AMQException.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/AMQException.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/AMQException.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/AMQException.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/AMQException.java Tue Feb  7 18:38:14 2017
@@ -16,9 +16,10 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.qpid;
+package org.apache.qpid.server;
 
-import org.apache.qpid.protocol.ErrorCodes;
+import org.apache.qpid.server.protocol.ErrorCodes;
+import org.apache.qpid.server.QpidException;
 
 
 public class AMQException extends QpidException

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/AMQPInvalidClassException.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/AMQPInvalidClassException.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/AMQPInvalidClassException.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/AMQPInvalidClassException.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/AMQPInvalidClassException.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/AMQPInvalidClassException.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/AMQPInvalidClassException.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  *
  *
  */
-package org.apache.qpid;
+package org.apache.qpid.server;
 
 /**
  * AMQPInvalidClassException indicates an error when trying to store an illegally typed argument in a field table.

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/QpidException.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/QpidException.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/QpidException.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/QpidException.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/QpidException.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/QpidException.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/QpidException.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid;
+package org.apache.qpid.server;
 
 /**
  * AMQException forms the root exception of all exceptions relating to the AMQ protocol. It provides space to associate

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/SystemLauncher.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/SystemLauncher.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/SystemLauncher.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/SystemLauncher.java Tue Feb  7 18:38:14 2017
@@ -47,7 +47,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.updater.TaskExecutor;
 import org.apache.qpid.server.configuration.updater.TaskExecutorImpl;
 import org.apache.qpid.server.logging.EventLogger;

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/bytebuffer/BufferPool.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/bytebuffer/BufferPool.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/bytebuffer/BufferPool.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/bytebuffer/BufferPool.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.bytebuffer;
+package org.apache.qpid.server.bytebuffer;
 
 import java.nio.ByteBuffer;
 import java.util.concurrent.ConcurrentLinkedQueue;

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/bytebuffer/ByteBufferRef.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/bytebuffer/ByteBufferRef.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/bytebuffer/ByteBufferRef.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/bytebuffer/ByteBufferRef.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.bytebuffer;
+package org.apache.qpid.server.bytebuffer;
 
 import java.nio.ByteBuffer;
 

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/bytebuffer/NonPooledByteBufferRef.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/bytebuffer/NonPooledByteBufferRef.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/bytebuffer/NonPooledByteBufferRef.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/bytebuffer/NonPooledByteBufferRef.java Tue Feb  7 18:38:14 2017
@@ -18,10 +18,12 @@
  * under the License.
  *
  */
-package org.apache.qpid.bytebuffer;
+package org.apache.qpid.server.bytebuffer;
 
 import java.nio.ByteBuffer;
 
+import org.apache.qpid.server.bytebuffer.ByteBufferRef;
+
 class NonPooledByteBufferRef implements ByteBufferRef
 {
     private final ByteBuffer _buffer;

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/bytebuffer/PooledByteBufferRef.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/bytebuffer/PooledByteBufferRef.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/bytebuffer/PooledByteBufferRef.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/bytebuffer/PooledByteBufferRef.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.bytebuffer;
+package org.apache.qpid.server.bytebuffer;
 
 import java.nio.ByteBuffer;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/bytebuffer/QpidByteBuffer.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/bytebuffer/QpidByteBuffer.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/bytebuffer/QpidByteBuffer.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/bytebuffer/QpidByteBuffer.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  *
  */
 
-package org.apache.qpid.bytebuffer;
+package org.apache.qpid.server.bytebuffer;
 
 import java.io.BufferedOutputStream;
 import java.io.IOException;
@@ -43,7 +43,7 @@ import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLEngineResult;
 import javax.net.ssl.SSLException;
 
-import org.apache.qpid.streams.CompositeInputStream;
+import org.apache.qpid.server.streams.CompositeInputStream;
 
 public class QpidByteBuffer
 {
@@ -804,6 +804,18 @@ public class QpidByteBuffer
         _isPoolInitialized = true;
     }
 
+    /** Test use only */
+    public synchronized static void deinitialisePool()
+    {
+        if (_isPoolInitialized)
+        {
+            _bufferPool = null;
+            _pooledBufferSize = -1;
+            _zeroed = null;
+            _isPoolInitialized = false;
+        }
+    }
+
     public static int getPooledBufferSize()
     {
         return _pooledBufferSize;

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/bytebuffer/QpidByteBufferInputStream.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/bytebuffer/QpidByteBufferInputStream.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/bytebuffer/QpidByteBufferInputStream.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/bytebuffer/QpidByteBufferInputStream.java Tue Feb  7 18:38:14 2017
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-package org.apache.qpid.bytebuffer;
+package org.apache.qpid.server.bytebuffer;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.apache.qpid.streams.CompositeInputStream;
+import org.apache.qpid.server.streams.CompositeInputStream;
 
 /**
  * InputStream implementation that takes a list QpidByteBuffers.

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/bytebuffer/QpidByteBufferOutputStream.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/bytebuffer/QpidByteBufferOutputStream.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/bytebuffer/QpidByteBufferOutputStream.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/bytebuffer/QpidByteBufferOutputStream.java Tue Feb  7 18:38:14 2017
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.qpid.bytebuffer;
+package org.apache.qpid.server.bytebuffer;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -27,6 +27,8 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedList;
 
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+
 /**
  * OutputStream implementation that yields a list QpidByteBuffers that contain a copy
  * of the incoming bytes.  Use fetchAccumulatedBuffers to get the buffers.  Caller

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/codec/AMQDecoder.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/codec/AMQDecoder.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/codec/AMQDecoder.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/codec/AMQDecoder.java Tue Feb  7 18:38:14 2017
@@ -18,14 +18,14 @@
  * under the License.
  *
  */
-package org.apache.qpid.codec;
+package org.apache.qpid.server.codec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.framing.*;
-import org.apache.qpid.protocol.ErrorCodes;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.framing.*;
+import org.apache.qpid.server.protocol.ErrorCodes;
 
 /**
  * AMQDecoder delegates the decoding of AMQP either to a data block decoder, or in the case of new connections, to a

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/codec/ClientDecoder.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/codec/ClientDecoder.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/codec/ClientDecoder.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/codec/ClientDecoder.java Tue Feb  7 18:38:14 2017
@@ -18,12 +18,12 @@
  * under the License.
  *
  */
-package org.apache.qpid.codec;
+package org.apache.qpid.server.codec;
 
 import java.nio.ByteBuffer;
 
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.framing.*;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.framing.*;
 
 public class ClientDecoder extends AMQDecoder<ClientMethodProcessor<? extends ClientChannelMethodProcessor>>
 {

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/codec/ServerDecoder.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/codec/ServerDecoder.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/codec/ServerDecoder.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/codec/ServerDecoder.java Tue Feb  7 18:38:14 2017
@@ -18,12 +18,12 @@
  * under the License.
  *
  */
-package org.apache.qpid.codec;
+package org.apache.qpid.server.codec;
 
 import java.io.IOException;
 
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.framing.*;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.framing.*;
 
 public class ServerDecoder extends AMQDecoder<ServerMethodProcessor<? extends ServerChannelMethodProcessor>>
 {

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/common/AMQPFilterTypes.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/common/AMQPFilterTypes.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/common/AMQPFilterTypes.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/common/AMQPFilterTypes.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  *
  *
  */
-package org.apache.qpid.common;
+package org.apache.qpid.server.common;
 
 /**
  * Specifies the different filter types for consumers that filter their messages.

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/common/ServerPropertyNames.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/common/ServerPropertyNames.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/common/ServerPropertyNames.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/common/ServerPropertyNames.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.common;
+package org.apache.qpid.server.common;
 
 /**
  * Keys names used within the serverProperties argument of the ConnectionStart

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/Accessor.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/configuration/Accessor.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/Accessor.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/Accessor.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/configuration/Accessor.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/configuration/Accessor.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/Accessor.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  * 
  */
-package org.apache.qpid.configuration;
+package org.apache.qpid.server.configuration;
 
 import java.util.Map;
 

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/ClientProperties.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/ClientProperties.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/ClientProperties.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/ClientProperties.java Tue Feb  7 18:38:14 2017
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.apache.qpid.configuration;
+package org.apache.qpid.server.configuration;
 
 import java.io.File;
 import java.io.IOException;

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/CommonProperties.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/configuration/CommonProperties.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/CommonProperties.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/CommonProperties.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/configuration/CommonProperties.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/configuration/CommonProperties.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/CommonProperties.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.configuration;
+package org.apache.qpid.server.configuration;
 
 import java.io.File;
 import java.io.IOException;
@@ -71,7 +71,7 @@ public class CommonProperties
     public static final String QPID_SECURITY_OBJECT_MESSAGE_CLASS_HIERARCHY_BLACK_LIST = "qpid.security.objectMessage.classHierarchyBlackList";
 
     /** The name of the version properties file to load from the class path. */
-    public static final String VERSION_RESOURCE = "qpidversion.properties";
+    public static final String VERSION_RESOURCE = "qpidbrokerversion.properties";
 
     /** Defines the name of the product property. */
     public static final String PRODUCT_NAME_PROPERTY = "qpid.name";

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/Configured.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/configuration/Configured.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/Configured.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/Configured.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/configuration/Configured.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/configuration/Configured.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/Configured.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.configuration;
+package org.apache.qpid.server.configuration;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/QpidProperty.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/configuration/QpidProperty.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/QpidProperty.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/QpidProperty.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/configuration/QpidProperty.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/configuration/QpidProperty.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/QpidProperty.java Tue Feb  7 18:38:14 2017
@@ -16,9 +16,9 @@
  * under the License.
  */
 
-package org.apache.qpid.configuration;
+package org.apache.qpid.server.configuration;
 
-import org.apache.qpid.configuration.Accessor.SystemPropertyAccessor;
+import org.apache.qpid.server.configuration.Accessor.SystemPropertyAccessor;
 
 public abstract class QpidProperty<T>
 {

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/Validator.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/configuration/Validator.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/Validator.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/Validator.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/configuration/Validator.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/configuration/Validator.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/Validator.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  * 
  */
-package org.apache.qpid.configuration;
+package org.apache.qpid.server.configuration;
 
 
 public interface Validator

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java Tue Feb  7 18:38:14 2017
@@ -41,7 +41,7 @@ import com.google.common.util.concurrent
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.qpid.exchange.ExchangeDefaults;
+import org.apache.qpid.server.exchange.ExchangeDefaults;
 import org.apache.qpid.server.binding.BindingImpl;
 import org.apache.qpid.server.logging.EventLogger;
 import org.apache.qpid.server.logging.LogSubject;

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultDestination.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultDestination.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultDestination.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultDestination.java Tue Feb  7 18:38:14 2017
@@ -21,7 +21,7 @@ package org.apache.qpid.server.exchange;
 import java.security.AccessControlException;
 import java.util.Map;
 
-import org.apache.qpid.exchange.ExchangeDefaults;
+import org.apache.qpid.server.exchange.ExchangeDefaults;
 import org.apache.qpid.server.message.InstanceProperties;
 import org.apache.qpid.server.message.MessageDestination;
 import org.apache.qpid.server.message.MessageSender;

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java Tue Feb  7 18:38:14 2017
@@ -20,7 +20,7 @@
  */
 package org.apache.qpid.server.exchange;
 
-import org.apache.qpid.exchange.ExchangeDefaults;
+import org.apache.qpid.server.exchange.ExchangeDefaults;
 import org.apache.qpid.server.model.Exchange;
 import org.apache.qpid.server.model.ManagedObject;
 

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeDefaults.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/exchange/ExchangeDefaults.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeDefaults.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeDefaults.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/exchange/ExchangeDefaults.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/exchange/ExchangeDefaults.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeDefaults.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.exchange;
+package org.apache.qpid.server.exchange;
 
 /**
  * Defines the names of the standard AMQP exchanges that every AMQP broker should provide. These exchange names

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java Tue Feb  7 18:38:14 2017
@@ -20,7 +20,7 @@
  */
 package org.apache.qpid.server.exchange;
 
-import org.apache.qpid.exchange.ExchangeDefaults;
+import org.apache.qpid.server.exchange.ExchangeDefaults;
 import org.apache.qpid.server.model.Exchange;
 import org.apache.qpid.server.model.ManagedObject;
 

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java Tue Feb  7 18:38:14 2017
@@ -20,7 +20,7 @@
  */
 package org.apache.qpid.server.exchange;
 
-import org.apache.qpid.exchange.ExchangeDefaults;
+import org.apache.qpid.server.exchange.ExchangeDefaults;
 import org.apache.qpid.server.model.Exchange;
 import org.apache.qpid.server.model.ManagedObject;
 

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java Tue Feb  7 18:38:14 2017
@@ -20,7 +20,7 @@
  */
 package org.apache.qpid.server.exchange;
 
-import org.apache.qpid.exchange.ExchangeDefaults;
+import org.apache.qpid.server.exchange.ExchangeDefaults;
 import org.apache.qpid.server.model.Exchange;
 import org.apache.qpid.server.model.ManagedObject;
 

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/ArithmeticExpression.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/ArithmeticExpression.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/ArithmeticExpression.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/ArithmeticExpression.java Tue Feb  7 18:38:14 2017
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.qpid.filter;
+package org.apache.qpid.server.filter;
 //
 // Based on like named file from r450141 of the Apache ActiveMQ project <http://www.activemq.org/site/home.html>
 //

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/ArrivalTimeFilter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/ArrivalTimeFilter.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/ArrivalTimeFilter.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/ArrivalTimeFilter.java Tue Feb  7 18:38:14 2017
@@ -20,7 +20,7 @@
  */
 package org.apache.qpid.server.filter;
 
-import org.apache.qpid.common.AMQPFilterTypes;
+import org.apache.qpid.server.common.AMQPFilterTypes;
 
 public final class ArrivalTimeFilter implements MessageFilter
 {

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/ArrivalTimeFilterFactory.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/ArrivalTimeFilterFactory.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/ArrivalTimeFilterFactory.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/ArrivalTimeFilterFactory.java Tue Feb  7 18:38:14 2017
@@ -22,7 +22,7 @@ package org.apache.qpid.server.filter;
 
 import java.util.List;
 
-import org.apache.qpid.common.AMQPFilterTypes;
+import org.apache.qpid.server.common.AMQPFilterTypes;
 import org.apache.qpid.server.plugin.MessageFilterFactory;
 import org.apache.qpid.server.plugin.PluggableService;
 

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/BinaryExpression.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/BinaryExpression.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/BinaryExpression.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/BinaryExpression.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/BinaryExpression.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/BinaryExpression.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/BinaryExpression.java Tue Feb  7 18:38:14 2017
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.qpid.filter;
+package org.apache.qpid.server.filter;
 //
 // Based on like named file from r450141 of the Apache ActiveMQ project <http://www.activemq.org/site/home.html>
 //

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/BooleanExpression.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/BooleanExpression.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/BooleanExpression.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/BooleanExpression.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/BooleanExpression.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/BooleanExpression.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/BooleanExpression.java Tue Feb  7 18:38:14 2017
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.qpid.filter;
+package org.apache.qpid.server.filter;
 //
 // Based on like named file from r450141 of the Apache ActiveMQ project <http://www.activemq.org/site/home.html>
 //

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/ComparisonExpression.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/ComparisonExpression.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/ComparisonExpression.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/ComparisonExpression.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/ComparisonExpression.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/ComparisonExpression.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/ComparisonExpression.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.filter;
+package org.apache.qpid.server.filter;
 //
 // Based on like named file from r450141 of the Apache ActiveMQ project <http://www.activemq.org/site/home.html>
 //

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/ConstantExpression.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/ConstantExpression.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/ConstantExpression.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.filter;
+package org.apache.qpid.server.filter;
 //
 // Based on like named file from r450141 of the Apache ActiveMQ project <http://www.activemq.org/site/home.html>
 //

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/Expression.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/Expression.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/Expression.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/Expression.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/Expression.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/Expression.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/Expression.java Tue Feb  7 18:38:14 2017
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.qpid.filter;
+package org.apache.qpid.server.filter;
 //
 // Based on like named file from r450141 of the Apache ActiveMQ project <http://www.activemq.org/site/home.html>
 //

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java Tue Feb  7 18:38:14 2017
@@ -25,10 +25,10 @@ import java.util.Map;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.qpid.common.AMQPFilterTypes;
-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.common.AMQPFilterTypes;
+import org.apache.qpid.server.filter.SelectorParsingException;
+import org.apache.qpid.server.filter.selector.ParseException;
+import org.apache.qpid.server.filter.selector.TokenMgrError;
 
 
 public class FilterManagerFactory

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/FilterSupport.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/FilterSupport.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/FilterSupport.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/FilterSupport.java Tue Feb  7 18:38:14 2017
@@ -27,10 +27,10 @@ import java.util.Collections;
 import java.util.Map;
 import java.util.WeakHashMap;
 
-import org.apache.qpid.common.AMQPFilterTypes;
-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.common.AMQPFilterTypes;
+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.message.MessageDestination;
 import org.apache.qpid.server.model.Queue;
 import org.apache.qpid.server.plugin.PluggableService;

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/Filterable.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/Filterable.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/Filterable.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/Filterable.java Tue Feb  7 18:38:14 2017
@@ -20,7 +20,7 @@
 */
 package org.apache.qpid.server.filter;
 
-import org.apache.qpid.filter.FilterableMessage;
+import org.apache.qpid.server.filter.FilterableMessage;
 import org.apache.qpid.server.message.AMQMessageHeader;
 import org.apache.qpid.server.message.InstanceProperties;
 import org.apache.qpid.server.message.ServerMessage;

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/FilterableMessage.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/FilterableMessage.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/FilterableMessage.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/FilterableMessage.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/FilterableMessage.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/FilterableMessage.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/FilterableMessage.java Tue Feb  7 18:38:14 2017
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.qpid.filter;
+package org.apache.qpid.server.filter;
 
 public interface FilterableMessage
 {

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/JMSMessagePropertyExpression.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/JMSMessagePropertyExpression.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/JMSMessagePropertyExpression.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/JMSMessagePropertyExpression.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/JMSMessagePropertyExpression.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/JMSMessagePropertyExpression.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/JMSMessagePropertyExpression.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.filter;
+package org.apache.qpid.server.filter;
 //
 // Based on like named file from r450141 of the Apache ActiveMQ project <http://www.activemq.org/site/home.html>
 //

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java Tue Feb  7 18:38:14 2017
@@ -23,14 +23,14 @@ package org.apache.qpid.server.filter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.qpid.common.AMQPFilterTypes;
-import org.apache.qpid.filter.BooleanExpression;
-import org.apache.qpid.filter.FilterableMessage;
-import org.apache.qpid.filter.JMSMessagePropertyExpression;
-import org.apache.qpid.filter.SelectorParsingException;
-import org.apache.qpid.filter.selector.ParseException;
-import org.apache.qpid.filter.selector.SelectorParser;
-import org.apache.qpid.filter.selector.TokenMgrError;
+import org.apache.qpid.server.common.AMQPFilterTypes;
+import org.apache.qpid.server.filter.BooleanExpression;
+import org.apache.qpid.server.filter.FilterableMessage;
+import org.apache.qpid.server.filter.JMSMessagePropertyExpression;
+import org.apache.qpid.server.filter.SelectorParsingException;
+import org.apache.qpid.server.filter.selector.ParseException;
+import org.apache.qpid.server.filter.selector.SelectorParser;
+import org.apache.qpid.server.filter.selector.TokenMgrError;
 import org.apache.qpid.server.plugin.PluggableService;
 
 

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilterFactory.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilterFactory.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilterFactory.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilterFactory.java Tue Feb  7 18:38:14 2017
@@ -22,10 +22,10 @@ package org.apache.qpid.server.filter;
 
 import java.util.List;
 
-import org.apache.qpid.common.AMQPFilterTypes;
-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.common.AMQPFilterTypes;
+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.plugin.MessageFilterFactory;
 import org.apache.qpid.server.plugin.PluggableService;
 

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/LogicExpression.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/LogicExpression.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/LogicExpression.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/LogicExpression.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/LogicExpression.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/LogicExpression.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/LogicExpression.java Tue Feb  7 18:38:14 2017
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.qpid.filter;
+package org.apache.qpid.server.filter;
 //
 // Based on like named file from r450141 of the Apache ActiveMQ project <http://www.activemq.org/site/home.html>
 //

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/OrderByExpression.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/OrderByExpression.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/OrderByExpression.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/OrderByExpression.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/OrderByExpression.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/OrderByExpression.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/OrderByExpression.java Tue Feb  7 18:38:14 2017
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.qpid.filter;
+package org.apache.qpid.server.filter;
 
 public class OrderByExpression implements Expression
 {

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/PropertyExpression.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/PropertyExpression.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/PropertyExpression.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.filter;
+package org.apache.qpid.server.filter;
 
 
 /**

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/PropertyExpressionFactory.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/PropertyExpressionFactory.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/PropertyExpressionFactory.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/PropertyExpressionFactory.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/PropertyExpressionFactory.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/PropertyExpressionFactory.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/PropertyExpressionFactory.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.filter;
+package org.apache.qpid.server.filter;
 
 public interface PropertyExpressionFactory<E>
 {

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/SelectorParsingException.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/SelectorParsingException.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/SelectorParsingException.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/SelectorParsingException.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/SelectorParsingException.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/SelectorParsingException.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/SelectorParsingException.java Tue Feb  7 18:38:14 2017
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.qpid.filter;
+package org.apache.qpid.server.filter;
 
 public class SelectorParsingException extends RuntimeException
 {

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/UnaryExpression.java (from r1781779, qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/UnaryExpression.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/UnaryExpression.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/UnaryExpression.java&p1=qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/UnaryExpression.java&r1=1781779&r2=1782048&rev=1782048&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/filter/UnaryExpression.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/filter/UnaryExpression.java Tue Feb  7 18:38:14 2017
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.filter;
+package org.apache.qpid.server.filter;
 //
 // Based on like named file from r450141 of the Apache ActiveMQ project <http://www.activemq.org/site/home.html>
 //



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org