http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/management/impl/ClusterConnectionControlImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/management/impl/ClusterConnectionControlImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/management/impl/ClusterConnectionControlImpl.java index 2c496e6..550e840 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/management/impl/ClusterConnectionControlImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/management/impl/ClusterConnectionControlImpl.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.management.impl; +package org.apache.activemq.core.management.impl; import javax.management.MBeanOperationInfo; import java.util.List; import java.util.Map; -import org.apache.activemq6.api.core.management.ClusterConnectionControl; -import org.apache.activemq6.core.config.ClusterConnectionConfiguration; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.server.cluster.ClusterConnection; -import org.apache.activemq6.utils.json.JSONArray; +import org.apache.activemq.api.core.management.ClusterConnectionControl; +import org.apache.activemq.core.config.ClusterConnectionConfiguration; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.server.cluster.ClusterConnection; +import org.apache.activemq.utils.json.JSONArray; /** * A ClusterConnectionControl
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/management/impl/DivertControlImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/management/impl/DivertControlImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/management/impl/DivertControlImpl.java index 847d59b..829588d 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/management/impl/DivertControlImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/management/impl/DivertControlImpl.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.management.impl; +package org.apache.activemq.core.management.impl; import javax.management.MBeanOperationInfo; -import org.apache.activemq6.api.core.management.DivertControl; -import org.apache.activemq6.core.config.DivertConfiguration; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.server.Divert; +import org.apache.activemq.api.core.management.DivertControl; +import org.apache.activemq.core.config.DivertConfiguration; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.server.Divert; /** * A DivertControl http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/management/impl/HornetQServerControlImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/management/impl/HornetQServerControlImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/management/impl/HornetQServerControlImpl.java index 1a331dd..e5efd6b 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/management/impl/HornetQServerControlImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/management/impl/HornetQServerControlImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.management.impl; +package org.apache.activemq.core.management.impl; import java.text.DateFormat; import java.util.ArrayList; @@ -36,55 +36,55 @@ import javax.management.NotificationFilter; import javax.management.NotificationListener; import javax.transaction.xa.Xid; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.management.AddressControl; -import org.apache.activemq6.api.core.management.BridgeControl; -import org.apache.activemq6.api.core.management.CoreNotificationType; -import org.apache.activemq6.api.core.management.DivertControl; -import org.apache.activemq6.api.core.management.HornetQServerControl; -import org.apache.activemq6.api.core.management.QueueControl; -import org.apache.activemq6.core.config.BridgeConfiguration; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.config.DivertConfiguration; -import org.apache.activemq6.core.messagecounter.MessageCounterManager; -import org.apache.activemq6.core.messagecounter.impl.MessageCounterManagerImpl; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.persistence.config.PersistedAddressSetting; -import org.apache.activemq6.core.persistence.config.PersistedRoles; -import org.apache.activemq6.core.postoffice.Binding; -import org.apache.activemq6.core.postoffice.DuplicateIDCache; -import org.apache.activemq6.core.postoffice.PostOffice; -import org.apache.activemq6.core.postoffice.impl.LocalQueueBinding; -import org.apache.activemq6.core.remoting.server.RemotingService; -import org.apache.activemq6.core.security.CheckType; -import org.apache.activemq6.core.security.Role; -import org.apache.activemq6.core.server.Consumer; -import org.apache.activemq6.core.server.HornetQMessageBundle; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.server.JournalType; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.core.server.ServerConsumer; -import org.apache.activemq6.core.server.ServerSession; -import org.apache.activemq6.core.server.cluster.ha.HAPolicy; -import org.apache.activemq6.core.server.cluster.ha.LiveOnlyPolicy; -import org.apache.activemq6.core.server.cluster.ha.ScaleDownPolicy; -import org.apache.activemq6.core.server.cluster.ha.SharedStoreSlavePolicy; -import org.apache.activemq6.core.server.group.GroupingHandler; -import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; -import org.apache.activemq6.core.settings.impl.AddressSettings; -import org.apache.activemq6.core.settings.impl.SlowConsumerPolicy; -import org.apache.activemq6.core.transaction.ResourceManager; -import org.apache.activemq6.core.transaction.Transaction; -import org.apache.activemq6.core.transaction.TransactionDetail; -import org.apache.activemq6.core.transaction.impl.CoreTransactionDetail; -import org.apache.activemq6.core.transaction.impl.XidImpl; -import org.apache.activemq6.spi.core.protocol.RemotingConnection; -import org.apache.activemq6.utils.SecurityFormatter; -import org.apache.activemq6.utils.TypedProperties; -import org.apache.activemq6.utils.json.JSONArray; -import org.apache.activemq6.utils.json.JSONObject; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.management.AddressControl; +import org.apache.activemq.api.core.management.BridgeControl; +import org.apache.activemq.api.core.management.CoreNotificationType; +import org.apache.activemq.api.core.management.DivertControl; +import org.apache.activemq.api.core.management.HornetQServerControl; +import org.apache.activemq.api.core.management.QueueControl; +import org.apache.activemq.core.config.BridgeConfiguration; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.config.DivertConfiguration; +import org.apache.activemq.core.messagecounter.MessageCounterManager; +import org.apache.activemq.core.messagecounter.impl.MessageCounterManagerImpl; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.persistence.config.PersistedAddressSetting; +import org.apache.activemq.core.persistence.config.PersistedRoles; +import org.apache.activemq.core.postoffice.Binding; +import org.apache.activemq.core.postoffice.DuplicateIDCache; +import org.apache.activemq.core.postoffice.PostOffice; +import org.apache.activemq.core.postoffice.impl.LocalQueueBinding; +import org.apache.activemq.core.remoting.server.RemotingService; +import org.apache.activemq.core.security.CheckType; +import org.apache.activemq.core.security.Role; +import org.apache.activemq.core.server.Consumer; +import org.apache.activemq.core.server.HornetQMessageBundle; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.JournalType; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.core.server.ServerConsumer; +import org.apache.activemq.core.server.ServerSession; +import org.apache.activemq.core.server.cluster.ha.HAPolicy; +import org.apache.activemq.core.server.cluster.ha.LiveOnlyPolicy; +import org.apache.activemq.core.server.cluster.ha.ScaleDownPolicy; +import org.apache.activemq.core.server.cluster.ha.SharedStoreSlavePolicy; +import org.apache.activemq.core.server.group.GroupingHandler; +import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq.core.settings.impl.AddressSettings; +import org.apache.activemq.core.settings.impl.SlowConsumerPolicy; +import org.apache.activemq.core.transaction.ResourceManager; +import org.apache.activemq.core.transaction.Transaction; +import org.apache.activemq.core.transaction.TransactionDetail; +import org.apache.activemq.core.transaction.impl.CoreTransactionDetail; +import org.apache.activemq.core.transaction.impl.XidImpl; +import org.apache.activemq.spi.core.protocol.RemotingConnection; +import org.apache.activemq.utils.SecurityFormatter; +import org.apache.activemq.utils.TypedProperties; +import org.apache.activemq.utils.json.JSONArray; +import org.apache.activemq.utils.json.JSONObject; /** * @author <a href="mailto:[email protected]";>Jeff Mesnil</a> @@ -92,7 +92,7 @@ import org.apache.activemq6.utils.json.JSONObject; * */ public class HornetQServerControlImpl extends AbstractControl implements HornetQServerControl, NotificationEmitter, - org.apache.activemq6.core.server.management.NotificationListener + org.apache.activemq.core.server.management.NotificationListener { // Constants ----------------------------------------------------- @@ -1414,7 +1414,7 @@ public class HornetQServerControlImpl extends AbstractControl implements HornetQ /* (non-Javadoc) - * @see org.apache.activemq6.api.core.management.HornetQServerControl#listProducersInfoAsJSON() + * @see org.apache.activemq.api.core.management.HornetQServerControl#listProducersInfoAsJSON() */ public String listProducersInfoAsJSON() throws Exception { @@ -2173,7 +2173,7 @@ public class HornetQServerControlImpl extends AbstractControl implements HornetQ } @Override - public void onNotification(org.apache.activemq6.core.server.management.Notification notification) + public void onNotification(org.apache.activemq.core.server.management.Notification notification) { if (!(notification.getType() instanceof CoreNotificationType)) return; CoreNotificationType type = (CoreNotificationType) notification.getType(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/management/impl/MBeanInfoHelper.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/management/impl/MBeanInfoHelper.java b/activemq-server/src/main/java/org/apache/activemq/core/management/impl/MBeanInfoHelper.java index 598e7bc..4bbbc62 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/management/impl/MBeanInfoHelper.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/management/impl/MBeanInfoHelper.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.management.impl; +package org.apache.activemq.core.management.impl; import java.lang.annotation.Annotation; import java.lang.reflect.Method; @@ -20,8 +20,8 @@ import java.util.List; import javax.management.MBeanOperationInfo; import javax.management.MBeanParameterInfo; -import org.apache.activemq6.api.core.management.Operation; -import org.apache.activemq6.api.core.management.Parameter; +import org.apache.activemq.api.core.management.Operation; +import org.apache.activemq.api.core.management.Parameter; /** * @author <a href="mailto:[email protected]";>Jeff Mesnil</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/management/impl/QueueControlImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/management/impl/QueueControlImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/management/impl/QueueControlImpl.java index 0578ecb..ec8f38b 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/management/impl/QueueControlImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/management/impl/QueueControlImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.management.impl; +package org.apache.activemq.core.management.impl; import javax.management.MBeanOperationInfo; import java.util.ArrayList; @@ -19,29 +19,29 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.Message; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.management.MessageCounterInfo; -import org.apache.activemq6.api.core.management.QueueControl; -import org.apache.activemq6.core.filter.Filter; -import org.apache.activemq6.core.filter.impl.FilterImpl; -import org.apache.activemq6.core.messagecounter.MessageCounter; -import org.apache.activemq6.core.messagecounter.impl.MessageCounterHelper; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.postoffice.Binding; -import org.apache.activemq6.core.postoffice.PostOffice; -import org.apache.activemq6.core.server.Consumer; -import org.apache.activemq6.core.server.HornetQMessageBundle; -import org.apache.activemq6.core.server.MessageReference; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.core.server.ServerConsumer; -import org.apache.activemq6.core.settings.HierarchicalRepository; -import org.apache.activemq6.core.settings.impl.AddressSettings; -import org.apache.activemq6.utils.LinkedListIterator; -import org.apache.activemq6.utils.json.JSONArray; -import org.apache.activemq6.utils.json.JSONException; -import org.apache.activemq6.utils.json.JSONObject; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.Message; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.management.MessageCounterInfo; +import org.apache.activemq.api.core.management.QueueControl; +import org.apache.activemq.core.filter.Filter; +import org.apache.activemq.core.filter.impl.FilterImpl; +import org.apache.activemq.core.messagecounter.MessageCounter; +import org.apache.activemq.core.messagecounter.impl.MessageCounterHelper; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.postoffice.Binding; +import org.apache.activemq.core.postoffice.PostOffice; +import org.apache.activemq.core.server.Consumer; +import org.apache.activemq.core.server.HornetQMessageBundle; +import org.apache.activemq.core.server.MessageReference; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.core.server.ServerConsumer; +import org.apache.activemq.core.settings.HierarchicalRepository; +import org.apache.activemq.core.settings.impl.AddressSettings; +import org.apache.activemq.utils.LinkedListIterator; +import org.apache.activemq.utils.json.JSONArray; +import org.apache.activemq.utils.json.JSONException; +import org.apache.activemq.utils.json.JSONObject; /** * @author <a href="mailto:[email protected]";>Jeff Mesnil</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/messagecounter/MessageCounter.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/messagecounter/MessageCounter.java b/activemq-server/src/main/java/org/apache/activemq/core/messagecounter/MessageCounter.java index dec3d58..4fd478f 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/messagecounter/MessageCounter.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/messagecounter/MessageCounter.java @@ -31,7 +31,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.apache.activemq6.core.messagecounter; +package org.apache.activemq.core.messagecounter; import java.text.DateFormat; import java.util.ArrayList; @@ -39,7 +39,7 @@ import java.util.Calendar; import java.util.GregorianCalendar; import java.util.List; -import org.apache.activemq6.core.server.Queue; +import org.apache.activemq.core.server.Queue; /** * This class stores message count informations for a given queue http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/messagecounter/MessageCounterManager.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/messagecounter/MessageCounterManager.java b/activemq-server/src/main/java/org/apache/activemq/core/messagecounter/MessageCounterManager.java index 4e45084..b13b80c 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/messagecounter/MessageCounterManager.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/messagecounter/MessageCounterManager.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.messagecounter; +package org.apache.activemq.core.messagecounter; /** * @author <a href="mailto:[email protected]";>Jeff Mesnil</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/messagecounter/impl/MessageCounterHelper.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/messagecounter/impl/MessageCounterHelper.java b/activemq-server/src/main/java/org/apache/activemq/core/messagecounter/impl/MessageCounterHelper.java index b198ff1..becf971 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/messagecounter/impl/MessageCounterHelper.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/messagecounter/impl/MessageCounterHelper.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.messagecounter.impl; +package org.apache.activemq.core.messagecounter.impl; import java.text.DateFormat; import java.util.Date; @@ -18,9 +18,9 @@ import java.util.GregorianCalendar; import java.util.List; import java.util.StringTokenizer; -import org.apache.activemq6.api.core.management.DayCounterInfo; -import org.apache.activemq6.core.messagecounter.MessageCounter; -import org.apache.activemq6.core.messagecounter.MessageCounter.DayCounter; +import org.apache.activemq.api.core.management.DayCounterInfo; +import org.apache.activemq.core.messagecounter.MessageCounter; +import org.apache.activemq.core.messagecounter.MessageCounter.DayCounter; /** * @author <a href="mailto:[email protected]";>Jeff Mesnil</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/messagecounter/impl/MessageCounterManagerImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/messagecounter/impl/MessageCounterManagerImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/messagecounter/impl/MessageCounterManagerImpl.java index 89177d8..2415ff4 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/messagecounter/impl/MessageCounterManagerImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/messagecounter/impl/MessageCounterManagerImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.messagecounter.impl; +package org.apache.activemq.core.messagecounter.impl; import java.util.HashMap; import java.util.HashSet; @@ -21,9 +21,9 @@ import java.util.concurrent.Future; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import org.apache.activemq6.api.config.HornetQDefaultConfiguration; -import org.apache.activemq6.core.messagecounter.MessageCounter; -import org.apache.activemq6.core.messagecounter.MessageCounterManager; +import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.core.messagecounter.MessageCounter; +import org.apache.activemq.core.messagecounter.MessageCounterManager; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/paging/PageTransactionInfo.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/PageTransactionInfo.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/PageTransactionInfo.java index 4227f43..5971e9f 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/PageTransactionInfo.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/paging/PageTransactionInfo.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.paging; +package org.apache.activemq.core.paging; -import org.apache.activemq6.core.journal.EncodingSupport; -import org.apache.activemq6.core.paging.cursor.PagePosition; -import org.apache.activemq6.core.paging.cursor.PageSubscription; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.transaction.Transaction; +import org.apache.activemq.core.journal.EncodingSupport; +import org.apache.activemq.core.paging.cursor.PagePosition; +import org.apache.activemq.core.paging.cursor.PageSubscription; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.transaction.Transaction; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/paging/PagedMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/PagedMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/PagedMessage.java index 21af7f2..f6349f5 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/PagedMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/paging/PagedMessage.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.paging; +package org.apache.activemq.core.paging; -import org.apache.activemq6.core.journal.EncodingSupport; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq.core.journal.EncodingSupport; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.server.ServerMessage; /** * A Paged message. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/paging/PagingManager.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/PagingManager.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/PagingManager.java index 2c9e008..f42f161 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/PagingManager.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/paging/PagingManager.java @@ -10,26 +10,26 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.paging; +package org.apache.activemq.core.paging; import java.util.Map; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.server.HornetQComponent; -import org.apache.activemq6.core.settings.HierarchicalRepositoryChangeListener; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.server.HornetQComponent; +import org.apache.activemq.core.settings.HierarchicalRepositoryChangeListener; /** * <PRE> * * +--------------+ 1 +----------------+ N +--------------+ N +--------+ 1 +-------------------+ - * | {@link org.apache.activemq6.core.postoffice.PostOffice} |-------> |{@link PagingManager}|-------> |{@link PagingStore} | ------> | {@link org.apache.activemq6.core.paging.impl.Page} | ------> | {@link org.apache.activemq6.core.journal.SequentialFile} | + * | {@link org.apache.activemq.core.postoffice.PostOffice} |-------> |{@link PagingManager}|-------> |{@link PagingStore} | ------> | {@link org.apache.activemq.core.paging.impl.Page} | ------> | {@link org.apache.activemq.core.journal.SequentialFile} | * +--------------+ +----------------+ +--------------+ +--------+ +-------------------+ * | 1 ^ * | | * | | * | | 1 * | N +----------+ - * +------------> | {@link org.apache.activemq6.core.postoffice.Address} | + * +------------> | {@link org.apache.activemq.core.postoffice.Address} | * +----------+ * </PRE> * @author <a href="mailto:[email protected]";>Clebert Suconic</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/paging/PagingStore.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/PagingStore.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/PagingStore.java index 33e3148..517693f 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/PagingStore.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/paging/PagingStore.java @@ -10,21 +10,21 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.paging; +package org.apache.activemq.core.paging; import java.util.Collection; import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.paging.cursor.PageCursorProvider; -import org.apache.activemq6.core.paging.impl.Page; -import org.apache.activemq6.core.replication.ReplicationManager; -import org.apache.activemq6.core.server.HornetQComponent; -import org.apache.activemq6.core.server.RouteContextList; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; -import org.apache.activemq6.core.settings.impl.AddressSettings; -import org.apache.activemq6.core.transaction.Transaction; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.paging.cursor.PageCursorProvider; +import org.apache.activemq.core.paging.impl.Page; +import org.apache.activemq.core.replication.ReplicationManager; +import org.apache.activemq.core.server.HornetQComponent; +import org.apache.activemq.core.server.RouteContextList; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq.core.settings.impl.AddressSettings; +import org.apache.activemq.core.transaction.Transaction; /** * <p> @@ -154,7 +154,7 @@ public interface PagingStore extends HornetQComponent /** * Sends the pages with given IDs to the {@link ReplicationManager}. * <p/> - * Sending is done here to avoid exposing the internal {@link org.apache.activemq6.core.journal.SequentialFile}s. + * Sending is done here to avoid exposing the internal {@link org.apache.activemq.core.journal.SequentialFile}s. * * @param replicator * @param pageIds http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/paging/PagingStoreFactory.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/PagingStoreFactory.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/PagingStoreFactory.java index a438163..ecc45b9 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/PagingStoreFactory.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/paging/PagingStoreFactory.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.paging; +package org.apache.activemq.core.paging; import java.util.List; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.journal.SequentialFileFactory; -import org.apache.activemq6.core.settings.HierarchicalRepository; -import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.journal.SequentialFileFactory; +import org.apache.activemq.core.settings.HierarchicalRepository; +import org.apache.activemq.core.settings.impl.AddressSettings; /** * The integration point between the PagingManger and the File System (aka SequentialFiles) http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/LivePageCache.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/LivePageCache.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/LivePageCache.java index 25dd7af..a3ed61e 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/LivePageCache.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/LivePageCache.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.paging.cursor; +package org.apache.activemq.core.paging.cursor; -import org.apache.activemq6.core.paging.PagedMessage; +import org.apache.activemq.core.paging.PagedMessage; /** * A LivePageCache http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PageCache.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PageCache.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PageCache.java index 1a70fe7..89302ec 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PageCache.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PageCache.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.paging.cursor; +package org.apache.activemq.core.paging.cursor; -import org.apache.activemq6.core.paging.PagedMessage; -import org.apache.activemq6.utils.SoftValueHashMap; +import org.apache.activemq.core.paging.PagedMessage; +import org.apache.activemq.utils.SoftValueHashMap; /** * A PageCache http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PageCursorProvider.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PageCursorProvider.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PageCursorProvider.java index 77d4115..7454b97 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PageCursorProvider.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PageCursorProvider.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.paging.cursor; +package org.apache.activemq.core.paging.cursor; -import org.apache.activemq6.core.filter.Filter; -import org.apache.activemq6.core.paging.PagedMessage; +import org.apache.activemq.core.filter.Filter; +import org.apache.activemq.core.paging.PagedMessage; /** * The provider of Cursor for a given Address http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PagePosition.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PagePosition.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PagePosition.java index 8bee738..a25bafa 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PagePosition.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PagePosition.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.paging.cursor; +package org.apache.activemq.core.paging.cursor; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PageSubscription.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PageSubscription.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PageSubscription.java index 84efbcf..28ff887 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PageSubscription.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PageSubscription.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.paging.cursor; +package org.apache.activemq.core.paging.cursor; import java.util.concurrent.Executor; -import org.apache.activemq6.core.paging.PagedMessage; -import org.apache.activemq6.core.paging.PagingStore; -import org.apache.activemq6.core.paging.impl.Page; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.core.transaction.Transaction; -import org.apache.activemq6.utils.LinkedListIterator; +import org.apache.activemq.core.paging.PagedMessage; +import org.apache.activemq.core.paging.PagingStore; +import org.apache.activemq.core.paging.impl.Page; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.core.transaction.Transaction; +import org.apache.activemq.utils.LinkedListIterator; /** * A PageCursor http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PageSubscriptionCounter.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PageSubscriptionCounter.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PageSubscriptionCounter.java index 7f9d2d2..ed1175f 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PageSubscriptionCounter.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PageSubscriptionCounter.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.paging.cursor; +package org.apache.activemq.core.paging.cursor; -import org.apache.activemq6.core.paging.impl.Page; -import org.apache.activemq6.core.transaction.Transaction; +import org.apache.activemq.core.paging.impl.Page; +import org.apache.activemq.core.transaction.Transaction; /** * A PagingSubscriptionCounterInterface http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PagedReference.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PagedReference.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PagedReference.java index 7f93cfb..5b8d840 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PagedReference.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PagedReference.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.paging.cursor; +package org.apache.activemq.core.paging.cursor; -import org.apache.activemq6.core.paging.PagedMessage; -import org.apache.activemq6.core.server.MessageReference; +import org.apache.activemq.core.paging.PagedMessage; +import org.apache.activemq.core.server.MessageReference; /** * A PagedReference http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PagedReferenceImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PagedReferenceImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PagedReferenceImpl.java index 01d5796..fd9257e 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PagedReferenceImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/PagedReferenceImpl.java @@ -10,17 +10,17 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.paging.cursor; +package org.apache.activemq.core.paging.cursor; import java.lang.ref.WeakReference; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq6.api.core.Message; -import org.apache.activemq6.core.paging.PagedMessage; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.server.MessageReference; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq.api.core.Message; +import org.apache.activemq.core.paging.PagedMessage; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.MessageReference; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.core.server.ServerMessage; /** * A InternalReference @@ -245,7 +245,7 @@ public class PagedReferenceImpl implements PagedReference } /* (non-Javadoc) - * @see org.apache.activemq6.core.server.MessageReference#setConsumerId(java.lang.Long) + * @see org.apache.activemq.core.server.MessageReference#setConsumerId(java.lang.Long) */ @Override public void setConsumerId(Long consumerID) @@ -254,7 +254,7 @@ public class PagedReferenceImpl implements PagedReference } /* (non-Javadoc) - * @see org.apache.activemq6.core.server.MessageReference#getConsumerId() + * @see org.apache.activemq.core.server.MessageReference#getConsumerId() */ @Override public Long getConsumerId() http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/LivePageCacheImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/LivePageCacheImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/LivePageCacheImpl.java index 9e8385f..3bac88e 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/LivePageCacheImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/LivePageCacheImpl.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.paging.cursor.impl; +package org.apache.activemq.core.paging.cursor.impl; import java.util.LinkedList; import java.util.List; -import org.apache.activemq6.core.paging.PagedMessage; -import org.apache.activemq6.core.paging.cursor.LivePageCache; -import org.apache.activemq6.core.paging.impl.Page; -import org.apache.activemq6.core.server.LargeServerMessage; +import org.apache.activemq.core.paging.PagedMessage; +import org.apache.activemq.core.paging.cursor.LivePageCache; +import org.apache.activemq.core.paging.impl.Page; +import org.apache.activemq.core.server.LargeServerMessage; /** * This is the same as PageCache, however this is for the page that's being currently written. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageCacheImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageCacheImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageCacheImpl.java index 9990e61..7af97a8 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageCacheImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageCacheImpl.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.paging.cursor.impl; +package org.apache.activemq.core.paging.cursor.impl; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.apache.activemq6.core.paging.PagedMessage; -import org.apache.activemq6.core.paging.cursor.PageCache; -import org.apache.activemq6.core.paging.impl.Page; +import org.apache.activemq.core.paging.PagedMessage; +import org.apache.activemq.core.paging.cursor.PageCache; +import org.apache.activemq.core.paging.impl.Page; /** * The caching associated to a single page. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageCursorProviderImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageCursorProviderImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageCursorProviderImpl.java index 309da5b..842c220 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageCursorProviderImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageCursorProviderImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.paging.cursor.impl; +package org.apache.activemq.core.paging.cursor.impl; import java.util.ArrayList; import java.util.Collection; @@ -20,22 +20,22 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq6.core.filter.Filter; -import org.apache.activemq6.core.paging.PagedMessage; -import org.apache.activemq6.core.paging.PagingStore; -import org.apache.activemq6.core.paging.cursor.PageCache; -import org.apache.activemq6.core.paging.cursor.PageCursorProvider; -import org.apache.activemq6.core.paging.cursor.PagePosition; -import org.apache.activemq6.core.paging.cursor.PageSubscription; -import org.apache.activemq6.core.paging.cursor.PagedReference; -import org.apache.activemq6.core.paging.cursor.PagedReferenceImpl; -import org.apache.activemq6.core.paging.impl.Page; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.transaction.Transaction; -import org.apache.activemq6.core.transaction.impl.TransactionImpl; -import org.apache.activemq6.utils.FutureLatch; -import org.apache.activemq6.utils.SoftValueHashMap; +import org.apache.activemq.core.filter.Filter; +import org.apache.activemq.core.paging.PagedMessage; +import org.apache.activemq.core.paging.PagingStore; +import org.apache.activemq.core.paging.cursor.PageCache; +import org.apache.activemq.core.paging.cursor.PageCursorProvider; +import org.apache.activemq.core.paging.cursor.PagePosition; +import org.apache.activemq.core.paging.cursor.PageSubscription; +import org.apache.activemq.core.paging.cursor.PagedReference; +import org.apache.activemq.core.paging.cursor.PagedReferenceImpl; +import org.apache.activemq.core.paging.impl.Page; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.transaction.Transaction; +import org.apache.activemq.core.transaction.impl.TransactionImpl; +import org.apache.activemq.utils.FutureLatch; +import org.apache.activemq.utils.SoftValueHashMap; /** * A PageProviderIMpl * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PagePositionImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PagePositionImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PagePositionImpl.java index 5a51b12..7de257f 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PagePositionImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PagePositionImpl.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.paging.cursor.impl; +package org.apache.activemq.core.paging.cursor.impl; -import org.apache.activemq6.core.paging.cursor.PagePosition; +import org.apache.activemq.core.paging.cursor.PagePosition; /** * A PagePosition http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageSubscriptionCounterImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageSubscriptionCounterImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageSubscriptionCounterImpl.java index 8f945a5..57f43ea 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageSubscriptionCounterImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageSubscriptionCounterImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.paging.cursor.impl; +package org.apache.activemq.core.paging.cursor.impl; import java.util.ArrayList; import java.util.HashMap; @@ -20,17 +20,17 @@ import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import org.apache.activemq6.api.core.Pair; -import org.apache.activemq6.core.paging.cursor.PageSubscription; -import org.apache.activemq6.core.paging.cursor.PageSubscriptionCounter; -import org.apache.activemq6.core.paging.impl.Page; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.transaction.Transaction; -import org.apache.activemq6.core.transaction.TransactionOperation; -import org.apache.activemq6.core.transaction.TransactionOperationAbstract; -import org.apache.activemq6.core.transaction.TransactionPropertyIndexes; -import org.apache.activemq6.core.transaction.impl.TransactionImpl; +import org.apache.activemq.api.core.Pair; +import org.apache.activemq.core.paging.cursor.PageSubscription; +import org.apache.activemq.core.paging.cursor.PageSubscriptionCounter; +import org.apache.activemq.core.paging.impl.Page; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.transaction.Transaction; +import org.apache.activemq.core.transaction.TransactionOperation; +import org.apache.activemq.core.transaction.TransactionOperationAbstract; +import org.apache.activemq.core.transaction.TransactionPropertyIndexes; +import org.apache.activemq.core.transaction.impl.TransactionImpl; /** * This class will encapsulate the persistent counters for the PagingSubscription http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageSubscriptionImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageSubscriptionImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageSubscriptionImpl.java index 2b08132..2f93ffe 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageSubscriptionImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/paging/cursor/impl/PageSubscriptionImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.paging.cursor.impl; +package org.apache.activemq.core.paging.cursor.impl; import java.lang.ref.WeakReference; import java.util.ArrayList; @@ -28,30 +28,30 @@ import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import org.apache.activemq6.core.filter.Filter; -import org.apache.activemq6.core.journal.IOAsyncTask; -import org.apache.activemq6.core.paging.PageTransactionInfo; -import org.apache.activemq6.core.paging.PagedMessage; -import org.apache.activemq6.core.paging.PagingStore; -import org.apache.activemq6.core.paging.cursor.PageCache; -import org.apache.activemq6.core.paging.cursor.PageCursorProvider; -import org.apache.activemq6.core.paging.cursor.PagePosition; -import org.apache.activemq6.core.paging.cursor.PageSubscription; -import org.apache.activemq6.core.paging.cursor.PageSubscriptionCounter; -import org.apache.activemq6.core.paging.cursor.PagedReference; -import org.apache.activemq6.core.paging.impl.Page; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.server.MessageReference; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.core.transaction.Transaction; -import org.apache.activemq6.core.transaction.TransactionOperationAbstract; -import org.apache.activemq6.core.transaction.TransactionPropertyIndexes; -import org.apache.activemq6.core.transaction.impl.TransactionImpl; -import org.apache.activemq6.utils.ConcurrentHashSet; -import org.apache.activemq6.utils.FutureLatch; -import org.apache.activemq6.utils.LinkedListIterator; +import org.apache.activemq.core.filter.Filter; +import org.apache.activemq.core.journal.IOAsyncTask; +import org.apache.activemq.core.paging.PageTransactionInfo; +import org.apache.activemq.core.paging.PagedMessage; +import org.apache.activemq.core.paging.PagingStore; +import org.apache.activemq.core.paging.cursor.PageCache; +import org.apache.activemq.core.paging.cursor.PageCursorProvider; +import org.apache.activemq.core.paging.cursor.PagePosition; +import org.apache.activemq.core.paging.cursor.PageSubscription; +import org.apache.activemq.core.paging.cursor.PageSubscriptionCounter; +import org.apache.activemq.core.paging.cursor.PagedReference; +import org.apache.activemq.core.paging.impl.Page; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.MessageReference; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.core.transaction.Transaction; +import org.apache.activemq.core.transaction.TransactionOperationAbstract; +import org.apache.activemq.core.transaction.TransactionPropertyIndexes; +import org.apache.activemq.core.transaction.impl.TransactionImpl; +import org.apache.activemq.utils.ConcurrentHashSet; +import org.apache.activemq.utils.FutureLatch; +import org.apache.activemq.utils.LinkedListIterator; /** * A PageCursorImpl http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/Page.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/Page.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/Page.java index ab0979c..4f0dd1c 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/Page.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/Page.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.paging.impl; +package org.apache.activemq.core.paging.impl; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -18,20 +18,20 @@ import java.util.List; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.HornetQBuffers; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.journal.SequentialFile; -import org.apache.activemq6.core.journal.SequentialFileFactory; -import org.apache.activemq6.core.paging.PagedMessage; -import org.apache.activemq6.core.paging.cursor.LivePageCache; -import org.apache.activemq6.core.paging.cursor.PageSubscriptionCounter; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.server.HornetQMessageBundle; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.server.LargeServerMessage; -import org.apache.activemq6.utils.ConcurrentHashSet; -import org.apache.activemq6.utils.DataConstants; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.HornetQBuffers; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.journal.SequentialFile; +import org.apache.activemq.core.journal.SequentialFileFactory; +import org.apache.activemq.core.paging.PagedMessage; +import org.apache.activemq.core.paging.cursor.LivePageCache; +import org.apache.activemq.core.paging.cursor.PageSubscriptionCounter; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.server.HornetQMessageBundle; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.LargeServerMessage; +import org.apache.activemq.utils.ConcurrentHashSet; +import org.apache.activemq.utils.DataConstants; /** * @author <a href="mailto:[email protected]";>Clebert Suconic</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PageSyncTimer.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PageSyncTimer.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PageSyncTimer.java index 8b890c9..e6e8d1e 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PageSyncTimer.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PageSyncTimer.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.paging.impl; +package org.apache.activemq.core.paging.impl; import java.util.LinkedList; import java.util.List; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import org.apache.activemq6.api.core.HornetQExceptionType; -import org.apache.activemq6.core.paging.PagingStore; -import org.apache.activemq6.core.persistence.OperationContext; +import org.apache.activemq.api.core.HornetQExceptionType; +import org.apache.activemq.core.paging.PagingStore; +import org.apache.activemq.core.persistence.OperationContext; /** * This will batch multiple calls waiting to perform a sync in a single call. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PageTransactionInfoImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PageTransactionInfoImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PageTransactionInfoImpl.java index 51190da..172d919 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PageTransactionInfoImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PageTransactionInfoImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.paging.impl; +package org.apache.activemq.core.paging.impl; import java.util.HashMap; import java.util.LinkedList; @@ -18,18 +18,18 @@ import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.Pair; -import org.apache.activemq6.core.paging.PageTransactionInfo; -import org.apache.activemq6.core.paging.PagingManager; -import org.apache.activemq6.core.paging.cursor.PagePosition; -import org.apache.activemq6.core.paging.cursor.PageSubscription; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.transaction.Transaction; -import org.apache.activemq6.core.transaction.TransactionOperationAbstract; -import org.apache.activemq6.core.transaction.TransactionPropertyIndexes; -import org.apache.activemq6.utils.DataConstants; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.Pair; +import org.apache.activemq.core.paging.PageTransactionInfo; +import org.apache.activemq.core.paging.PagingManager; +import org.apache.activemq.core.paging.cursor.PagePosition; +import org.apache.activemq.core.paging.cursor.PageSubscription; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.transaction.Transaction; +import org.apache.activemq.core.transaction.TransactionOperationAbstract; +import org.apache.activemq.core.transaction.TransactionPropertyIndexes; +import org.apache.activemq.utils.DataConstants; /** * @author <a href="mailto:[email protected]";>Clebert Suconic</a> @@ -160,7 +160,7 @@ public final class PageTransactionInfoImpl implements PageTransactionInfo /* * This is to be used after paging. We will update the PageTransactions until they get all the messages delivered. On that case we will delete the page TX * (non-Javadoc) - * @see org.apache.activemq6.core.paging.PageTransactionInfo#storeUpdate(org.apache.activemq6.core.persistence.StorageManager, org.apache.activemq6.core.transaction.Transaction, int) + * @see org.apache.activemq.core.paging.PageTransactionInfo#storeUpdate(org.apache.activemq.core.persistence.StorageManager, org.apache.activemq.core.transaction.Transaction, int) */ public void storeUpdate(final StorageManager storageManager, final PagingManager pagingManager, final Transaction tx) throws Exception { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagedMessageImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagedMessageImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagedMessageImpl.java index 99de370..a7c8b3f 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagedMessageImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagedMessageImpl.java @@ -10,18 +10,18 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.paging.impl; +package org.apache.activemq.core.paging.impl; import java.util.Arrays; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.HornetQBuffers; -import org.apache.activemq6.core.paging.PagedMessage; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.server.LargeServerMessage; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.core.server.impl.ServerMessageImpl; -import org.apache.activemq6.utils.DataConstants; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.HornetQBuffers; +import org.apache.activemq.core.paging.PagedMessage; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.server.LargeServerMessage; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.core.server.impl.ServerMessageImpl; +import org.apache.activemq.utils.DataConstants; /** * This class represents a paged message http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingManagerImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingManagerImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingManagerImpl.java index 6e39b82..ea87e28 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingManagerImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingManagerImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.paging.impl; +package org.apache.activemq.core.paging.impl; import java.util.List; import java.util.Map; @@ -19,14 +19,14 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.paging.PageTransactionInfo; -import org.apache.activemq6.core.paging.PagingManager; -import org.apache.activemq6.core.paging.PagingStore; -import org.apache.activemq6.core.paging.PagingStoreFactory; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.settings.HierarchicalRepository; -import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.paging.PageTransactionInfo; +import org.apache.activemq.core.paging.PagingManager; +import org.apache.activemq.core.paging.PagingStore; +import org.apache.activemq.core.paging.PagingStoreFactory; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.settings.HierarchicalRepository; +import org.apache.activemq.core.settings.impl.AddressSettings; /** * @author <a href="mailto:[email protected]";>Clebert Suconic</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingStoreFactoryNIO.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingStoreFactoryNIO.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingStoreFactoryNIO.java index c3e38f8..7a427ba 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingStoreFactoryNIO.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingStoreFactoryNIO.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.paging.impl; +package org.apache.activemq.core.paging.impl; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -24,19 +24,19 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.ScheduledExecutorService; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.journal.IOCriticalErrorListener; -import org.apache.activemq6.core.journal.SequentialFileFactory; -import org.apache.activemq6.core.journal.impl.NIOSequentialFileFactory; -import org.apache.activemq6.core.paging.PagingManager; -import org.apache.activemq6.core.paging.PagingStore; -import org.apache.activemq6.core.paging.PagingStoreFactory; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.settings.HierarchicalRepository; -import org.apache.activemq6.core.settings.impl.AddressSettings; -import org.apache.activemq6.utils.ExecutorFactory; -import org.apache.activemq6.utils.UUIDGenerator; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.journal.IOCriticalErrorListener; +import org.apache.activemq.core.journal.SequentialFileFactory; +import org.apache.activemq.core.journal.impl.NIOSequentialFileFactory; +import org.apache.activemq.core.paging.PagingManager; +import org.apache.activemq.core.paging.PagingStore; +import org.apache.activemq.core.paging.PagingStoreFactory; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.settings.HierarchicalRepository; +import org.apache.activemq.core.settings.impl.AddressSettings; +import org.apache.activemq.utils.ExecutorFactory; +import org.apache.activemq.utils.UUIDGenerator; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingStoreImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingStoreImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingStoreImpl.java index 2b0c66c..7609165 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingStoreImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagingStoreImpl.java @@ -10,34 +10,34 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.paging.impl; - -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.journal.SequentialFile; -import org.apache.activemq6.core.journal.SequentialFileFactory; -import org.apache.activemq6.core.paging.PageTransactionInfo; -import org.apache.activemq6.core.paging.PagedMessage; -import org.apache.activemq6.core.paging.PagingManager; -import org.apache.activemq6.core.paging.PagingStore; -import org.apache.activemq6.core.paging.PagingStoreFactory; -import org.apache.activemq6.core.paging.cursor.LivePageCache; -import org.apache.activemq6.core.paging.cursor.PageCursorProvider; -import org.apache.activemq6.core.paging.cursor.impl.LivePageCacheImpl; -import org.apache.activemq6.core.paging.cursor.impl.PageCursorProviderImpl; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.replication.ReplicationManager; -import org.apache.activemq6.core.server.HornetQMessageBundle; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.server.LargeServerMessage; -import org.apache.activemq6.core.server.MessageReference; -import org.apache.activemq6.core.server.RouteContextList; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; -import org.apache.activemq6.core.settings.impl.AddressSettings; -import org.apache.activemq6.core.transaction.Transaction; -import org.apache.activemq6.core.transaction.TransactionOperation; -import org.apache.activemq6.core.transaction.TransactionPropertyIndexes; -import org.apache.activemq6.utils.FutureLatch; +package org.apache.activemq.core.paging.impl; + +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.journal.SequentialFile; +import org.apache.activemq.core.journal.SequentialFileFactory; +import org.apache.activemq.core.paging.PageTransactionInfo; +import org.apache.activemq.core.paging.PagedMessage; +import org.apache.activemq.core.paging.PagingManager; +import org.apache.activemq.core.paging.PagingStore; +import org.apache.activemq.core.paging.PagingStoreFactory; +import org.apache.activemq.core.paging.cursor.LivePageCache; +import org.apache.activemq.core.paging.cursor.PageCursorProvider; +import org.apache.activemq.core.paging.cursor.impl.LivePageCacheImpl; +import org.apache.activemq.core.paging.cursor.impl.PageCursorProviderImpl; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.replication.ReplicationManager; +import org.apache.activemq.core.server.HornetQMessageBundle; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.LargeServerMessage; +import org.apache.activemq.core.server.MessageReference; +import org.apache.activemq.core.server.RouteContextList; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq.core.settings.impl.AddressSettings; +import org.apache.activemq.core.transaction.Transaction; +import org.apache.activemq.core.transaction.TransactionOperation; +import org.apache.activemq.core.transaction.TransactionPropertyIndexes; +import org.apache.activemq.utils.FutureLatch; import java.text.DecimalFormat; import java.util.ArrayList; @@ -969,18 +969,18 @@ public class PagingStoreImpl implements PagingStore private long[] routeQueues(Transaction tx, RouteContextList ctx) throws Exception { - List<org.apache.activemq6.core.server.Queue> durableQueues = ctx.getDurableQueues(); - List<org.apache.activemq6.core.server.Queue> nonDurableQueues = ctx.getNonDurableQueues(); + List<org.apache.activemq.core.server.Queue> durableQueues = ctx.getDurableQueues(); + List<org.apache.activemq.core.server.Queue> nonDurableQueues = ctx.getNonDurableQueues(); long[] ids = new long[durableQueues.size() + nonDurableQueues.size()]; int i = 0; - for (org.apache.activemq6.core.server.Queue q : durableQueues) + for (org.apache.activemq.core.server.Queue q : durableQueues) { q.getPageSubscription().notEmpty(); ids[i++] = q.getID(); } - for (org.apache.activemq6.core.server.Queue q : nonDurableQueues) + for (org.apache.activemq.core.server.Queue q : nonDurableQueues) { q.getPageSubscription().getCounter().increment(tx, 1); q.getPageSubscription().notEmpty(); @@ -998,9 +998,9 @@ public class PagingStoreImpl implements PagingStore */ private void applyPageCounters(Transaction tx, Page page, RouteContextList ctx) throws Exception { - List<org.apache.activemq6.core.server.Queue> durableQueues = ctx.getDurableQueues(); - List<org.apache.activemq6.core.server.Queue> nonDurableQueues = ctx.getNonDurableQueues(); - for (org.apache.activemq6.core.server.Queue q : durableQueues) + List<org.apache.activemq.core.server.Queue> durableQueues = ctx.getDurableQueues(); + List<org.apache.activemq.core.server.Queue> nonDurableQueues = ctx.getNonDurableQueues(); + for (org.apache.activemq.core.server.Queue q : durableQueues) { if (tx == null) { @@ -1015,7 +1015,7 @@ public class PagingStoreImpl implements PagingStore } } - for (org.apache.activemq6.core.server.Queue q : nonDurableQueues) + for (org.apache.activemq.core.server.Queue q : nonDurableQueues) { q.getPageSubscription().getCounter().increment(tx, 1); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/persistence/GroupingInfo.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/GroupingInfo.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/GroupingInfo.java index 76c6bae..286c824 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/GroupingInfo.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/persistence/GroupingInfo.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.persistence; +package org.apache.activemq.core.persistence; -import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq.api.core.SimpleString; /** * @author <a href="mailto:[email protected]";>Andy Taylor</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/persistence/OperationContext.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/OperationContext.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/OperationContext.java index 85a1f20..e75d47b 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/OperationContext.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/persistence/OperationContext.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.persistence; +package org.apache.activemq.core.persistence; -import org.apache.activemq6.core.journal.IOAsyncTask; -import org.apache.activemq6.core.journal.IOCompletion; +import org.apache.activemq.core.journal.IOAsyncTask; +import org.apache.activemq.core.journal.IOCompletion; /** * This represents a set of operations done as part of replication. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/persistence/QueueBindingInfo.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/QueueBindingInfo.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/QueueBindingInfo.java index 361edda..9b8967f 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/QueueBindingInfo.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/persistence/QueueBindingInfo.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.persistence; +package org.apache.activemq.core.persistence; -import org.apache.activemq6.api.core.SimpleString; +import org.apache.activemq.api.core.SimpleString; /** * A QueueBindingInfo http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/persistence/StorageManager.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/StorageManager.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/StorageManager.java index 50d35d6..77415a4 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/StorageManager.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/persistence/StorageManager.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.persistence; +package org.apache.activemq.core.persistence; import javax.transaction.xa.Xid; import java.nio.ByteBuffer; @@ -19,34 +19,34 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.Executor; -import org.apache.activemq6.api.core.Pair; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.journal.IOAsyncTask; -import org.apache.activemq6.core.journal.Journal; -import org.apache.activemq6.core.journal.JournalLoadInformation; -import org.apache.activemq6.core.journal.SequentialFile; -import org.apache.activemq6.core.message.impl.MessageInternal; -import org.apache.activemq6.core.paging.PageTransactionInfo; -import org.apache.activemq6.core.paging.PagedMessage; -import org.apache.activemq6.core.paging.PagingManager; -import org.apache.activemq6.core.paging.PagingStore; -import org.apache.activemq6.core.paging.cursor.PagePosition; -import org.apache.activemq6.core.persistence.config.PersistedAddressSetting; -import org.apache.activemq6.core.persistence.config.PersistedRoles; -import org.apache.activemq6.core.persistence.impl.PageCountPending; -import org.apache.activemq6.core.postoffice.Binding; -import org.apache.activemq6.core.postoffice.PostOffice; -import org.apache.activemq6.core.replication.ReplicationManager; -import org.apache.activemq6.core.server.HornetQComponent; -import org.apache.activemq6.core.server.LargeServerMessage; -import org.apache.activemq6.core.server.MessageReference; -import org.apache.activemq6.core.server.RouteContextList; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.core.server.group.impl.GroupBinding; -import org.apache.activemq6.core.server.impl.JournalLoader; -import org.apache.activemq6.core.transaction.ResourceManager; -import org.apache.activemq6.core.transaction.Transaction; -import org.apache.activemq6.utils.IDGenerator; +import org.apache.activemq.api.core.Pair; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.journal.IOAsyncTask; +import org.apache.activemq.core.journal.Journal; +import org.apache.activemq.core.journal.JournalLoadInformation; +import org.apache.activemq.core.journal.SequentialFile; +import org.apache.activemq.core.message.impl.MessageInternal; +import org.apache.activemq.core.paging.PageTransactionInfo; +import org.apache.activemq.core.paging.PagedMessage; +import org.apache.activemq.core.paging.PagingManager; +import org.apache.activemq.core.paging.PagingStore; +import org.apache.activemq.core.paging.cursor.PagePosition; +import org.apache.activemq.core.persistence.config.PersistedAddressSetting; +import org.apache.activemq.core.persistence.config.PersistedRoles; +import org.apache.activemq.core.persistence.impl.PageCountPending; +import org.apache.activemq.core.postoffice.Binding; +import org.apache.activemq.core.postoffice.PostOffice; +import org.apache.activemq.core.replication.ReplicationManager; +import org.apache.activemq.core.server.HornetQComponent; +import org.apache.activemq.core.server.LargeServerMessage; +import org.apache.activemq.core.server.MessageReference; +import org.apache.activemq.core.server.RouteContextList; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.core.server.group.impl.GroupBinding; +import org.apache.activemq.core.server.impl.JournalLoader; +import org.apache.activemq.core.transaction.ResourceManager; +import org.apache.activemq.core.transaction.Transaction; +import org.apache.activemq.utils.IDGenerator; /** * A StorageManager @@ -342,7 +342,7 @@ public interface StorageManager extends IDGenerator, HornetQComponent Journal getMessageJournal(); /** - * @see org.apache.activemq6.core.persistence.impl.journal.JournalStorageManager#startReplication(org.apache.activemq6.core.replication.ReplicationManager, org.apache.activemq6.core.paging.PagingManager, String, boolean) + * @see org.apache.activemq.core.persistence.impl.journal.JournalStorageManager#startReplication(org.apache.activemq.core.replication.ReplicationManager, org.apache.activemq.core.paging.PagingManager, String, boolean) */ void startReplication(ReplicationManager replicationManager, PagingManager pagingManager, String nodeID, boolean autoFailBack) throws Exception; @@ -402,10 +402,10 @@ public interface StorageManager extends IDGenerator, HornetQComponent void readUnLock(); /** - * Closes the {@link org.apache.activemq6.utils.IDGenerator} persisting the current record ID. + * Closes the {@link org.apache.activemq.utils.IDGenerator} persisting the current record ID. * <p/> * Effectively a "pre-stop" method. Necessary due to the "stop"-order at - * {@link org.apache.activemq6.core.server.impl.HornetQServerImpl} + * {@link org.apache.activemq.core.server.impl.HornetQServerImpl} */ void persistIdGenerator(); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/persistence/config/PersistedAddressSetting.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/config/PersistedAddressSetting.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/config/PersistedAddressSetting.java index a400015..374cbef 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/config/PersistedAddressSetting.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/persistence/config/PersistedAddressSetting.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.persistence.config; +package org.apache.activemq.core.persistence.config; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.journal.EncodingSupport; -import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.journal.EncodingSupport; +import org.apache.activemq.core.settings.impl.AddressSettings; /** * A PersistedAddressSetting http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/persistence/config/PersistedRoles.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/config/PersistedRoles.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/config/PersistedRoles.java index 5eadf5c..302b031 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/config/PersistedRoles.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/persistence/config/PersistedRoles.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.persistence.config; +package org.apache.activemq.core.persistence.config; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.journal.EncodingSupport; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.journal.EncodingSupport; /** * A ConfiguredRoles http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/PageCountPending.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/PageCountPending.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/PageCountPending.java index 826b7ed..7dbc660 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/PageCountPending.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/PageCountPending.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.persistence.impl; +package org.apache.activemq.core.persistence.impl; /** * @author Clebert Suconic
