You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2014/11/19 00:38:03 UTC
[10/52] [abbrv] [partial] activemq-6 git commit: ACTIVEMQ6-4 Rename
HornetQ* classes to ActiveMQ*
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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
deleted file mode 100644
index e5efd6b..0000000
--- a/activemq-server/src/main/java/org/apache/activemq/core/management/impl/HornetQServerControlImpl.java
+++ /dev/null
@@ -1,2187 +0,0 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat licenses this file to you under the Apache License, version
- * 2.0 (the "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-package org.apache.activemq.core.management.impl;
-
-import java.text.DateFormat;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicLong;
-
-import javax.management.ListenerNotFoundException;
-import javax.management.MBeanNotificationInfo;
-import javax.management.MBeanOperationInfo;
-import javax.management.Notification;
-import javax.management.NotificationBroadcasterSupport;
-import javax.management.NotificationEmitter;
-import javax.management.NotificationFilter;
-import javax.management.NotificationListener;
-import javax.transaction.xa.Xid;
-
-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:jmesnil@redhat.com">Jeff Mesnil</a>
- *
- *
- */
-public class HornetQServerControlImpl extends AbstractControl implements HornetQServerControl, NotificationEmitter,
- org.apache.activemq.core.server.management.NotificationListener
-{
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- private final PostOffice postOffice;
-
- private final Configuration configuration;
-
- private final ResourceManager resourceManager;
-
- private final RemotingService remotingService;
-
- private final HornetQServer server;
-
- private final MessageCounterManager messageCounterManager;
-
- private final NotificationBroadcasterSupport broadcaster;
-
- private final AtomicLong notifSeq = new AtomicLong(0);
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- public HornetQServerControlImpl(final PostOffice postOffice,
- final Configuration configuration,
- final ResourceManager resourceManager,
- final RemotingService remotingService,
- final HornetQServer messagingServer,
- final MessageCounterManager messageCounterManager,
- final StorageManager storageManager,
- final NotificationBroadcasterSupport broadcaster) throws Exception
- {
- super(HornetQServerControl.class, storageManager);
- this.postOffice = postOffice;
- this.configuration = configuration;
- this.resourceManager = resourceManager;
- this.remotingService = remotingService;
- server = messagingServer;
- this.messageCounterManager = messageCounterManager;
- this.broadcaster = broadcaster;
- server.getManagementService().addNotificationListener(this);
- }
-
- // HornetQServerControlMBean implementation --------------------
-
- public boolean isStarted()
- {
- clearIO();
- try
- {
- return server.isStarted();
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public String getVersion()
- {
- checkStarted();
-
- clearIO();
- try
- {
- return server.getVersion().getFullVersion();
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public boolean isBackup()
- {
- checkStarted();
-
- clearIO();
- try
- {
- return server.getHAPolicy().isBackup();
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public boolean isSharedStore()
- {
- checkStarted();
-
- clearIO();
- try
- {
- return server.getHAPolicy().isSharedStore();
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public String getBindingsDirectory()
- {
- checkStarted();
-
- clearIO();
- try
- {
- return configuration.getBindingsDirectory();
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public String[] getInterceptorClassNames()
- {
- checkStarted();
-
- clearIO();
- try
- {
- return configuration.getIncomingInterceptorClassNames().toArray(new String[configuration.getIncomingInterceptorClassNames()
- .size()]);
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public String[] getIncomingInterceptorClassNames()
- {
- checkStarted();
-
- clearIO();
- try
- {
- return configuration.getIncomingInterceptorClassNames().toArray(new String[configuration.getIncomingInterceptorClassNames()
- .size()]);
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public String[] getOutgoingInterceptorClassNames()
- {
- checkStarted();
-
- clearIO();
- try
- {
- return configuration.getOutgoingInterceptorClassNames().toArray(new String[configuration.getOutgoingInterceptorClassNames()
- .size()]);
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public int getJournalBufferSize()
- {
- checkStarted();
-
- clearIO();
- try
- {
- return configuration.getJournalType() == JournalType.ASYNCIO ? configuration.getJournalBufferSize_AIO()
- : configuration.getJournalBufferSize_NIO();
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public int getJournalBufferTimeout()
- {
- checkStarted();
-
- clearIO();
- try
- {
- return configuration.getJournalType() == JournalType.ASYNCIO ? configuration.getJournalBufferTimeout_AIO()
- : configuration.getJournalBufferTimeout_NIO();
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public void setFailoverOnServerShutdown(boolean failoverOnServerShutdown)
- {
- checkStarted();
-
- clearIO();
- try
- {
- HAPolicy haPolicy = server.getHAPolicy();
- if (haPolicy instanceof SharedStoreSlavePolicy)
- {
- ((SharedStoreSlavePolicy) haPolicy).setFailoverOnServerShutdown(failoverOnServerShutdown);
- }
- }
- finally
- {
- blockOnIO();
- }
- }
-
-
- public boolean isFailoverOnServerShutdown()
- {
- checkStarted();
-
- clearIO();
- try
- {
- HAPolicy haPolicy = server.getHAPolicy();
- if (haPolicy instanceof SharedStoreSlavePolicy)
- {
- return ((SharedStoreSlavePolicy) haPolicy).isFailoverOnServerShutdown();
- }
- else
- {
- return false;
- }
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public int getJournalMaxIO()
- {
- checkStarted();
-
- clearIO();
- try
- {
- return configuration.getJournalType() == JournalType.ASYNCIO ? configuration.getJournalMaxIO_AIO()
- : configuration.getJournalMaxIO_NIO();
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public String getJournalDirectory()
- {
- checkStarted();
-
- clearIO();
- try
- {
- return configuration.getJournalDirectory();
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public int getJournalFileSize()
- {
- checkStarted();
-
- clearIO();
- try
- {
- return configuration.getJournalFileSize();
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public int getJournalMinFiles()
- {
- checkStarted();
-
- clearIO();
- try
- {
- return configuration.getJournalMinFiles();
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public int getJournalCompactMinFiles()
- {
- checkStarted();
-
- clearIO();
- try
- {
- return configuration.getJournalCompactMinFiles();
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public int getJournalCompactPercentage()
- {
- checkStarted();
-
- clearIO();
- try
- {
- return configuration.getJournalCompactPercentage();
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public boolean isPersistenceEnabled()
- {
- checkStarted();
-
- clearIO();
- try
- {
- return configuration.isPersistenceEnabled();
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public String getJournalType()
- {
- checkStarted();
-
- clearIO();
- try
- {
- return configuration.getJournalType().toString();
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public String getPagingDirectory()
- {
- checkStarted();
-
- clearIO();
- try
- {
- return configuration.getPagingDirectory();
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public int getScheduledThreadPoolMaxSize()
- {
- checkStarted();
-
- clearIO();
- try
- {
- return configuration.getScheduledThreadPoolMaxSize();
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public int getThreadPoolMaxSize()
- {
- checkStarted();
-
- clearIO();
- try
- {
- return configuration.getThreadPoolMaxSize();
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public long getSecurityInvalidationInterval()
- {
- checkStarted();
-
- clearIO();
- try
- {
- return configuration.getSecurityInvalidationInterval();
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public boolean isClustered()
- {
- checkStarted();
-
- clearIO();
- try
- {
- return configuration.isClustered();
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public boolean isCreateBindingsDir()
- {
- checkStarted();
-
- clearIO();
- try
- {
- return configuration.isCreateBindingsDir();
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public boolean isCreateJournalDir()
- {
- checkStarted();
-
- clearIO();
- try
- {
- return configuration.isCreateJournalDir();
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public boolean isJournalSyncNonTransactional()
- {
- checkStarted();
-
- clearIO();
- try
- {
- return configuration.isJournalSyncNonTransactional();
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public boolean isJournalSyncTransactional()
- {
- checkStarted();
-
- clearIO();
- try
- {
- return configuration.isJournalSyncTransactional();
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public boolean isSecurityEnabled()
- {
- checkStarted();
-
- clearIO();
- try
- {
- return configuration.isSecurityEnabled();
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public boolean isAsyncConnectionExecutionEnabled()
- {
- checkStarted();
-
- clearIO();
- try
- {
- return configuration.isAsyncConnectionExecutionEnabled();
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public void deployQueue(final String address, final String name, final String filterString) throws Exception
- {
- checkStarted();
-
- clearIO();
- try
- {
- server.deployQueue(new SimpleString(address),
- new SimpleString(name),
- new SimpleString(filterString),
- true,
- false);
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public void deployQueue(final String address, final String name, final String filterStr, final boolean durable) throws Exception
- {
- checkStarted();
-
- SimpleString filter = filterStr == null ? null : new SimpleString(filterStr);
- clearIO();
- try
- {
-
- server.deployQueue(new SimpleString(address), new SimpleString(name), filter, durable, false);
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public void createQueue(final String address, final String name) throws Exception
- {
- checkStarted();
-
- clearIO();
- try
- {
- server.createQueue(new SimpleString(address), new SimpleString(name), null, true, false);
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public void createQueue(final String address, final String name, final boolean durable) throws Exception
- {
- checkStarted();
-
- clearIO();
- try
- {
- server.createQueue(new SimpleString(address), new SimpleString(name), null, durable, false);
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public void createQueue(final String address, final String name, final String filterStr, final boolean durable) throws Exception
- {
- checkStarted();
-
- clearIO();
- try
- {
- SimpleString filter = null;
- if (filterStr != null && !filterStr.trim().equals(""))
- {
- filter = new SimpleString(filterStr);
- }
-
- server.createQueue(new SimpleString(address), new SimpleString(name), filter, durable, false);
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public String[] getQueueNames()
- {
- checkStarted();
-
- clearIO();
- try
- {
- Object[] queues = server.getManagementService().getResources(QueueControl.class);
- String[] names = new String[queues.length];
- for (int i = 0; i < queues.length; i++)
- {
- QueueControl queue = (QueueControl) queues[i];
- names[i] = queue.getName();
- }
-
- return names;
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public String[] getAddressNames()
- {
- checkStarted();
-
- clearIO();
- try
- {
- Object[] addresses = server.getManagementService().getResources(AddressControl.class);
- String[] names = new String[addresses.length];
- for (int i = 0; i < addresses.length; i++)
- {
- AddressControl address = (AddressControl) addresses[i];
- names[i] = address.getAddress();
- }
-
- return names;
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public void destroyQueue(final String name) throws Exception
- {
- checkStarted();
-
- clearIO();
- try
- {
- SimpleString queueName = new SimpleString(name);
-
- server.destroyQueue(queueName, null, true);
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public int getConnectionCount()
- {
- checkStarted();
-
- clearIO();
- try
- {
- return server.getConnectionCount();
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public void enableMessageCounters()
- {
- checkStarted();
-
- clearIO();
- try
- {
- setMessageCounterEnabled(true);
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public void disableMessageCounters()
- {
- checkStarted();
-
- clearIO();
- try
- {
- setMessageCounterEnabled(false);
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public void resetAllMessageCounters()
- {
- checkStarted();
-
- clearIO();
- try
- {
- messageCounterManager.resetAllCounters();
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public void resetAllMessageCounterHistories()
- {
- checkStarted();
-
- clearIO();
- try
- {
- messageCounterManager.resetAllCounterHistories();
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public boolean isMessageCounterEnabled()
- {
- checkStarted();
-
- clearIO();
- try
- {
- return configuration.isMessageCounterEnabled();
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public synchronized long getMessageCounterSamplePeriod()
- {
- checkStarted();
-
- clearIO();
- try
- {
- return messageCounterManager.getSamplePeriod();
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public synchronized void setMessageCounterSamplePeriod(final long newPeriod)
- {
- checkStarted();
-
- checkStarted();
-
- clearIO();
- try
- {
- if (newPeriod < MessageCounterManagerImpl.MIN_SAMPLE_PERIOD)
- {
- throw HornetQMessageBundle.BUNDLE.invalidMessageCounterPeriod(MessageCounterManagerImpl.MIN_SAMPLE_PERIOD);
- }
-
- if (messageCounterManager != null && newPeriod != messageCounterManager.getSamplePeriod())
- {
- messageCounterManager.reschedule(newPeriod);
- }
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public int getMessageCounterMaxDayCount()
- {
- checkStarted();
-
- clearIO();
- try
- {
- return messageCounterManager.getMaxDayCount();
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public void setMessageCounterMaxDayCount(final int count)
- {
- checkStarted();
-
- clearIO();
- try
- {
- if (count <= 0)
- {
- throw HornetQMessageBundle.BUNDLE.greaterThanZero(count);
- }
- messageCounterManager.setMaxDayCount(count);
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public String[] listPreparedTransactions()
- {
- checkStarted();
-
- clearIO();
- try
- {
- DateFormat dateFormat = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.MEDIUM);
-
- Map<Xid, Long> xids = resourceManager.getPreparedTransactionsWithCreationTime();
- ArrayList<Entry<Xid, Long>> xidsSortedByCreationTime = new ArrayList<Map.Entry<Xid, Long>>(xids.entrySet());
- Collections.sort(xidsSortedByCreationTime, new Comparator<Entry<Xid, Long>>()
- {
- public int compare(final Entry<Xid, Long> entry1, final Entry<Xid, Long> entry2)
- {
- // sort by creation time, oldest first
- return (int) (entry1.getValue() - entry2.getValue());
- }
- });
- String[] s = new String[xidsSortedByCreationTime.size()];
- int i = 0;
- for (Map.Entry<Xid, Long> entry : xidsSortedByCreationTime)
- {
- Date creation = new Date(entry.getValue());
- Xid xid = entry.getKey();
- s[i++] = dateFormat.format(creation) + " base64: " + XidImpl.toBase64String(xid) + " " + xid.toString();
- }
- return s;
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public String listPreparedTransactionDetailsAsJSON() throws Exception
- {
- checkStarted();
-
- clearIO();
- try
- {
- Map<Xid, Long> xids = resourceManager.getPreparedTransactionsWithCreationTime();
- if (xids == null || xids.size() == 0)
- {
- return "";
- }
-
- ArrayList<Entry<Xid, Long>> xidsSortedByCreationTime = new ArrayList<Map.Entry<Xid, Long>>(xids.entrySet());
- Collections.sort(xidsSortedByCreationTime, new Comparator<Entry<Xid, Long>>()
- {
- public int compare(final Entry<Xid, Long> entry1, final Entry<Xid, Long> entry2)
- {
- // sort by creation time, oldest first
- return (int) (entry1.getValue() - entry2.getValue());
- }
- });
-
- JSONArray txDetailListJson = new JSONArray();
- for (Map.Entry<Xid, Long> entry : xidsSortedByCreationTime)
- {
- Xid xid = entry.getKey();
- TransactionDetail detail = new CoreTransactionDetail(xid,
- resourceManager.getTransaction(xid),
- entry.getValue());
-
- txDetailListJson.put(detail.toJSON());
- }
- return txDetailListJson.toString();
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public String listPreparedTransactionDetailsAsHTML() throws Exception
- {
- checkStarted();
-
- clearIO();
- try
- {
- Map<Xid, Long> xids = resourceManager.getPreparedTransactionsWithCreationTime();
- if (xids == null || xids.size() == 0)
- {
- return "<h3>*** Prepared Transaction Details ***</h3><p>No entry.</p>";
- }
-
- ArrayList<Entry<Xid, Long>> xidsSortedByCreationTime = new ArrayList<Map.Entry<Xid, Long>>(xids.entrySet());
- Collections.sort(xidsSortedByCreationTime, new Comparator<Entry<Xid, Long>>()
- {
- public int compare(final Entry<Xid, Long> entry1, final Entry<Xid, Long> entry2)
- {
- // sort by creation time, oldest first
- return (int) (entry1.getValue() - entry2.getValue());
- }
- });
-
- StringBuilder html = new StringBuilder();
- html.append("<h3>*** Prepared Transaction Details ***</h3>");
-
- for (Map.Entry<Xid, Long> entry : xidsSortedByCreationTime)
- {
- Xid xid = entry.getKey();
- TransactionDetail detail = new CoreTransactionDetail(xid,
- resourceManager.getTransaction(xid),
- entry.getValue());
-
- JSONObject txJson = detail.toJSON();
-
- html.append("<table border=\"1\">");
- html.append("<tr><th>creation_time</th>");
- html.append("<td>" + txJson.get(TransactionDetail.KEY_CREATION_TIME) + "</td>");
- html.append("<th>xid_as_base_64</th>");
- html.append("<td colspan=\"3\">" + txJson.get(TransactionDetail.KEY_XID_AS_BASE64) + "</td></tr>");
- html.append("<tr><th>xid_format_id</th>");
- html.append("<td>" + txJson.get(TransactionDetail.KEY_XID_FORMAT_ID) + "</td>");
- html.append("<th>xid_global_txid</th>");
- html.append("<td>" + txJson.get(TransactionDetail.KEY_XID_GLOBAL_TXID) + "</td>");
- html.append("<th>xid_branch_qual</th>");
- html.append("<td>" + txJson.get(TransactionDetail.KEY_XID_BRANCH_QUAL) + "</td></tr>");
-
- html.append("<tr><th colspan=\"6\">Message List</th></tr>");
- html.append("<tr><td colspan=\"6\">");
- html.append("<table border=\"1\" cellspacing=\"0\" cellpadding=\"0\">");
-
- JSONArray msgs = txJson.getJSONArray(TransactionDetail.KEY_TX_RELATED_MESSAGES);
- for (int i = 0; i < msgs.length(); i++)
- {
- JSONObject msgJson = msgs.getJSONObject(i);
- JSONObject props = msgJson.getJSONObject(TransactionDetail.KEY_MSG_PROPERTIES);
- StringBuilder propstr = new StringBuilder();
- @SuppressWarnings("unchecked")
- Iterator<String> propkeys = props.keys();
- while (propkeys.hasNext())
- {
- String key = propkeys.next();
- propstr.append(key);
- propstr.append("=");
- propstr.append(props.get(key));
- propstr.append(", ");
- }
-
- html.append("<th>operation_type</th>");
- html.append("<td>" + msgJson.get(TransactionDetail.KEY_MSG_OP_TYPE) + "</th>");
- html.append("<th>message_type</th>");
- html.append("<td>" + msgJson.get(TransactionDetail.KEY_MSG_TYPE) + "</td></tr>");
- html.append("<tr><th>properties</th>");
- html.append("<td colspan=\"3\">" + propstr.toString() + "</td></tr>");
- }
- html.append("</table></td></tr>");
- html.append("</table><br/>");
- }
-
- return html.toString();
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public String[] listHeuristicCommittedTransactions()
- {
- checkStarted();
-
- clearIO();
- try
- {
- List<Xid> xids = resourceManager.getHeuristicCommittedTransactions();
- String[] s = new String[xids.size()];
- int i = 0;
- for (Xid xid : xids)
- {
- s[i++] = XidImpl.toBase64String(xid);
- }
- return s;
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public String[] listHeuristicRolledBackTransactions()
- {
- checkStarted();
-
- clearIO();
- try
- {
- List<Xid> xids = resourceManager.getHeuristicRolledbackTransactions();
- String[] s = new String[xids.size()];
- int i = 0;
- for (Xid xid : xids)
- {
- s[i++] = XidImpl.toBase64String(xid);
- }
- return s;
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public synchronized boolean commitPreparedTransaction(final String transactionAsBase64) throws Exception
- {
- checkStarted();
-
- clearIO();
- try
- {
- List<Xid> xids = resourceManager.getPreparedTransactions();
-
- for (Xid xid : xids)
- {
- if (XidImpl.toBase64String(xid).equals(transactionAsBase64))
- {
- Transaction transaction = resourceManager.removeTransaction(xid);
- transaction.commit(false);
- long recordID = server.getStorageManager().storeHeuristicCompletion(xid, true);
- storageManager.waitOnOperations();
- resourceManager.putHeuristicCompletion(recordID, xid, true);
- return true;
- }
- }
- return false;
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public synchronized boolean rollbackPreparedTransaction(final String transactionAsBase64) throws Exception
- {
- checkStarted();
-
- clearIO();
- try
- {
-
- List<Xid> xids = resourceManager.getPreparedTransactions();
-
- for (Xid xid : xids)
- {
- if (XidImpl.toBase64String(xid).equals(transactionAsBase64))
- {
- Transaction transaction = resourceManager.removeTransaction(xid);
- transaction.rollback();
- long recordID = server.getStorageManager().storeHeuristicCompletion(xid, false);
- server.getStorageManager().waitOnOperations();
- resourceManager.putHeuristicCompletion(recordID, xid, false);
- return true;
- }
- }
- return false;
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public String[] listRemoteAddresses()
- {
- checkStarted();
-
- clearIO();
- try
- {
- Set<RemotingConnection> connections = remotingService.getConnections();
-
- String[] remoteAddresses = new String[connections.size()];
- int i = 0;
- for (RemotingConnection connection : connections)
- {
- remoteAddresses[i++] = connection.getRemoteAddress();
- }
- return remoteAddresses;
- }
- finally
- {
- blockOnIO();
- }
-
- }
-
- public String[] listRemoteAddresses(final String ipAddress)
- {
- checkStarted();
-
- clearIO();
- try
- {
- Set<RemotingConnection> connections = remotingService.getConnections();
- List<String> remoteConnections = new ArrayList<String>();
- for (RemotingConnection connection : connections)
- {
- String remoteAddress = connection.getRemoteAddress();
- if (remoteAddress.contains(ipAddress))
- {
- remoteConnections.add(connection.getRemoteAddress());
- }
- }
- return remoteConnections.toArray(new String[remoteConnections.size()]);
- }
- finally
- {
- blockOnIO();
- }
-
- }
-
- public synchronized boolean closeConnectionsForAddress(final String ipAddress)
- {
- checkStarted();
-
- clearIO();
- try
- {
- boolean closed = false;
- Set<RemotingConnection> connections = remotingService.getConnections();
- for (RemotingConnection connection : connections)
- {
- String remoteAddress = connection.getRemoteAddress();
- if (remoteAddress.contains(ipAddress))
- {
- connection.fail(HornetQMessageBundle.BUNDLE.connectionsClosedByManagement(ipAddress));
- remotingService.removeConnection(connection.getID());
- closed = true;
- }
- }
-
- return closed;
- }
- finally
- {
- blockOnIO();
- }
-
- }
-
- public synchronized boolean closeConsumerConnectionsForAddress(final String address)
- {
- boolean closed = false;
- checkStarted();
-
- clearIO();
- try
- {
- for (Binding binding : postOffice.getMatchingBindings(SimpleString.toSimpleString(address)).getBindings())
- {
- if (binding instanceof LocalQueueBinding)
- {
- Queue queue = ((LocalQueueBinding) binding).getQueue();
- for (Consumer consumer : queue.getConsumers())
- {
- if (consumer instanceof ServerConsumer)
- {
- ServerConsumer serverConsumer = (ServerConsumer) consumer;
- RemotingConnection connection = null;
-
- for (RemotingConnection potentialConnection : remotingService.getConnections())
- {
- if (potentialConnection.getID().toString().equals(serverConsumer.getConnectionID()))
- {
- connection = potentialConnection;
- }
- }
-
- if (connection != null)
- {
- remotingService.removeConnection(connection.getID());
- connection.fail(HornetQMessageBundle.BUNDLE.consumerConnectionsClosedByManagement(address));
- closed = true;
- }
- }
- }
- }
- }
- }
- catch (Exception e)
- {
- HornetQServerLogger.LOGGER.failedToCloseConsumerConnectionsForAddress(address, e);
- }
- finally
- {
- blockOnIO();
- }
- return closed;
- }
-
- public synchronized boolean closeConnectionsForUser(final String userName)
- {
- boolean closed = false;
- checkStarted();
-
- clearIO();
- try
- {
- for (ServerSession serverSession : server.getSessions())
- {
- if (serverSession.getUsername() != null && serverSession.getUsername().equals(userName))
- {
- RemotingConnection connection = null;
-
- for (RemotingConnection potentialConnection : remotingService.getConnections())
- {
- if (potentialConnection.getID().toString().equals(serverSession.getConnectionID().toString()))
- {
- connection = potentialConnection;
- }
- }
-
- if (connection != null)
- {
- remotingService.removeConnection(connection.getID());
- connection.fail(HornetQMessageBundle.BUNDLE.connectionsForUserClosedByManagement(userName));
- closed = true;
- }
- }
- }
- }
- finally
- {
- blockOnIO();
- }
- return closed;
- }
-
- public String[] listConnectionIDs()
- {
- checkStarted();
-
- clearIO();
- try
- {
- Set<RemotingConnection> connections = remotingService.getConnections();
- String[] connectionIDs = new String[connections.size()];
- int i = 0;
- for (RemotingConnection connection : connections)
- {
- connectionIDs[i++] = connection.getID().toString();
- }
- return connectionIDs;
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public String[] listSessions(final String connectionID)
- {
- checkStarted();
-
- clearIO();
- try
- {
- List<ServerSession> sessions = server.getSessions(connectionID);
- String[] sessionIDs = new String[sessions.size()];
- int i = 0;
- for (ServerSession serverSession : sessions)
- {
- sessionIDs[i++] = serverSession.getName();
- }
- return sessionIDs;
- }
- finally
- {
- blockOnIO();
- }
- }
-
-
- /* (non-Javadoc)
- * @see org.apache.activemq.api.core.management.HornetQServerControl#listProducersInfoAsJSON()
- */
- public String listProducersInfoAsJSON() throws Exception
- {
- JSONArray producers = new JSONArray();
-
-
- for (ServerSession session : server.getSessions())
- {
- session.describeProducersInfo(producers);
- }
-
- return producers.toString();
- }
-
-
- public Object[] getConnectors() throws Exception
- {
- checkStarted();
-
- clearIO();
- try
- {
- Collection<TransportConfiguration> connectorConfigurations = configuration.getConnectorConfigurations()
- .values();
-
- Object[] ret = new Object[connectorConfigurations.size()];
-
- int i = 0;
- for (TransportConfiguration config : connectorConfigurations)
- {
- Object[] tc = new Object[3];
-
- tc[0] = config.getName();
- tc[1] = config.getFactoryClassName();
- tc[2] = config.getParams();
-
- ret[i++] = tc;
- }
-
- return ret;
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public String getConnectorsAsJSON() throws Exception
- {
- checkStarted();
-
- clearIO();
- try
- {
- JSONArray array = new JSONArray();
-
- for (TransportConfiguration config : configuration.getConnectorConfigurations().values())
- {
- array.put(new JSONObject(config));
- }
-
- return array.toString();
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public void addSecuritySettings(final String addressMatch,
- final String sendRoles,
- final String consumeRoles,
- final String createDurableQueueRoles,
- final String deleteDurableQueueRoles,
- final String createNonDurableQueueRoles,
- final String deleteNonDurableQueueRoles,
- final String manageRoles) throws Exception
- {
- checkStarted();
-
- clearIO();
- try
- {
- Set<Role> roles = SecurityFormatter.createSecurity(sendRoles,
- consumeRoles,
- createDurableQueueRoles,
- deleteDurableQueueRoles,
- createNonDurableQueueRoles,
- deleteNonDurableQueueRoles,
- manageRoles);
-
- server.getSecurityRepository().addMatch(addressMatch, roles);
-
- PersistedRoles persistedRoles = new PersistedRoles(addressMatch,
- sendRoles,
- consumeRoles,
- createDurableQueueRoles,
- deleteDurableQueueRoles,
- createNonDurableQueueRoles,
- deleteNonDurableQueueRoles,
- manageRoles);
-
- storageManager.storeSecurityRoles(persistedRoles);
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public void removeSecuritySettings(final String addressMatch) throws Exception
- {
- checkStarted();
-
- clearIO();
- try
- {
- server.getSecurityRepository().removeMatch(addressMatch);
- storageManager.deleteSecurityRoles(new SimpleString(addressMatch));
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public Object[] getRoles(final String addressMatch) throws Exception
- {
- checkStarted();
-
- checkStarted();
-
- clearIO();
- try
- {
- Set<Role> roles = server.getSecurityRepository().getMatch(addressMatch);
-
- Object[] objRoles = new Object[roles.size()];
-
- int i = 0;
- for (Role role : roles)
- {
- objRoles[i++] = new Object[]{role.getName(),
- CheckType.SEND.hasRole(role),
- CheckType.CONSUME.hasRole(role),
- CheckType.CREATE_DURABLE_QUEUE.hasRole(role),
- CheckType.DELETE_DURABLE_QUEUE.hasRole(role),
- CheckType.CREATE_NON_DURABLE_QUEUE.hasRole(role),
- CheckType.DELETE_NON_DURABLE_QUEUE.hasRole(role),
- CheckType.MANAGE.hasRole(role)};
- }
- return objRoles;
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public String getRolesAsJSON(final String addressMatch) throws Exception
- {
- checkStarted();
-
- clearIO();
- try
- {
- JSONArray json = new JSONArray();
- Set<Role> roles = server.getSecurityRepository().getMatch(addressMatch);
-
- for (Role role : roles)
- {
- json.put(new JSONObject(role));
- }
- return json.toString();
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public String getAddressSettingsAsJSON(final String address) throws Exception
- {
- checkStarted();
-
- AddressSettings addressSettings = server.getAddressSettingsRepository().getMatch(address);
- Map<String, Object> settings = new HashMap<String, Object>();
- if (addressSettings.getDeadLetterAddress() != null)
- {
- settings.put("DLA", addressSettings.getDeadLetterAddress());
- }
- if (addressSettings.getExpiryAddress() != null)
- {
- settings.put("expiryAddress", addressSettings.getExpiryAddress());
- }
- settings.put("expiryDelay", addressSettings.getExpiryDelay());
- settings.put("maxDeliveryAttempts", addressSettings.getMaxDeliveryAttempts());
- settings.put("pageCacheMaxSize", addressSettings.getPageCacheMaxSize());
- settings.put("maxSizeBytes", addressSettings.getMaxSizeBytes());
- settings.put("pageSizeBytes", addressSettings.getPageSizeBytes());
- settings.put("redeliveryDelay", addressSettings.getRedeliveryDelay());
- settings.put("redeliveryMultiplier", addressSettings.getRedeliveryMultiplier());
- settings.put("maxRedeliveryDelay", addressSettings.getMaxRedeliveryDelay());
- settings.put("redistributionDelay", addressSettings.getRedistributionDelay());
- settings.put("lastValueQueue", addressSettings.isLastValueQueue());
- settings.put("sendToDLAOnNoRoute", addressSettings.isSendToDLAOnNoRoute());
- String policy = addressSettings.getAddressFullMessagePolicy() == AddressFullMessagePolicy.PAGE ? "PAGE"
- : addressSettings.getAddressFullMessagePolicy() == AddressFullMessagePolicy.BLOCK ? "BLOCK"
- : addressSettings.getAddressFullMessagePolicy() == AddressFullMessagePolicy.DROP ? "DROP"
- : "FAIL";
- settings.put("addressFullMessagePolicy", policy);
- settings.put("slowConsumerThreshold", addressSettings.getSlowConsumerThreshold());
- settings.put("slowConsumerCheckPeriod", addressSettings.getSlowConsumerCheckPeriod());
- policy = addressSettings.getSlowConsumerPolicy() == SlowConsumerPolicy.NOTIFY ? "NOTIFY"
- : "KILL";
- settings.put("slowConsumerPolicy", policy);
-
- JSONObject jsonObject = new JSONObject(settings);
- return jsonObject.toString();
- }
-
-
- public void addAddressSettings(final String address,
- final String DLA,
- final String expiryAddress,
- final long expiryDelay,
- final boolean lastValueQueue,
- final int deliveryAttempts,
- final long maxSizeBytes,
- final int pageSizeBytes,
- final int pageMaxCacheSize,
- final long redeliveryDelay,
- final double redeliveryMultiplier,
- final long maxRedeliveryDelay,
- final long redistributionDelay,
- final boolean sendToDLAOnNoRoute,
- final String addressFullMessagePolicy,
- final long slowConsumerThreshold,
- final long slowConsumerCheckPeriod,
- final String slowConsumerPolicy) throws Exception
- {
- checkStarted();
-
- // JBPAPP-6334 requested this to be pageSizeBytes > maxSizeBytes
- if (pageSizeBytes > maxSizeBytes && maxSizeBytes > 0)
- {
- throw new IllegalStateException("pageSize has to be lower than maxSizeBytes. Invalid argument (" + pageSizeBytes + " < " + maxSizeBytes + ")");
- }
-
- if (maxSizeBytes < -1)
- {
- throw new IllegalStateException("Invalid argument on maxSizeBytes");
- }
-
- AddressSettings addressSettings = new AddressSettings();
- addressSettings.setDeadLetterAddress(DLA == null ? null : new SimpleString(DLA));
- addressSettings.setExpiryAddress(expiryAddress == null ? null : new SimpleString(expiryAddress));
- addressSettings.setExpiryDelay(expiryDelay);
- addressSettings.setLastValueQueue(lastValueQueue);
- addressSettings.setMaxDeliveryAttempts(deliveryAttempts);
- addressSettings.setPageCacheMaxSize(pageMaxCacheSize);
- addressSettings.setMaxSizeBytes(maxSizeBytes);
- addressSettings.setPageSizeBytes(pageSizeBytes);
- addressSettings.setRedeliveryDelay(redeliveryDelay);
- addressSettings.setRedeliveryMultiplier(redeliveryMultiplier);
- addressSettings.setMaxRedeliveryDelay(maxRedeliveryDelay);
- addressSettings.setRedistributionDelay(redistributionDelay);
- addressSettings.setSendToDLAOnNoRoute(sendToDLAOnNoRoute);
- if (addressFullMessagePolicy == null)
- {
- addressSettings.setAddressFullMessagePolicy(AddressFullMessagePolicy.PAGE);
- }
- else if (addressFullMessagePolicy.equalsIgnoreCase("PAGE"))
- {
- addressSettings.setAddressFullMessagePolicy(AddressFullMessagePolicy.PAGE);
- }
- else if (addressFullMessagePolicy.equalsIgnoreCase("DROP"))
- {
- addressSettings.setAddressFullMessagePolicy(AddressFullMessagePolicy.DROP);
- }
- else if (addressFullMessagePolicy.equalsIgnoreCase("BLOCK"))
- {
- addressSettings.setAddressFullMessagePolicy(AddressFullMessagePolicy.BLOCK);
- }
- else if (addressFullMessagePolicy.equalsIgnoreCase("FAIL"))
- {
- addressSettings.setAddressFullMessagePolicy(AddressFullMessagePolicy.FAIL);
- }
- addressSettings.setSlowConsumerThreshold(slowConsumerThreshold);
- addressSettings.setSlowConsumerCheckPeriod(slowConsumerCheckPeriod);
- if (slowConsumerPolicy == null)
- {
- addressSettings.setSlowConsumerPolicy(SlowConsumerPolicy.NOTIFY);
- }
- else if (slowConsumerPolicy.equalsIgnoreCase("NOTIFY"))
- {
- addressSettings.setSlowConsumerPolicy(SlowConsumerPolicy.NOTIFY);
- }
- else if (slowConsumerPolicy.equalsIgnoreCase("KILL"))
- {
- addressSettings.setSlowConsumerPolicy(SlowConsumerPolicy.KILL);
- }
- server.getAddressSettingsRepository().addMatch(address, addressSettings);
-
- storageManager.storeAddressSetting(new PersistedAddressSetting(new SimpleString(address), addressSettings));
- }
-
- public void removeAddressSettings(final String addressMatch) throws Exception
- {
- checkStarted();
-
- server.getAddressSettingsRepository().removeMatch(addressMatch);
- storageManager.deleteAddressSetting(new SimpleString(addressMatch));
- }
-
- public void sendQueueInfoToQueue(final String queueName, final String address) throws Exception
- {
- checkStarted();
-
- clearIO();
- try
- {
- postOffice.sendQueueInfoToQueue(new SimpleString(queueName), new SimpleString(address));
-
- GroupingHandler handler = server.getGroupingHandler();
- if (handler != null)
- {
- // the group handler would miss responses if the group was requested before the reset was done
- // on that case we ask the groupinghandler to replay its send in case it's waiting for the information
- handler.resendPending();
- }
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public String[] getDivertNames()
- {
- checkStarted();
-
- clearIO();
- try
- {
- Object[] diverts = server.getManagementService().getResources(DivertControl.class);
- String[] names = new String[diverts.length];
- for (int i = 0; i < diverts.length; i++)
- {
- DivertControl divert = (DivertControl) diverts[i];
- names[i] = divert.getUniqueName();
- }
-
- return names;
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public void createDivert(final String name,
- final String routingName,
- final String address,
- final String forwardingAddress,
- final boolean exclusive,
- final String filterString,
- final String transformerClassName) throws Exception
- {
- checkStarted();
-
- clearIO();
- try
- {
- DivertConfiguration config = new DivertConfiguration()
- .setName(name)
- .setRoutingName(routingName)
- .setAddress(address)
- .setForwardingAddress(forwardingAddress)
- .setExclusive(exclusive)
- .setFilterString(filterString)
- .setTransformerClassName(transformerClassName);
- server.deployDivert(config);
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public void destroyDivert(final String name) throws Exception
- {
- checkStarted();
-
- clearIO();
- try
- {
- server.destroyDivert(SimpleString.toSimpleString(name));
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public String[] getBridgeNames()
- {
- checkStarted();
-
- clearIO();
- try
- {
- Object[] bridges = server.getManagementService().getResources(BridgeControl.class);
- String[] names = new String[bridges.length];
- for (int i = 0; i < bridges.length; i++)
- {
- BridgeControl bridge = (BridgeControl) bridges[i];
- names[i] = bridge.getName();
- }
-
- return names;
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public void createBridge(final String name,
- final String queueName,
- final String forwardingAddress,
- final String filterString,
- final String transformerClassName,
- final long retryInterval,
- final double retryIntervalMultiplier,
- final int initialConnectAttempts,
- final int reconnectAttempts,
- final boolean useDuplicateDetection,
- final int confirmationWindowSize,
- final long clientFailureCheckPeriod,
- final String staticConnectorsOrDiscoveryGroup,
- boolean useDiscoveryGroup,
- final boolean ha,
- final String user,
- final String password) throws Exception
- {
- checkStarted();
-
- clearIO();
-
- try
- {
- BridgeConfiguration config = new BridgeConfiguration()
- .setName(name)
- .setQueueName(queueName)
- .setForwardingAddress(forwardingAddress)
- .setFilterString(filterString)
- .setTransformerClassName(transformerClassName)
- .setClientFailureCheckPeriod(clientFailureCheckPeriod)
- .setRetryInterval(retryInterval)
- .setRetryIntervalMultiplier(retryIntervalMultiplier)
- .setInitialConnectAttempts(initialConnectAttempts)
- .setReconnectAttempts(reconnectAttempts)
- .setUseDuplicateDetection(useDuplicateDetection)
- .setConfirmationWindowSize(confirmationWindowSize)
- .setHA(ha)
- .setUser(user)
- .setPassword(password);
-
- if (useDiscoveryGroup)
- {
- config.setDiscoveryGroupName(staticConnectorsOrDiscoveryGroup);
- }
- else
- {
- config.setStaticConnectors(toList(staticConnectorsOrDiscoveryGroup));
- }
-
- server.deployBridge(config);
- }
- finally
- {
- blockOnIO();
- }
- }
-
-
- public void destroyBridge(final String name) throws Exception
- {
- checkStarted();
-
- clearIO();
- try
- {
- server.destroyBridge(name);
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public void forceFailover() throws Exception
- {
- checkStarted();
-
- clearIO();
-
- try
- {
- server.stop(true);
- }
- finally
- {
- blockOnIO();
- }
- }
-
- @Override
- public void updateDuplicateIdCache(String address, Object[] ids) throws Exception
- {
- clearIO();
- try
- {
- DuplicateIDCache duplicateIDCache = server.getPostOffice().getDuplicateIDCache(new SimpleString(address));
- for (Object id : ids)
- {
- duplicateIDCache.addToCache(((String)id).getBytes(), null);
- }
- }
- finally
- {
- blockOnIO();
- }
- }
-
- @Override
- public void scaleDown(String connector) throws Exception
- {
- checkStarted();
-
- clearIO();
- HAPolicy haPolicy = server.getHAPolicy();
- if (haPolicy instanceof LiveOnlyPolicy)
- {
- LiveOnlyPolicy liveOnlyPolicy = (LiveOnlyPolicy) haPolicy;
-
- if (liveOnlyPolicy.getScaleDownPolicy() == null)
- {
- liveOnlyPolicy.setScaleDownPolicy(new ScaleDownPolicy());
- }
-
- liveOnlyPolicy.getScaleDownPolicy().setEnabled(true);
-
- if (connector != null)
- {
- liveOnlyPolicy.getScaleDownPolicy().getConnectors().add(0, connector);
- }
-
- server.stop(true);
- }
-
- }
-
- // NotificationEmitter implementation ----------------------------
-
- public void removeNotificationListener(final NotificationListener listener,
- final NotificationFilter filter,
- final Object handback) throws ListenerNotFoundException
- {
- clearIO();
- try
- {
- broadcaster.removeNotificationListener(listener, filter, handback);
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public void removeNotificationListener(final NotificationListener listener) throws ListenerNotFoundException
- {
- clearIO();
- try
- {
- broadcaster.removeNotificationListener(listener);
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public void addNotificationListener(final NotificationListener listener,
- final NotificationFilter filter,
- final Object handback) throws IllegalArgumentException
- {
- clearIO();
- try
- {
- broadcaster.addNotificationListener(listener, filter, handback);
- }
- finally
- {
- blockOnIO();
- }
- }
-
- public MBeanNotificationInfo[] getNotificationInfo()
- {
- CoreNotificationType[] values = CoreNotificationType.values();
- String[] names = new String[values.length];
- for (int i = 0; i < values.length; i++)
- {
- names[i] = values[i].toString();
- }
- return new MBeanNotificationInfo[]{new MBeanNotificationInfo(names,
- this.getClass().getName(),
- "Notifications emitted by a Core Server")};
- }
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- private synchronized void setMessageCounterEnabled(final boolean enable)
- {
- if (isStarted())
- {
- if (configuration.isMessageCounterEnabled() && !enable)
- {
- stopMessageCounters();
- }
- else if (!configuration.isMessageCounterEnabled() && enable)
- {
- startMessageCounters();
- }
- }
- configuration.setMessageCounterEnabled(enable);
- }
-
- private void startMessageCounters()
- {
- messageCounterManager.start();
- }
-
- private void stopMessageCounters()
- {
- messageCounterManager.stop();
-
- messageCounterManager.resetAllCounters();
-
- messageCounterManager.resetAllCounterHistories();
- }
-
- public long getConnectionTTLOverride()
- {
- return configuration.getConnectionTTLOverride();
- }
-
- public int getIDCacheSize()
- {
- return configuration.getIDCacheSize();
- }
-
- public String getLargeMessagesDirectory()
- {
- return configuration.getLargeMessagesDirectory();
- }
-
- public String getManagementAddress()
- {
- return configuration.getManagementAddress().toString();
- }
-
- public String getManagementNotificationAddress()
- {
- return configuration.getManagementNotificationAddress().toString();
- }
-
- public long getMessageExpiryScanPeriod()
- {
- return configuration.getMessageExpiryScanPeriod();
- }
-
- public long getMessageExpiryThreadPriority()
- {
- return configuration.getMessageExpiryThreadPriority();
- }
-
- public long getTransactionTimeout()
- {
- return configuration.getTransactionTimeout();
- }
-
- public long getTransactionTimeoutScanPeriod()
- {
- return configuration.getTransactionTimeoutScanPeriod();
- }
-
- public boolean isPersistDeliveryCountBeforeDelivery()
- {
- return configuration.isPersistDeliveryCountBeforeDelivery();
- }
-
- public boolean isPersistIDCache()
- {
- return configuration.isPersistIDCache();
- }
-
- public boolean isWildcardRoutingEnabled()
- {
- return configuration.isWildcardRoutingEnabled();
- }
-
- @Override
- protected MBeanOperationInfo[] fillMBeanOperationInfo()
- {
- return MBeanInfoHelper.getMBeanOperationsInfo(HornetQServerControl.class);
- }
-
- private void checkStarted()
- {
- if (!server.isStarted())
- {
- throw new IllegalStateException("HornetQ Server is not started. It can not be managed yet");
- }
- }
-
- public String[] listTargetAddresses(final String sessionID)
- {
- ServerSession session = server.getSessionByID(sessionID);
- if (session != null)
- {
- return session.getTargetAddresses();
- }
- return new String[0];
- }
-
- private static List<String> toList(final String commaSeparatedString)
- {
- List<String> list = new ArrayList<String>();
- if (commaSeparatedString == null || commaSeparatedString.trim().length() == 0)
- {
- return list;
- }
- String[] values = commaSeparatedString.split(",");
- for (String value : values)
- {
- list.add(value.trim());
- }
- return list;
- }
-
- @Override
- public void onNotification(org.apache.activemq.core.server.management.Notification notification)
- {
- if (!(notification.getType() instanceof CoreNotificationType)) return;
- CoreNotificationType type = (CoreNotificationType) notification.getType();
- TypedProperties prop = notification.getProperties();
-
- this.broadcaster.sendNotification(new Notification(type.toString(), this,
- notifSeq.incrementAndGet(), notification.toString()));
- }
-
-}
-
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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 d021712..34174d9 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
@@ -32,7 +32,7 @@ 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.ActiveMQMessageBundle;
import org.apache.activemq.core.server.MessageReference;
import org.apache.activemq.core.server.Queue;
import org.apache.activemq.core.server.ServerConsumer;
@@ -696,7 +696,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl
if (binding == null)
{
- throw HornetQMessageBundle.BUNDLE.noQueueFound(otherQueueName);
+ throw ActiveMQMessageBundle.BUNDLE.noQueueFound(otherQueueName);
}
return queue.moveReference(messageID, binding.getAddress(), rejectDuplicates);
@@ -726,7 +726,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl
if (binding == null)
{
- throw HornetQMessageBundle.BUNDLE.noQueueFound(otherQueueName);
+ throw ActiveMQMessageBundle.BUNDLE.noQueueFound(otherQueueName);
}
int retValue = queue.moveReferences(flushLimit, filter, binding.getAddress(), rejectDuplicates);
@@ -786,7 +786,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl
{
if (newPriority < 0 || newPriority > 9)
{
- throw HornetQMessageBundle.BUNDLE.invalidNewPriority(newPriority);
+ throw ActiveMQMessageBundle.BUNDLE.invalidNewPriority(newPriority);
}
Filter filter = FilterImpl.createFilter(filterStr);
@@ -807,7 +807,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl
{
if (newPriority < 0 || newPriority > 9)
{
- throw HornetQMessageBundle.BUNDLE.invalidNewPriority(newPriority);
+ throw ActiveMQMessageBundle.BUNDLE.invalidNewPriority(newPriority);
}
return queue.changeReferencePriority(messageID, (byte) newPriority);
}
@@ -1044,7 +1044,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl
{
if (!postOffice.isStarted())
{
- throw new IllegalStateException("HornetQ Server is not started. Queue can not be managed yet");
+ throw new IllegalStateException("ActiveMQ Server is not started. Queue can not be managed yet");
}
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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 becf971..94a14f1 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
@@ -60,7 +60,7 @@ public class MessageCounterHelper
}
String ret0 =
- "<table class=\"hornetq-message-counter\">\n" + "<tr>"
+ "<table class=\"activemq-message-counter\">\n" + "<tr>"
+ "<th>Type</th>"
+ "<th>Name</th>"
+ "<th>Subscription</th>"
@@ -136,7 +136,7 @@ public class MessageCounterHelper
ret.append(" <li>");
// table header
- ret.append("<table class=\"hornetq-message-counter-history\">\n");
+ ret.append("<table class=\"activemq-message-counter-history\">\n");
ret.append("<tr><th>Date</th>");
for (int j = 0; j < 24; j++)
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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 f42f161..2bffb46 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
@@ -15,7 +15,7 @@ package org.apache.activemq.core.paging;
import java.util.Map;
import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.server.HornetQComponent;
+import org.apache.activemq.core.server.ActiveMQComponent;
import org.apache.activemq.core.settings.HierarchicalRepositoryChangeListener;
/**
@@ -36,7 +36,7 @@ import org.apache.activemq.core.settings.HierarchicalRepositoryChangeListener;
* @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a>
* @author <a href="mailto:andy.taylor@jboss.org>Andy Taylor</a>
*/
-public interface PagingManager extends HornetQComponent, HierarchicalRepositoryChangeListener
+public interface PagingManager extends ActiveMQComponent, HierarchicalRepositoryChangeListener
{
/** Returns the PageStore associated with the address. A new page store is created if necessary. */
PagingStore getPageStore(SimpleString address) throws Exception;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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 517693f..8dae219 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
@@ -19,7 +19,7 @@ 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.ActiveMQComponent;
import org.apache.activemq.core.server.RouteContextList;
import org.apache.activemq.core.server.ServerMessage;
import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy;
@@ -37,7 +37,7 @@ import org.apache.activemq.core.transaction.Transaction;
* @author <a href="mailto:clebert.suconic@jboss.com">Clebert Suconic</a>
* @see PagingManager
*/
-public interface PagingStore extends HornetQComponent
+public interface PagingStore extends ActiveMQComponent
{
SimpleString getAddress();
@@ -103,7 +103,7 @@ public interface PagingStore extends HornetQComponent
* The file will still exist until Page.delete is called,
* So, case the system is reloaded the same Page will be loaded back if delete is not called.
*
- * @throws Exception Note: This should still be part of the interface, even though HornetQ only uses through the
+ * @throws Exception Note: This should still be part of the interface, even though ActiveMQ only uses through the
*/
Page depage() throws Exception;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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 fd9257e..35ab54b 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
@@ -17,7 +17,7 @@ import java.util.concurrent.atomic.AtomicInteger;
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.ActiveMQServerLogger;
import org.apache.activemq.core.server.MessageReference;
import org.apache.activemq.core.server.Queue;
import org.apache.activemq.core.server.ServerMessage;
@@ -29,7 +29,7 @@ import org.apache.activemq.core.server.ServerMessage;
*/
public class PagedReferenceImpl implements PagedReference
{
- private static final boolean isTrace = HornetQServerLogger.LOGGER.isTraceEnabled();
+ private static final boolean isTrace = ActiveMQServerLogger.LOGGER.isTraceEnabled();
private final PagePosition position;
@@ -169,7 +169,7 @@ public class PagedReferenceImpl implements PagedReference
deliveryCount.incrementAndGet();
if (isTrace)
{
- HornetQServerLogger.LOGGER.trace("++deliveryCount = " + deliveryCount + " for " + this, new Exception("trace"));
+ ActiveMQServerLogger.LOGGER.trace("++deliveryCount = " + deliveryCount + " for " + this, new Exception("trace"));
}
}
@@ -180,7 +180,7 @@ public class PagedReferenceImpl implements PagedReference
deliveryCount.decrementAndGet();
if (isTrace)
{
- HornetQServerLogger.LOGGER.trace("--deliveryCount = " + deliveryCount + " for " + this, new Exception("trace"));
+ ActiveMQServerLogger.LOGGER.trace("--deliveryCount = " + deliveryCount + " for " + this, new Exception("trace"));
}
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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 842c220..e5eec98 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
@@ -31,7 +31,7 @@ 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.server.ActiveMQServerLogger;
import org.apache.activemq.core.transaction.Transaction;
import org.apache.activemq.core.transaction.impl.TransactionImpl;
import org.apache.activemq.utils.FutureLatch;
@@ -50,7 +50,7 @@ public class PageCursorProviderImpl implements PageCursorProvider
{
// Constants -----------------------------------------------------
- boolean isTrace = HornetQServerLogger.LOGGER.isTraceEnabled();
+ boolean isTrace = ActiveMQServerLogger.LOGGER.isTraceEnabled();
// Attributes ----------------------------------------------------
@@ -91,9 +91,9 @@ public class PageCursorProviderImpl implements PageCursorProvider
public synchronized PageSubscription createSubscription(long cursorID, Filter filter, boolean persistent)
{
- if (HornetQServerLogger.LOGGER.isTraceEnabled())
+ if (ActiveMQServerLogger.LOGGER.isTraceEnabled())
{
- HornetQServerLogger.LOGGER.trace(this.pagingStore.getAddress() + " creating subscription " + cursorID + " with filter " + filter, new Exception("trace"));
+ ActiveMQServerLogger.LOGGER.trace(this.pagingStore.getAddress() + " creating subscription " + cursorID + " with filter " + filter, new Exception("trace"));
}
if (activeCursors.containsKey(cursorID))
@@ -160,7 +160,7 @@ public class PageCursorProviderImpl implements PageCursorProvider
cache.lock();
if (isTrace)
{
- HornetQServerLogger.LOGGER.trace("adding " + pageId + " into cursor = " + this.pagingStore.getAddress());
+ ActiveMQServerLogger.LOGGER.trace("adding " + pageId + " into cursor = " + this.pagingStore.getAddress());
}
softCache.put(pageId, cache);
}
@@ -285,7 +285,7 @@ public class PageCursorProviderImpl implements PageCursorProvider
while (!future.await(10000))
{
- HornetQServerLogger.LOGGER.timedOutStoppingPagingCursor(future, executor);
+ ActiveMQServerLogger.LOGGER.timedOutStoppingPagingCursor(future, executor);
}
}
@@ -355,7 +355,7 @@ public class PageCursorProviderImpl implements PageCursorProvider
}
catch (Exception e)
{
- HornetQServerLogger.LOGGER.warn("Error while cleaning paging on queue " + sub.getQueue().getName(), e);
+ ActiveMQServerLogger.LOGGER.warn("Error while cleaning paging on queue " + sub.getQueue().getName(), e);
}
}
@@ -365,7 +365,7 @@ public class PageCursorProviderImpl implements PageCursorProvider
}
catch (Exception e)
{
- HornetQServerLogger.LOGGER.warn("Error while cleaning page, during the commit", e);
+ ActiveMQServerLogger.LOGGER.warn("Error while cleaning page, during the commit", e);
}
}
@@ -408,9 +408,9 @@ public class PageCursorProviderImpl implements PageCursorProvider
return;
}
- if (HornetQServerLogger.LOGGER.isDebugEnabled())
+ if (ActiveMQServerLogger.LOGGER.isDebugEnabled())
{
- HornetQServerLogger.LOGGER.debug("Asserting cleanup for address " + this.pagingStore.getAddress());
+ ActiveMQServerLogger.LOGGER.debug("Asserting cleanup for address " + this.pagingStore.getAddress());
}
ArrayList<PageSubscription> cursorList = cloneSubscriptions();
@@ -427,9 +427,9 @@ public class PageCursorProviderImpl implements PageCursorProvider
{
if (!cursor.isComplete(minPage))
{
- if (HornetQServerLogger.LOGGER.isDebugEnabled())
+ if (ActiveMQServerLogger.LOGGER.isDebugEnabled())
{
- HornetQServerLogger.LOGGER.debug("Cursor " + cursor + " was considered incomplete at page " + minPage);
+ ActiveMQServerLogger.LOGGER.debug("Cursor " + cursor + " was considered incomplete at page " + minPage);
}
complete = false;
@@ -437,9 +437,9 @@ public class PageCursorProviderImpl implements PageCursorProvider
}
else
{
- if (HornetQServerLogger.LOGGER.isDebugEnabled())
+ if (ActiveMQServerLogger.LOGGER.isDebugEnabled())
{
- HornetQServerLogger.LOGGER.debug("Cursor " + cursor + "was considered **complete** at page " + minPage);
+ ActiveMQServerLogger.LOGGER.debug("Cursor " + cursor + "was considered **complete** at page " + minPage);
}
}
}
@@ -453,9 +453,9 @@ public class PageCursorProviderImpl implements PageCursorProvider
if (complete)
{
- if (HornetQServerLogger.LOGGER.isDebugEnabled())
+ if (ActiveMQServerLogger.LOGGER.isDebugEnabled())
{
- HornetQServerLogger.LOGGER.debug("Address " + pagingStore.getAddress() +
+ ActiveMQServerLogger.LOGGER.debug("Address " + pagingStore.getAddress() +
" is leaving page mode as all messages are consumed and acknowledged from the page store");
}
@@ -486,9 +486,9 @@ public class PageCursorProviderImpl implements PageCursorProvider
}
else
{
- if (HornetQServerLogger.LOGGER.isTraceEnabled())
+ if (ActiveMQServerLogger.LOGGER.isTraceEnabled())
{
- HornetQServerLogger.LOGGER.trace("Couldn't cleanup page on address " + this.pagingStore.getAddress() +
+ ActiveMQServerLogger.LOGGER.trace("Couldn't cleanup page on address " + this.pagingStore.getAddress() +
" as numberOfPages == " +
pagingStore.getNumberOfPages() +
" and currentPage.numberOfMessages = " +
@@ -498,7 +498,7 @@ public class PageCursorProviderImpl implements PageCursorProvider
}
catch (Exception ex)
{
- HornetQServerLogger.LOGGER.problemCleaningPageAddress(ex, pagingStore.getAddress());
+ ActiveMQServerLogger.LOGGER.problemCleaningPageAddress(ex, pagingStore.getAddress());
return;
}
finally
@@ -520,7 +520,7 @@ public class PageCursorProviderImpl implements PageCursorProvider
if (isTrace)
{
- HornetQServerLogger.LOGGER.trace("Removing page " + depagedPage.getPageId() + " from page-cache");
+ ActiveMQServerLogger.LOGGER.trace("Removing page " + depagedPage.getPageId() + " from page-cache");
}
if (cache == null)
@@ -567,7 +567,7 @@ public class PageCursorProviderImpl implements PageCursorProvider
}
catch (Exception ex)
{
- HornetQServerLogger.LOGGER.problemCleaningPageAddress(ex, pagingStore.getAddress());
+ ActiveMQServerLogger.LOGGER.problemCleaningPageAddress(ex, pagingStore.getAddress());
return;
}
@@ -608,7 +608,7 @@ public class PageCursorProviderImpl implements PageCursorProvider
while (!storageManager.waitOnOperations(5000))
{
- HornetQServerLogger.LOGGER.problemCompletingOperations(storageManager.getContext());
+ ActiveMQServerLogger.LOGGER.problemCompletingOperations(storageManager.getContext());
}
}
finally
@@ -651,9 +651,9 @@ public class PageCursorProviderImpl implements PageCursorProvider
for (PageSubscription cursor : cursorList)
{
long firstPage = cursor.getFirstPage();
- if (HornetQServerLogger.LOGGER.isDebugEnabled())
+ if (ActiveMQServerLogger.LOGGER.isDebugEnabled())
{
- HornetQServerLogger.LOGGER.debug(this.pagingStore.getAddress() + " has a cursor " + cursor + " with first page=" + firstPage);
+ ActiveMQServerLogger.LOGGER.debug(this.pagingStore.getAddress() + " has a cursor " + cursor + " with first page=" + firstPage);
}
// the cursor will return -1 if the cursor is empty
@@ -663,9 +663,9 @@ public class PageCursorProviderImpl implements PageCursorProvider
}
}
- if (HornetQServerLogger.LOGGER.isDebugEnabled())
+ if (ActiveMQServerLogger.LOGGER.isDebugEnabled())
{
- HornetQServerLogger.LOGGER.debug(this.pagingStore.getAddress() + " has minPage=" + minPage);
+ ActiveMQServerLogger.LOGGER.debug(this.pagingStore.getAddress() + " has minPage=" + minPage);
}
return minPage;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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 57f43ea..1beb556 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
@@ -25,7 +25,7 @@ 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.server.ActiveMQServerLogger;
import org.apache.activemq.core.transaction.Transaction;
import org.apache.activemq.core.transaction.TransactionOperation;
import org.apache.activemq.core.transaction.TransactionOperationAbstract;
@@ -39,7 +39,7 @@ import org.apache.activemq.core.transaction.impl.TransactionImpl;
*/
public class PageSubscriptionCounterImpl implements PageSubscriptionCounter
{
- private static final boolean isTrace = HornetQServerLogger.LOGGER.isTraceEnabled();
+ private static final boolean isTrace = ActiveMQServerLogger.LOGGER.isTraceEnabled();
private static final int FLUSH_COUNTER = 1000;
@@ -364,7 +364,7 @@ public class PageSubscriptionCounterImpl implements PageSubscriptionCounter
if (isTrace)
{
- HornetQServerLogger.LOGGER.trace("Replacing page-counter record = " + recordID + " by record = " + newRecordID + " on subscriptionID = " + this.subscriptionID + " for queue = " + this.subscription.getQueue().getName());
+ ActiveMQServerLogger.LOGGER.trace("Replacing page-counter record = " + recordID + " by record = " + newRecordID + " on subscriptionID = " + this.subscriptionID + " for queue = " + this.subscription.getQueue().getName());
}
storage.commit(txCleanup);
@@ -373,7 +373,7 @@ public class PageSubscriptionCounterImpl implements PageSubscriptionCounter
{
newRecordID = recordID;
- HornetQServerLogger.LOGGER.problemCleaningPagesubscriptionCounter(e);
+ ActiveMQServerLogger.LOGGER.problemCleaningPagesubscriptionCounter(e);
try
{
storage.rollback(txCleanup);