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:26 UTC
[33/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-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSTopicControlImpl.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSTopicControlImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSTopicControlImpl.java
index 298071c..94ac46b 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSTopicControlImpl.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSTopicControlImpl.java
@@ -23,14 +23,14 @@ import javax.management.StandardMBean;
import org.apache.activemq.api.core.ActiveMQException;
import org.apache.activemq.api.core.Pair;
import org.apache.activemq.api.core.management.AddressControl;
-import org.apache.activemq.api.core.management.HornetQServerControl;
+import org.apache.activemq.api.core.management.ActiveMQServerControl;
import org.apache.activemq.api.core.management.QueueControl;
import org.apache.activemq.api.core.management.ResourceNames;
import org.apache.activemq.api.jms.management.TopicControl;
import org.apache.activemq.core.management.impl.MBeanInfoHelper;
import org.apache.activemq.core.server.management.ManagementService;
-import org.apache.activemq.jms.client.HornetQDestination;
-import org.apache.activemq.jms.client.HornetQMessage;
+import org.apache.activemq.jms.client.ActiveMQDestination;
+import org.apache.activemq.jms.client.ActiveMQMessage;
import org.apache.activemq.jms.client.SelectorTranslator;
import org.apache.activemq.jms.server.JMSServerManager;
import org.apache.activemq.utils.json.JSONArray;
@@ -43,7 +43,7 @@ import org.apache.activemq.utils.json.JSONObject;
*/
public class JMSTopicControlImpl extends StandardMBean implements TopicControl
{
- private final HornetQDestination managedTopic;
+ private final ActiveMQDestination managedTopic;
private final AddressControl addressControl;
@@ -56,12 +56,12 @@ public class JMSTopicControlImpl extends StandardMBean implements TopicControl
public static String createFilterFromJMSSelector(final String selectorStr) throws ActiveMQException
{
return selectorStr == null || selectorStr.trim().length() == 0 ? null
- : SelectorTranslator.convertToHornetQFilterString(selectorStr);
+ : SelectorTranslator.convertToActiveMQFilterString(selectorStr);
}
// Constructors --------------------------------------------------
- public JMSTopicControlImpl(final HornetQDestination topic,
+ public JMSTopicControlImpl(final ActiveMQDestination topic,
final JMSServerManager jmsServerManager,
final AddressControl addressControl,
final ManagementService managementService) throws Exception
@@ -199,7 +199,7 @@ public class JMSTopicControlImpl extends StandardMBean implements TopicControl
for (Map<String, Object> coreMessage : coreMessages)
{
- jmsMessages[i++] = HornetQMessage.coreMaptoJMSMap(coreMessage);
+ jmsMessages[i++] = ActiveMQMessage.coreMaptoJMSMap(coreMessage);
}
return jmsMessages;
}
@@ -211,7 +211,7 @@ public class JMSTopicControlImpl extends StandardMBean implements TopicControl
public int countMessagesForSubscription(final String clientID, final String subscriptionName, final String filterStr) throws Exception
{
- String queueName = HornetQDestination.createQueueNameForDurableSubscription(true, clientID, subscriptionName);
+ String queueName = ActiveMQDestination.createQueueNameForDurableSubscription(true, clientID, subscriptionName);
QueueControl coreQueueControl = (QueueControl)managementService.getResource(ResourceNames.CORE_QUEUE + queueName);
if (coreQueueControl == null)
{
@@ -240,19 +240,19 @@ public class JMSTopicControlImpl extends StandardMBean implements TopicControl
public void dropDurableSubscription(final String clientID, final String subscriptionName) throws Exception
{
- String queueName = HornetQDestination.createQueueNameForDurableSubscription(true, clientID, subscriptionName);
+ String queueName = ActiveMQDestination.createQueueNameForDurableSubscription(true, clientID, subscriptionName);
QueueControl coreQueueControl = (QueueControl)managementService.getResource(ResourceNames.CORE_QUEUE + queueName);
if (coreQueueControl == null)
{
throw new IllegalArgumentException("No subscriptions with name " + queueName + " for clientID " + clientID);
}
- HornetQServerControl serverControl = (HornetQServerControl)managementService.getResource(ResourceNames.CORE_SERVER);
+ ActiveMQServerControl serverControl = (ActiveMQServerControl)managementService.getResource(ResourceNames.CORE_SERVER);
serverControl.destroyQueue(queueName);
}
public void dropAllSubscriptions() throws Exception
{
- HornetQServerControl serverControl = (HornetQServerControl)managementService.getResource(ResourceNames.CORE_SERVER);
+ ActiveMQServerControl serverControl = (ActiveMQServerControl)managementService.getResource(ResourceNames.CORE_SERVER);
String[] queues = addressControl.getQueueNames();
for (String queue : queues)
{
@@ -283,8 +283,8 @@ public class JMSTopicControlImpl extends StandardMBean implements TopicControl
if (queue.isDurable())
{
- Pair<String, String> pair = HornetQDestination.decomposeQueueNameForDurableSubscription(queue.getName()
- .toString());
+ Pair<String, String> pair = ActiveMQDestination.decomposeQueueNameForDurableSubscription(queue.getName()
+ .toString());
clientID = pair.getA();
subName = pair.getB();
}
@@ -317,8 +317,8 @@ public class JMSTopicControlImpl extends StandardMBean implements TopicControl
if (queue.isDurable() && !queue.getName().startsWith(ResourceNames.JMS_TOPIC))
{
- Pair<String, String> pair = HornetQDestination.decomposeQueueNameForDurableSubscription(queue.getName()
- .toString());
+ Pair<String, String> pair = ActiveMQDestination.decomposeQueueNameForDurableSubscription(queue.getName()
+ .toString());
clientID = pair.getA();
subName = pair.getB();
}
@@ -327,8 +327,8 @@ public class JMSTopicControlImpl extends StandardMBean implements TopicControl
// in the case of heirarchical topics the queue name will not follow the <part>.<part> pattern of normal
// durable subscribers so skip decomposing the name for the client ID and subscription name and just
// hard-code it
- clientID = "HornetQ";
- subName = "HornetQ";
+ clientID = "ActiveMQ";
+ subName = "ActiveMQ";
}
String filter = queue.getFilter() != null ? queue.getFilter() : null;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/JMSStorageManager.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/JMSStorageManager.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/JMSStorageManager.java
index cf0ae3f..1487e71 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/JMSStorageManager.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/JMSStorageManager.java
@@ -14,7 +14,7 @@ package org.apache.activemq.jms.persistence;
import java.util.List;
-import org.apache.activemq.core.server.HornetQComponent;
+import org.apache.activemq.core.server.ActiveMQComponent;
import org.apache.activemq.jms.persistence.config.PersistedConnectionFactory;
import org.apache.activemq.jms.persistence.config.PersistedDestination;
import org.apache.activemq.jms.persistence.config.PersistedJNDI;
@@ -27,7 +27,7 @@ import org.apache.activemq.jms.persistence.config.PersistedType;
*
*
*/
-public interface JMSStorageManager extends HornetQComponent
+public interface JMSStorageManager extends ActiveMQComponent
{
void load() throws Exception;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java
index f3efc5c..e0f414d 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java
@@ -101,7 +101,7 @@ public final class JMSJournalStorageManagerImpl implements JMSStorageManager
config.getJournalCompactMinFiles(),
config.getJournalCompactPercentage(),
bindingsJMS,
- "hornetq-jms",
+ "activemq-jms",
"jms",
1);
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/ActiveMQJMSServerBundle.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/ActiveMQJMSServerBundle.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/ActiveMQJMSServerBundle.java
new file mode 100644
index 0000000..25f5d5c
--- /dev/null
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/ActiveMQJMSServerBundle.java
@@ -0,0 +1,62 @@
+/*
+ * 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.jms.server;
+
+
+import org.apache.activemq.api.core.ActiveMQAddressExistsException;
+import org.apache.activemq.api.core.ActiveMQIllegalStateException;
+import org.apache.activemq.api.core.ActiveMQInternalErrorException;
+import org.jboss.logging.annotations.Cause;
+import org.jboss.logging.annotations.Message;
+import org.jboss.logging.annotations.MessageBundle;
+import org.jboss.logging.Messages;
+
+/**
+ * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
+ * 3/12/12
+ *
+ * Logger Code 12
+ *
+ * each message id must be 6 digits long starting with 10, the 3rd digit should be 9
+ *
+ * so 129000 to 129999
+ */
+@MessageBundle(projectCode = "AMQ")
+public interface ActiveMQJMSServerBundle
+{
+ ActiveMQJMSServerBundle BUNDLE = Messages.getBundle(ActiveMQJMSServerBundle.class);
+
+ @Message(id = 129000, value = "Connection Factory {0} does not exist" , format = Message.Format.MESSAGE_FORMAT)
+ ActiveMQInternalErrorException cfDoesntExist(String name);
+
+ @Message(id = 129001, value = "Invalid signature {0} parsing Connection Factory" , format = Message.Format.MESSAGE_FORMAT)
+ ActiveMQInternalErrorException invalidSignatureParsingCF(String sig);
+
+ @Message(id = 129002, value = "Invalid node {0} parsing Connection Factory", format = Message.Format.MESSAGE_FORMAT)
+ ActiveMQInternalErrorException invalidNodeParsingCF(String name);
+
+ @Message(id = 129003, value = "Discovery Group ''{0}'' does not exist on main config", format = Message.Format.MESSAGE_FORMAT)
+ ActiveMQIllegalStateException discoveryGroupDoesntExist(String name);
+
+ @Message(id = 129004, value = "No Connector name configured on create ConnectionFactory", format = Message.Format.MESSAGE_FORMAT)
+ ActiveMQIllegalStateException noConnectorNameOnCF();
+
+ @Message(id = 129005, value = "Connector ''{0}'' not found on the main configuration file" , format = Message.Format.MESSAGE_FORMAT)
+ ActiveMQIllegalStateException noConnectorNameConfiguredOnCF(String name);
+
+ @Message(id = 129006, value = "JNDI {0} is already being used by another connection factory", format = Message.Format.MESSAGE_FORMAT)
+ ActiveMQAddressExistsException cfJndiExists(String name);
+
+ @Message(id = 129007, value = "Error decoding password using codec instance", format = Message.Format.MESSAGE_FORMAT)
+ ActiveMQIllegalStateException errorDecodingPassword(@Cause Exception e);
+}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/ActiveMQJMSServerLogger.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/ActiveMQJMSServerLogger.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/ActiveMQJMSServerLogger.java
new file mode 100644
index 0000000..379f079
--- /dev/null
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/ActiveMQJMSServerLogger.java
@@ -0,0 +1,115 @@
+/*
+ * 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.jms.server;
+
+import org.apache.activemq.api.core.client.ClientSessionFactory;
+import org.apache.activemq.jms.server.recovery.XARecoveryConfig;
+import org.jboss.logging.BasicLogger;
+import org.jboss.logging.Logger;
+import org.jboss.logging.annotations.Cause;
+import org.jboss.logging.annotations.LogMessage;
+import org.jboss.logging.annotations.Message;
+import org.jboss.logging.annotations.MessageLogger;
+import org.w3c.dom.Node;
+
+/**
+ * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
+ * @author <a href="mailto:mtaylor@redhat.com">Martyn Taylor</a>
+ *
+ * Logger Code 12
+ *
+ * each message id must be 6 digits long starting with 12, the 3rd digit donates the level so
+ *
+ * INF0 1
+ * WARN 2
+ * DEBUG 3
+ * ERROR 4
+ * TRACE 5
+ * FATAL 6
+ *
+ * so an INFO message would be 121000 to 121999
+ */
+@MessageLogger(projectCode = "AMQ")
+public interface ActiveMQJMSServerLogger extends BasicLogger
+{
+ /**
+ * The default logger.
+ */
+ ActiveMQJMSServerLogger LOGGER = Logger.getMessageLogger(ActiveMQJMSServerLogger.class, ActiveMQJMSServerLogger.class.getPackage().getName());
+
+ @LogMessage(level = Logger.Level.INFO)
+ @Message(id = 121003, value = "JMS Server Manager Running cached command for {0}" , format = Message.Format.MESSAGE_FORMAT)
+ void serverRunningCachedCommand(Runnable run);
+
+ @LogMessage(level = Logger.Level.INFO)
+ @Message(id = 121004, value = "JMS Server Manager Caching command for {0} since the JMS Server is not active yet",
+ format = Message.Format.MESSAGE_FORMAT)
+ void serverCachingCommand(Object runnable);
+
+ @LogMessage(level = Logger.Level.INFO)
+ @Message(id = 121005, value = "Invalid \"host\" value \"0.0.0.0\" detected for \"{0}\" connector. Switching to \"{1}\". If this new address is incorrect please manually configure the connector to use the proper one.",
+ format = Message.Format.MESSAGE_FORMAT)
+ void invalidHostForConnector(String name, String newHost);
+
+ @LogMessage(level = Logger.Level.WARN)
+ @Message(id = 122007, value = "Queue {0} does not exist on the topic {1}. It was deleted manually probably." , format = Message.Format.MESSAGE_FORMAT)
+ void noQueueOnTopic(String queueName, String name);
+
+ @LogMessage(level = Logger.Level.WARN)
+ @Message(id = 122008, value = "XA Recovery can not connect to any ActiveMQ server on recovery {0}" , format = Message.Format.MESSAGE_FORMAT)
+ void recoveryConnectFailed(String s);
+
+ @LogMessage(level = Logger.Level.WARN)
+ @Message(id = 122011, value = "error unbinding {0} from JNDI" , format = Message.Format.MESSAGE_FORMAT)
+ void jndiUnbindError(@Cause Exception e, String key);
+
+ @LogMessage(level = Logger.Level.WARN)
+ @Message(id = 122012, value = "JMS Server Manager error" , format = Message.Format.MESSAGE_FORMAT)
+ void jmsServerError(@Cause Exception e);
+
+ @LogMessage(level = Logger.Level.WARN)
+ @Message(id = 122013, value = "Error in XA Recovery recover" , format = Message.Format.MESSAGE_FORMAT)
+ void xaRecoverError(@Cause Exception e);
+
+ @LogMessage(level = Logger.Level.WARN)
+ @Message(id = 122014, value = "Notified of connection failure in xa recovery connectionFactory for provider {0} will attempt reconnect on next pass",
+ format = Message.Format.MESSAGE_FORMAT)
+ void xaRecoverConnectionError(@Cause Exception e, ClientSessionFactory csf);
+
+ @LogMessage(level = Logger.Level.WARN)
+ @Message(id = 122015, value = "Can not connect to {0} on auto-generated resource recovery",
+ format = Message.Format.MESSAGE_FORMAT)
+ void xaRecoverAutoConnectionError(@Cause Throwable e, XARecoveryConfig csf);
+
+ @LogMessage(level = Logger.Level.DEBUG)
+ @Message(id = 122016, value = "Error in XA Recovery" , format = Message.Format.MESSAGE_FORMAT)
+ void xaRecoveryError(@Cause Exception e);
+
+ @LogMessage(level = Logger.Level.WARN)
+ @Message(id = 122017, value = "Tried to correct invalid \"host\" value \"0.0.0.0\" for \"{0}\" connector, but received an exception.",
+ format = Message.Format.MESSAGE_FORMAT)
+ void failedToCorrectHost(@Cause Exception e, String name);
+
+ @LogMessage(level = Logger.Level.WARN)
+ @Message(id = 122018, value = "Could not start recovery discovery on {0}, we will retry every recovery scan until the server is available",
+ format = Message.Format.MESSAGE_FORMAT)
+ void xaRecoveryStartError(XARecoveryConfig e);
+
+ @LogMessage(level = Logger.Level.ERROR)
+ @Message(id = 124000, value = "key attribute missing for JMS configuration {0}" , format = Message.Format.MESSAGE_FORMAT)
+ void jmsConfigMissingKey(Node e);
+
+ @LogMessage(level = Logger.Level.ERROR)
+ @Message(id = 124002, value = "Failed to start JMS deployer" , format = Message.Format.MESSAGE_FORMAT)
+ void jmsDeployerStartError(@Cause Exception e);
+}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/HornetQJMSServerBundle.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/HornetQJMSServerBundle.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/HornetQJMSServerBundle.java
deleted file mode 100644
index 474c990..0000000
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/HornetQJMSServerBundle.java
+++ /dev/null
@@ -1,62 +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.jms.server;
-
-
-import org.apache.activemq.api.core.ActiveMQAddressExistsException;
-import org.apache.activemq.api.core.ActiveMQIllegalStateException;
-import org.apache.activemq.api.core.ActiveMQInternalErrorException;
-import org.jboss.logging.annotations.Cause;
-import org.jboss.logging.annotations.Message;
-import org.jboss.logging.annotations.MessageBundle;
-import org.jboss.logging.Messages;
-
-/**
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- * 3/12/12
- *
- * Logger Code 12
- *
- * each message id must be 6 digits long starting with 10, the 3rd digit should be 9
- *
- * so 129000 to 129999
- */
-@MessageBundle(projectCode = "HQ")
-public interface HornetQJMSServerBundle
-{
- HornetQJMSServerBundle BUNDLE = Messages.getBundle(HornetQJMSServerBundle.class);
-
- @Message(id = 129000, value = "Connection Factory {0} does not exist" , format = Message.Format.MESSAGE_FORMAT)
- ActiveMQInternalErrorException cfDoesntExist(String name);
-
- @Message(id = 129001, value = "Invalid signature {0} parsing Connection Factory" , format = Message.Format.MESSAGE_FORMAT)
- ActiveMQInternalErrorException invalidSignatureParsingCF(String sig);
-
- @Message(id = 129002, value = "Invalid node {0} parsing Connection Factory", format = Message.Format.MESSAGE_FORMAT)
- ActiveMQInternalErrorException invalidNodeParsingCF(String name);
-
- @Message(id = 129003, value = "Discovery Group ''{0}'' does not exist on main config", format = Message.Format.MESSAGE_FORMAT)
- ActiveMQIllegalStateException discoveryGroupDoesntExist(String name);
-
- @Message(id = 129004, value = "No Connector name configured on create ConnectionFactory", format = Message.Format.MESSAGE_FORMAT)
- ActiveMQIllegalStateException noConnectorNameOnCF();
-
- @Message(id = 129005, value = "Connector ''{0}'' not found on the main configuration file" , format = Message.Format.MESSAGE_FORMAT)
- ActiveMQIllegalStateException noConnectorNameConfiguredOnCF(String name);
-
- @Message(id = 129006, value = "JNDI {0} is already being used by another connection factory", format = Message.Format.MESSAGE_FORMAT)
- ActiveMQAddressExistsException cfJndiExists(String name);
-
- @Message(id = 129007, value = "Error decoding password using codec instance", format = Message.Format.MESSAGE_FORMAT)
- ActiveMQIllegalStateException errorDecodingPassword(@Cause Exception e);
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/HornetQJMSServerLogger.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/HornetQJMSServerLogger.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/HornetQJMSServerLogger.java
deleted file mode 100644
index 89af42f..0000000
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/HornetQJMSServerLogger.java
+++ /dev/null
@@ -1,115 +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.jms.server;
-
-import org.apache.activemq.api.core.client.ClientSessionFactory;
-import org.apache.activemq.jms.server.recovery.XARecoveryConfig;
-import org.jboss.logging.BasicLogger;
-import org.jboss.logging.Logger;
-import org.jboss.logging.annotations.Cause;
-import org.jboss.logging.annotations.LogMessage;
-import org.jboss.logging.annotations.Message;
-import org.jboss.logging.annotations.MessageLogger;
-import org.w3c.dom.Node;
-
-/**
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- * @author <a href="mailto:mtaylor@redhat.com">Martyn Taylor</a>
- *
- * Logger Code 12
- *
- * each message id must be 6 digits long starting with 12, the 3rd digit donates the level so
- *
- * INF0 1
- * WARN 2
- * DEBUG 3
- * ERROR 4
- * TRACE 5
- * FATAL 6
- *
- * so an INFO message would be 121000 to 121999
- */
-@MessageLogger(projectCode = "HQ")
-public interface HornetQJMSServerLogger extends BasicLogger
-{
- /**
- * The default logger.
- */
- HornetQJMSServerLogger LOGGER = Logger.getMessageLogger(HornetQJMSServerLogger.class, HornetQJMSServerLogger.class.getPackage().getName());
-
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 121003, value = "JMS Server Manager Running cached command for {0}" , format = Message.Format.MESSAGE_FORMAT)
- void serverRunningCachedCommand(Runnable run);
-
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 121004, value = "JMS Server Manager Caching command for {0} since the JMS Server is not active yet",
- format = Message.Format.MESSAGE_FORMAT)
- void serverCachingCommand(Object runnable);
-
- @LogMessage(level = Logger.Level.INFO)
- @Message(id = 121005, value = "Invalid \"host\" value \"0.0.0.0\" detected for \"{0}\" connector. Switching to \"{1}\". If this new address is incorrect please manually configure the connector to use the proper one.",
- format = Message.Format.MESSAGE_FORMAT)
- void invalidHostForConnector(String name, String newHost);
-
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 122007, value = "Queue {0} does not exist on the topic {1}. It was deleted manually probably." , format = Message.Format.MESSAGE_FORMAT)
- void noQueueOnTopic(String queueName, String name);
-
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 122008, value = "XA Recovery can not connect to any hornetq server on recovery {0}" , format = Message.Format.MESSAGE_FORMAT)
- void recoveryConnectFailed(String s);
-
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 122011, value = "error unbinding {0} from JNDI" , format = Message.Format.MESSAGE_FORMAT)
- void jndiUnbindError(@Cause Exception e, String key);
-
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 122012, value = "JMS Server Manager error" , format = Message.Format.MESSAGE_FORMAT)
- void jmsServerError(@Cause Exception e);
-
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 122013, value = "Error in XA Recovery recover" , format = Message.Format.MESSAGE_FORMAT)
- void xaRecoverError(@Cause Exception e);
-
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 122014, value = "Notified of connection failure in xa recovery connectionFactory for provider {0} will attempt reconnect on next pass",
- format = Message.Format.MESSAGE_FORMAT)
- void xaRecoverConnectionError(@Cause Exception e, ClientSessionFactory csf);
-
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 122015, value = "Can not connect to {0} on auto-generated resource recovery",
- format = Message.Format.MESSAGE_FORMAT)
- void xaRecoverAutoConnectionError(@Cause Throwable e, XARecoveryConfig csf);
-
- @LogMessage(level = Logger.Level.DEBUG)
- @Message(id = 122016, value = "Error in XA Recovery" , format = Message.Format.MESSAGE_FORMAT)
- void xaRecoveryError(@Cause Exception e);
-
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 122017, value = "Tried to correct invalid \"host\" value \"0.0.0.0\" for \"{0}\" connector, but received an exception.",
- format = Message.Format.MESSAGE_FORMAT)
- void failedToCorrectHost(@Cause Exception e, String name);
-
- @LogMessage(level = Logger.Level.WARN)
- @Message(id = 122018, value = "Could not start recovery discovery on {0}, we will retry every recovery scan until the server is available",
- format = Message.Format.MESSAGE_FORMAT)
- void xaRecoveryStartError(XARecoveryConfig e);
-
- @LogMessage(level = Logger.Level.ERROR)
- @Message(id = 124000, value = "key attribute missing for JMS configuration {0}" , format = Message.Format.MESSAGE_FORMAT)
- void jmsConfigMissingKey(Node e);
-
- @LogMessage(level = Logger.Level.ERROR)
- @Message(id = 124002, value = "Failed to start JMS deployer" , format = Message.Format.MESSAGE_FORMAT)
- void jmsDeployerStartError(@Cause Exception e);
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/JMSServerManager.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/JMSServerManager.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/JMSServerManager.java
index fd82e69..d3548f1 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/JMSServerManager.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/JMSServerManager.java
@@ -19,10 +19,10 @@ import javax.naming.Context;
import org.apache.activemq.api.jms.JMSFactoryType;
import org.apache.activemq.core.security.Role;
-import org.apache.activemq.core.server.HornetQComponent;
-import org.apache.activemq.core.server.HornetQServer;
+import org.apache.activemq.core.server.ActiveMQComponent;
+import org.apache.activemq.core.server.ActiveMQServer;
import org.apache.activemq.core.settings.impl.AddressSettings;
-import org.apache.activemq.jms.client.HornetQConnectionFactory;
+import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration;
import org.apache.activemq.spi.core.naming.BindingRegistry;
@@ -33,7 +33,7 @@ import org.apache.activemq.spi.core.naming.BindingRegistry;
* @author <a href="jmesnil@redhat.com">Jeff Mesnil</a>
* @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a>
*/
-public interface JMSServerManager extends HornetQComponent
+public interface JMSServerManager extends ActiveMQComponent
{
String getVersion();
@@ -183,7 +183,7 @@ public interface JMSServerManager extends HornetQComponent
/** Call this method to have a CF rebound to JNDI and stored on the Journal
* @throws Exception */
- HornetQConnectionFactory recreateCF(String name, ConnectionFactoryConfiguration cf) throws Exception;
+ ActiveMQConnectionFactory recreateCF(String name, ConnectionFactoryConfiguration cf) throws Exception;
void createConnectionFactory(String name, boolean ha, JMSFactoryType cfType, String discoveryGroupName, String ... jndiBindings) throws Exception;
@@ -298,7 +298,7 @@ public interface JMSServerManager extends HornetQComponent
void setContext(final Context context);
- HornetQServer getHornetQServer();
+ ActiveMQServer getActiveMQServer();
void addAddressSettings(String address, AddressSettings addressSettings);
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java
index fcda258..fcc7a04 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java
@@ -17,7 +17,7 @@ import java.util.List;
import org.apache.activemq.api.core.ActiveMQBuffer;
import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.HornetQClient;
+import org.apache.activemq.api.core.client.ActiveMQClient;
import org.apache.activemq.api.jms.JMSFactoryType;
import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration;
import org.apache.activemq.utils.BufferHelper;
@@ -50,65 +50,65 @@ public class ConnectionFactoryConfigurationImpl implements ConnectionFactoryConf
private String clientID = null;
- private boolean ha = HornetQClient.DEFAULT_HA;
+ private boolean ha = ActiveMQClient.DEFAULT_HA;
- private long clientFailureCheckPeriod = HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD;
+ private long clientFailureCheckPeriod = ActiveMQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD;
- private long connectionTTL = HornetQClient.DEFAULT_CONNECTION_TTL;
+ private long connectionTTL = ActiveMQClient.DEFAULT_CONNECTION_TTL;
- private long callTimeout = HornetQClient.DEFAULT_CALL_TIMEOUT;
+ private long callTimeout = ActiveMQClient.DEFAULT_CALL_TIMEOUT;
- private long callFailoverTimeout = HornetQClient.DEFAULT_CALL_FAILOVER_TIMEOUT;
+ private long callFailoverTimeout = ActiveMQClient.DEFAULT_CALL_FAILOVER_TIMEOUT;
- private boolean cacheLargeMessagesClient = HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT;
+ private boolean cacheLargeMessagesClient = ActiveMQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT;
- private int minLargeMessageSize = HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE;
+ private int minLargeMessageSize = ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE;
- private boolean compressLargeMessage = HornetQClient.DEFAULT_COMPRESS_LARGE_MESSAGES;
+ private boolean compressLargeMessage = ActiveMQClient.DEFAULT_COMPRESS_LARGE_MESSAGES;
- private int consumerWindowSize = HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE;
+ private int consumerWindowSize = ActiveMQClient.DEFAULT_CONSUMER_WINDOW_SIZE;
- private int consumerMaxRate = HornetQClient.DEFAULT_CONSUMER_MAX_RATE;
+ private int consumerMaxRate = ActiveMQClient.DEFAULT_CONSUMER_MAX_RATE;
- private int confirmationWindowSize = HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE;
+ private int confirmationWindowSize = ActiveMQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE;
- private int producerWindowSize = HornetQClient.DEFAULT_PRODUCER_WINDOW_SIZE;
+ private int producerWindowSize = ActiveMQClient.DEFAULT_PRODUCER_WINDOW_SIZE;
- private int producerMaxRate = HornetQClient.DEFAULT_PRODUCER_MAX_RATE;
+ private int producerMaxRate = ActiveMQClient.DEFAULT_PRODUCER_MAX_RATE;
- private boolean blockOnAcknowledge = HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE;
+ private boolean blockOnAcknowledge = ActiveMQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE;
- private boolean blockOnDurableSend = HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND;
+ private boolean blockOnDurableSend = ActiveMQClient.DEFAULT_BLOCK_ON_DURABLE_SEND;
- private boolean blockOnNonDurableSend = HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND;
+ private boolean blockOnNonDurableSend = ActiveMQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND;
- private boolean autoGroup = HornetQClient.DEFAULT_AUTO_GROUP;
+ private boolean autoGroup = ActiveMQClient.DEFAULT_AUTO_GROUP;
- private boolean preAcknowledge = HornetQClient.DEFAULT_PRE_ACKNOWLEDGE;
+ private boolean preAcknowledge = ActiveMQClient.DEFAULT_PRE_ACKNOWLEDGE;
- private String loadBalancingPolicyClassName = HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME;
+ private String loadBalancingPolicyClassName = ActiveMQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME;
- private int transactionBatchSize = HornetQClient.DEFAULT_ACK_BATCH_SIZE;
+ private int transactionBatchSize = ActiveMQClient.DEFAULT_ACK_BATCH_SIZE;
- private int dupsOKBatchSize = HornetQClient.DEFAULT_ACK_BATCH_SIZE;
+ private int dupsOKBatchSize = ActiveMQClient.DEFAULT_ACK_BATCH_SIZE;
- private long initialWaitTimeout = HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT;
+ private long initialWaitTimeout = ActiveMQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT;
- private boolean useGlobalPools = HornetQClient.DEFAULT_USE_GLOBAL_POOLS;
+ private boolean useGlobalPools = ActiveMQClient.DEFAULT_USE_GLOBAL_POOLS;
- private int scheduledThreadPoolMaxSize = HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE;
+ private int scheduledThreadPoolMaxSize = ActiveMQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE;
- private int threadPoolMaxSize = HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE;
+ private int threadPoolMaxSize = ActiveMQClient.DEFAULT_THREAD_POOL_MAX_SIZE;
- private long retryInterval = HornetQClient.DEFAULT_RETRY_INTERVAL;
+ private long retryInterval = ActiveMQClient.DEFAULT_RETRY_INTERVAL;
- private double retryIntervalMultiplier = HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER;
+ private double retryIntervalMultiplier = ActiveMQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER;
- private long maxRetryInterval = HornetQClient.DEFAULT_MAX_RETRY_INTERVAL;
+ private long maxRetryInterval = ActiveMQClient.DEFAULT_MAX_RETRY_INTERVAL;
- private int reconnectAttempts = HornetQClient.DEFAULT_RECONNECT_ATTEMPTS;
+ private int reconnectAttempts = ActiveMQClient.DEFAULT_RECONNECT_ATTEMPTS;
- private boolean failoverOnInitialConnection = HornetQClient.DEFAULT_FAILOVER_ON_INITIAL_CONNECTION;
+ private boolean failoverOnInitialConnection = ActiveMQClient.DEFAULT_FAILOVER_ON_INITIAL_CONNECTION;
private String groupID = null;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/embedded/EmbeddedJMS.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/embedded/EmbeddedJMS.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/embedded/EmbeddedJMS.java
index 159241b..047d457 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/embedded/EmbeddedJMS.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/embedded/EmbeddedJMS.java
@@ -16,14 +16,14 @@ import javax.naming.Context;
import org.apache.activemq.core.registry.JndiBindingRegistry;
import org.apache.activemq.core.registry.MapBindingRegistry;
-import org.apache.activemq.core.server.embedded.EmbeddedHornetQ;
+import org.apache.activemq.core.server.embedded.EmbeddedActiveMQ;
import org.apache.activemq.jms.server.config.JMSConfiguration;
import org.apache.activemq.jms.server.impl.JMSServerManagerImpl;
import org.apache.activemq.spi.core.naming.BindingRegistry;
/**
- * Simple bootstrap class that parses hornetq config files (server and jms and security) and starts
- * a HornetQServer instance and populates it with configured JMS endpoints.
+ * Simple bootstrap class that parses activemq config files (server and jms and security) and starts
+ * a ActiveMQServer instance and populates it with configured JMS endpoints.
* <p>
* JMS Endpoints are registered with a simple MapBindingRegistry. If you want to use a different registry
* you must set the registry property of this class or call the setRegistry() method if you want to use JNDI
@@ -31,7 +31,7 @@ import org.apache.activemq.spi.core.naming.BindingRegistry;
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
* @version $Revision: 1 $
*/
-public class EmbeddedJMS extends EmbeddedHornetQ
+public class EmbeddedJMS extends EmbeddedActiveMQ
{
protected JMSServerManagerImpl serverManager;
protected BindingRegistry registry;
@@ -40,7 +40,7 @@ public class EmbeddedJMS extends EmbeddedHornetQ
protected Context context;
/**
- * Classpath resource where JMS config file is. Defaults to 'hornetq-jms.xml'
+ * Classpath resource where JMS config file is. Defaults to 'activemq-jms.xml'
*
* @param jmsConfigResourcePath
*/
@@ -101,10 +101,10 @@ public class EmbeddedJMS extends EmbeddedHornetQ
super.initStart();
if (jmsConfiguration != null)
{
- serverManager = new JMSServerManagerImpl(hornetQServer, jmsConfiguration);
+ serverManager = new JMSServerManagerImpl(activeMQServer, jmsConfiguration);
}
- else if (jmsConfigResourcePath == null) serverManager = new JMSServerManagerImpl(hornetQServer);
- else serverManager = new JMSServerManagerImpl(hornetQServer, jmsConfigResourcePath);
+ else if (jmsConfigResourcePath == null) serverManager = new JMSServerManagerImpl(activeMQServer);
+ else serverManager = new JMSServerManagerImpl(activeMQServer, jmsConfigResourcePath);
if (registry == null)
{
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerConfigParserImpl.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerConfigParserImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerConfigParserImpl.java
index 0ecb5de..d959fab 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerConfigParserImpl.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerConfigParserImpl.java
@@ -20,11 +20,11 @@ import java.util.List;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.client.HornetQClient;
+import org.apache.activemq.api.core.client.ActiveMQClient;
import org.apache.activemq.api.jms.JMSFactoryType;
import org.apache.activemq.core.config.impl.Validators;
-import org.apache.activemq.jms.server.HornetQJMSServerBundle;
-import org.apache.activemq.jms.server.HornetQJMSServerLogger;
+import org.apache.activemq.jms.server.ActiveMQJMSServerBundle;
+import org.apache.activemq.jms.server.ActiveMQJMSServerLogger;
import org.apache.activemq.jms.server.JMSServerConfigParser;
import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration;
import org.apache.activemq.jms.server.config.JMSConfiguration;
@@ -92,7 +92,7 @@ public final class JMSServerConfigParserImpl implements JMSServerConfigParser
Node keyNode = node.getAttributes().getNamedItem(JMSServerConfigParserImpl.NAME_ATTR);
if (keyNode == null)
{
- HornetQJMSServerLogger.LOGGER.jmsConfigMissingKey(node);
+ ActiveMQJMSServerLogger.LOGGER.jmsConfigMissingKey(node);
continue;
}
@@ -197,7 +197,7 @@ public final class JMSServerConfigParserImpl implements JMSServerConfigParser
if (!node.getNodeName().equals(JMSServerDeployer.CONNECTION_FACTORY_NODE_NAME))
{
// sanity check, this shouldn't ever happen
- throw HornetQJMSServerBundle.BUNDLE.invalidNodeParsingCF(node.getNodeName());
+ throw ActiveMQJMSServerBundle.BUNDLE.invalidNodeParsingCF(node.getNodeName());
}
Element e = (Element) node;
@@ -206,116 +206,116 @@ public final class JMSServerConfigParserImpl implements JMSServerConfigParser
String fact = e.getAttribute("signature");
boolean isXA = XMLConfigurationUtil.getBoolean(e,
"xa",
- HornetQClient.DEFAULT_XA);
+ ActiveMQClient.DEFAULT_XA);
JMSFactoryType factType = resolveFactoryType(fact, isXA);
long clientFailureCheckPeriod = XMLConfigurationUtil.getLong(e,
"client-failure-check-period",
- HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD,
+ ActiveMQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD,
Validators.MINUS_ONE_OR_GT_ZERO);
long connectionTTL = XMLConfigurationUtil.getLong(e,
"connection-ttl",
- HornetQClient.DEFAULT_CONNECTION_TTL,
+ ActiveMQClient.DEFAULT_CONNECTION_TTL,
Validators.MINUS_ONE_OR_GE_ZERO);
long callTimeout = XMLConfigurationUtil.getLong(e,
"call-timeout",
- HornetQClient.DEFAULT_CALL_TIMEOUT,
+ ActiveMQClient.DEFAULT_CALL_TIMEOUT,
Validators.GE_ZERO);
long callFailoverTimeout = XMLConfigurationUtil.getLong(e,
"call-failover-timeout",
- HornetQClient.DEFAULT_CALL_FAILOVER_TIMEOUT,
+ ActiveMQClient.DEFAULT_CALL_FAILOVER_TIMEOUT,
Validators.MINUS_ONE_OR_GT_ZERO);
String clientID = XMLConfigurationUtil.getString(e, "client-id", null, Validators.NO_CHECK);
int dupsOKBatchSize = XMLConfigurationUtil.getInteger(e,
"dups-ok-batch-size",
- HornetQClient.DEFAULT_ACK_BATCH_SIZE,
+ ActiveMQClient.DEFAULT_ACK_BATCH_SIZE,
Validators.GT_ZERO);
int transactionBatchSize = XMLConfigurationUtil.getInteger(e,
"transaction-batch-size",
- HornetQClient.DEFAULT_ACK_BATCH_SIZE,
+ ActiveMQClient.DEFAULT_ACK_BATCH_SIZE,
Validators.GT_ZERO);
int consumerWindowSize = XMLConfigurationUtil.getInteger(e,
"consumer-window-size",
- HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE,
+ ActiveMQClient.DEFAULT_CONSUMER_WINDOW_SIZE,
Validators.MINUS_ONE_OR_GE_ZERO);
int producerWindowSize = XMLConfigurationUtil.getInteger(e,
"producer-window-size",
- HornetQClient.DEFAULT_PRODUCER_WINDOW_SIZE,
+ ActiveMQClient.DEFAULT_PRODUCER_WINDOW_SIZE,
Validators.MINUS_ONE_OR_GT_ZERO);
int consumerMaxRate = XMLConfigurationUtil.getInteger(e,
"consumer-max-rate",
- HornetQClient.DEFAULT_CONSUMER_MAX_RATE,
+ ActiveMQClient.DEFAULT_CONSUMER_MAX_RATE,
Validators.MINUS_ONE_OR_GT_ZERO);
int confirmationWindowSize = XMLConfigurationUtil.getInteger(e,
"confirmation-window-size",
- HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE,
+ ActiveMQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE,
Validators.MINUS_ONE_OR_GT_ZERO);
int producerMaxRate = XMLConfigurationUtil.getInteger(e,
"producer-max-rate",
- HornetQClient.DEFAULT_PRODUCER_MAX_RATE,
+ ActiveMQClient.DEFAULT_PRODUCER_MAX_RATE,
Validators.MINUS_ONE_OR_GT_ZERO);
boolean cacheLargeMessagesClient = XMLConfigurationUtil.getBoolean(e,
"cache-large-message-client",
- HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT);
+ ActiveMQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT);
int minLargeMessageSize = XMLConfigurationUtil.getInteger(e,
"min-large-message-size",
- HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE,
+ ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE,
Validators.GT_ZERO);
boolean compressLargeMessages = XMLConfigurationUtil.getBoolean(e,
"compress-large-messages",
- HornetQClient.DEFAULT_COMPRESS_LARGE_MESSAGES);
+ ActiveMQClient.DEFAULT_COMPRESS_LARGE_MESSAGES);
boolean blockOnAcknowledge = XMLConfigurationUtil.getBoolean(e,
"block-on-acknowledge",
- HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE);
+ ActiveMQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE);
boolean blockOnNonDurableSend = XMLConfigurationUtil.getBoolean(e,
"block-on-non-durable-send",
- HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND);
+ ActiveMQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND);
boolean blockOnDurableSend = XMLConfigurationUtil.getBoolean(e,
"block-on-durable-send",
- HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND);
- boolean autoGroup = XMLConfigurationUtil.getBoolean(e, "auto-group", HornetQClient.DEFAULT_AUTO_GROUP);
+ ActiveMQClient.DEFAULT_BLOCK_ON_DURABLE_SEND);
+ boolean autoGroup = XMLConfigurationUtil.getBoolean(e, "auto-group", ActiveMQClient.DEFAULT_AUTO_GROUP);
boolean preAcknowledge = XMLConfigurationUtil.getBoolean(e,
"pre-acknowledge",
- HornetQClient.DEFAULT_PRE_ACKNOWLEDGE);
+ ActiveMQClient.DEFAULT_PRE_ACKNOWLEDGE);
long retryInterval = XMLConfigurationUtil.getLong(e,
"retry-interval",
- HornetQClient.DEFAULT_RETRY_INTERVAL,
+ ActiveMQClient.DEFAULT_RETRY_INTERVAL,
Validators.GT_ZERO);
double retryIntervalMultiplier = XMLConfigurationUtil.getDouble(e,
"retry-interval-multiplier",
- HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER,
+ ActiveMQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER,
Validators.GT_ZERO);
long maxRetryInterval = XMLConfigurationUtil.getLong(e,
"max-retry-interval",
- HornetQClient.DEFAULT_MAX_RETRY_INTERVAL,
+ ActiveMQClient.DEFAULT_MAX_RETRY_INTERVAL,
Validators.GT_ZERO);
int reconnectAttempts = XMLConfigurationUtil.getInteger(e,
"reconnect-attempts",
- HornetQClient.DEFAULT_RECONNECT_ATTEMPTS,
+ ActiveMQClient.DEFAULT_RECONNECT_ATTEMPTS,
Validators.MINUS_ONE_OR_GE_ZERO);
boolean failoverOnInitialConnection = XMLConfigurationUtil.getBoolean(e,
"failover-on-initial-connection",
- HornetQClient.DEFAULT_FAILOVER_ON_INITIAL_CONNECTION);
+ ActiveMQClient.DEFAULT_FAILOVER_ON_INITIAL_CONNECTION);
boolean useGlobalPools = XMLConfigurationUtil.getBoolean(e,
"use-global-pools",
- HornetQClient.DEFAULT_USE_GLOBAL_POOLS);
+ ActiveMQClient.DEFAULT_USE_GLOBAL_POOLS);
int scheduledThreadPoolMaxSize = XMLConfigurationUtil.getInteger(e,
"scheduled-thread-pool-max-size",
- HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE,
+ ActiveMQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE,
Validators.MINUS_ONE_OR_GT_ZERO);
int threadPoolMaxSize = XMLConfigurationUtil.getInteger(e,
"thread-pool-max-size",
- HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE,
+ ActiveMQClient.DEFAULT_THREAD_POOL_MAX_SIZE,
Validators.MINUS_ONE_OR_GT_ZERO);
String connectionLoadBalancingPolicyClassName = XMLConfigurationUtil.getString(e,
"connection-load-balancing-policy-class-name",
- HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME,
+ ActiveMQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME,
Validators.NOT_NULL_OR_EMPTY);
- boolean ha = XMLConfigurationUtil.getBoolean(e, "ha", HornetQClient.DEFAULT_HA);
+ boolean ha = XMLConfigurationUtil.getBoolean(e, "ha", ActiveMQClient.DEFAULT_HA);
String groupid = XMLConfigurationUtil.getString(e, "group-id", null, Validators.NO_CHECK);
List<String> jndiBindings = new ArrayList<String>();
@@ -458,7 +458,7 @@ public final class JMSServerConfigParserImpl implements JMSServerConfigParser
return JMSFactoryType.TOPIC_CF;
}
}
- throw HornetQJMSServerBundle.BUNDLE.invalidSignatureParsingCF(fact);
+ throw ActiveMQJMSServerBundle.BUNDLE.invalidSignatureParsingCF(fact);
}
/**
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerDeployer.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerDeployer.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerDeployer.java
index ae5730a..2bab2bd 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerDeployer.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerDeployer.java
@@ -96,8 +96,8 @@ public class JMSServerDeployer extends XmlDeployer
}
/**
- * Creates the object to bind, this will either be a JBossConnectionFActory, HornetQQueue or
- * HornetQTopic.
+ * Creates the object to bind, this will either be a JBossConnectionFActory, ActiveMQQueue or
+ * ActiveMQTopic.
*
* @param node the config
* @throws Exception
@@ -147,7 +147,7 @@ public class JMSServerDeployer extends XmlDeployer
@Override
public String[] getDefaultConfigFileNames()
{
- return new String[]{"hornetq-jms.xml"};
+ return new String[]{"activemq-jms.xml"};
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerManagerImpl.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerManagerImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerManagerImpl.java
index b8b2d5f..943d9f4 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerManagerImpl.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerManagerImpl.java
@@ -37,7 +37,7 @@ 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.ResourceNames;
-import org.apache.activemq.api.jms.HornetQJMSClient;
+import org.apache.activemq.api.jms.ActiveMQJMSClient;
import org.apache.activemq.api.jms.JMSFactoryType;
import org.apache.activemq.core.config.Configuration;
import org.apache.activemq.core.deployers.DeploymentManager;
@@ -50,18 +50,18 @@ import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory;
import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
import org.apache.activemq.core.security.Role;
import org.apache.activemq.core.server.ActivateCallback;
-import org.apache.activemq.core.server.HornetQServer;
+import org.apache.activemq.core.server.ActiveMQServer;
import org.apache.activemq.core.server.Queue;
-import org.apache.activemq.core.server.impl.HornetQServerImpl;
+import org.apache.activemq.core.server.impl.ActiveMQServerImpl;
import org.apache.activemq.core.server.management.Notification;
import org.apache.activemq.core.settings.impl.AddressSettings;
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.jms.client.HornetQConnectionFactory;
-import org.apache.activemq.jms.client.HornetQDestination;
-import org.apache.activemq.jms.client.HornetQQueue;
-import org.apache.activemq.jms.client.HornetQTopic;
+import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.jms.client.ActiveMQDestination;
+import org.apache.activemq.jms.client.ActiveMQQueue;
+import org.apache.activemq.jms.client.ActiveMQTopic;
import org.apache.activemq.jms.client.SelectorTranslator;
import org.apache.activemq.jms.persistence.JMSStorageManager;
import org.apache.activemq.jms.persistence.config.PersistedConnectionFactory;
@@ -70,8 +70,8 @@ import org.apache.activemq.jms.persistence.config.PersistedJNDI;
import org.apache.activemq.jms.persistence.config.PersistedType;
import org.apache.activemq.jms.persistence.impl.journal.JMSJournalStorageManagerImpl;
import org.apache.activemq.jms.persistence.impl.nullpm.NullJMSStorageManagerImpl;
-import org.apache.activemq.jms.server.HornetQJMSServerBundle;
-import org.apache.activemq.jms.server.HornetQJMSServerLogger;
+import org.apache.activemq.jms.server.ActiveMQJMSServerBundle;
+import org.apache.activemq.jms.server.ActiveMQJMSServerLogger;
import org.apache.activemq.jms.server.JMSServerManager;
import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration;
import org.apache.activemq.jms.server.config.JMSConfiguration;
@@ -106,15 +106,15 @@ import org.apache.activemq.utils.json.JSONObject;
*/
public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
{
- private static final String REJECT_FILTER = HornetQServerImpl.GENERIC_IGNORED_FILTER;
+ private static final String REJECT_FILTER = ActiveMQServerImpl.GENERIC_IGNORED_FILTER;
private BindingRegistry registry;
- private final Map<String, HornetQQueue> queues = new HashMap<String, HornetQQueue>();
+ private final Map<String, ActiveMQQueue> queues = new HashMap<String, ActiveMQQueue>();
- private final Map<String, HornetQTopic> topics = new HashMap<String, HornetQTopic>();
+ private final Map<String, ActiveMQTopic> topics = new HashMap<String, ActiveMQTopic>();
- private final Map<String, HornetQConnectionFactory> connectionFactories = new HashMap<String, HornetQConnectionFactory>();
+ private final Map<String, ActiveMQConnectionFactory> connectionFactories = new HashMap<String, ActiveMQConnectionFactory>();
private final Map<String, List<String>> queueJNDI = new HashMap<String, List<String>>();
@@ -125,7 +125,7 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
// We keep things cached if objects are created while the JMS is not active
private final List<Runnable> cachedCommands = new ArrayList<Runnable>();
- private final HornetQServer server;
+ private final ActiveMQServer server;
private JMSManagementService jmsManagementService;
@@ -149,7 +149,7 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
private final Map<String, List<String>> unRecoveredJndi = new HashMap<String, List<String>>();
- public JMSServerManagerImpl(final HornetQServer server) throws Exception
+ public JMSServerManagerImpl(final ActiveMQServer server) throws Exception
{
this.server = server;
@@ -165,7 +165,7 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
* @param registry
* @throws Exception
*/
- public JMSServerManagerImpl(final HornetQServer server, final BindingRegistry registry) throws Exception
+ public JMSServerManagerImpl(final ActiveMQServer server, final BindingRegistry registry) throws Exception
{
this.server = server;
@@ -176,7 +176,7 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
this.registry = registry;
}
- public JMSServerManagerImpl(final HornetQServer server, final String configFileName) throws Exception
+ public JMSServerManagerImpl(final ActiveMQServer server, final String configFileName) throws Exception
{
this.server = server;
@@ -185,7 +185,7 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
this.configFileName = configFileName;
}
- public JMSServerManagerImpl(final HornetQServer server, final JMSConfiguration configuration) throws Exception
+ public JMSServerManagerImpl(final ActiveMQServer server, final JMSConfiguration configuration) throws Exception
{
this.server = server;
@@ -200,7 +200,7 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
* Unused
*/
@Deprecated
- public JMSServerManagerImpl(HornetQServer server, String configFilename, JMSStorageManager storageManager)
+ public JMSServerManagerImpl(ActiveMQServer server, String configFilename, JMSStorageManager storageManager)
{
this.server = server;
@@ -259,7 +259,7 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
for (Runnable run : cachedCommands)
{
- HornetQJMSServerLogger.LOGGER.serverRunningCachedCommand(run);
+ ActiveMQJMSServerLogger.LOGGER.serverRunningCachedCommand(run);
run.run();
}
@@ -270,7 +270,7 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
catch (Exception e)
{
active = false;
- HornetQJMSServerLogger.LOGGER.jmsDeployerStartError(e);
+ ActiveMQJMSServerLogger.LOGGER.jmsDeployerStartError(e);
}
}
@@ -450,7 +450,7 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
}
- // HornetQComponent implementation -----------------------------------
+ // ActiveMQComponent implementation -----------------------------------
/**
* Notice that this component has a {@link #startCalled} boolean to control its internal
@@ -460,8 +460,8 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
* This method and {@code server.start()} are interdependent in the following way:
* <ol>
* <li>{@link JMSServerManagerImpl#start()} is called, it sets {@code start_called=true}, and
- * calls {@link HornetQServerImpl#start()}
- * <li>{@link HornetQServerImpl#start()} will call {@link JMSServerManagerImpl#activated()}
+ * calls {@link org.apache.activemq.core.server.impl.ActiveMQServerImpl#start()}
+ * <li>{@link org.apache.activemq.core.server.impl.ActiveMQServerImpl#start()} will call {@link JMSServerManagerImpl#activated()}
* <li>{@link JMSServerManagerImpl#activated()} checks the value of {@link #startCalled}, which
* must already be true.
* </ol>
@@ -535,7 +535,7 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
this.registry = registry;
}
- public HornetQServer getHornetQServer()
+ public ActiveMQServer getActiveMQServer()
{
return server;
}
@@ -606,7 +606,7 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
if (internalCreateQueue(queueName, selectorString, durable))
{
- HornetQDestination destination = queues.get(queueName);
+ ActiveMQDestination destination = queues.get(queueName);
if (destination == null)
{
// sanity check. internalCreateQueue should already have done this check
@@ -664,7 +664,7 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
if (internalCreateTopic(topicName))
{
- HornetQDestination destination = topics.get(topicName);
+ ActiveMQDestination destination = topics.get(topicName);
if (destination == null)
{
@@ -705,7 +705,7 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
checkJNDI(jndiBinding);
- HornetQTopic destination = topics.get(topicName);
+ ActiveMQTopic destination = topics.get(topicName);
if (destination == null)
{
throw new IllegalArgumentException("Topic does not exist");
@@ -745,7 +745,7 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
checkJNDI(jndiBinding);
- HornetQQueue destination = queues.get(queueName);
+ ActiveMQQueue destination = queues.get(queueName);
if (destination == null)
{
throw new IllegalArgumentException("Queue does not exist");
@@ -769,14 +769,14 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
checkJNDI(jndiBinding);
- HornetQConnectionFactory factory = connectionFactories.get(name);
+ ActiveMQConnectionFactory factory = connectionFactories.get(name);
if (factory == null)
{
throw new IllegalArgumentException("Factory does not exist");
}
if (registry.lookup(jndiBinding) != null)
{
- throw HornetQJMSServerBundle.BUNDLE.cfJndiExists(name);
+ throw ActiveMQJMSServerBundle.BUNDLE.cfJndiExists(name);
}
boolean added = bindToJndi(jndiBinding, factory);
if (added)
@@ -913,11 +913,11 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
{
checkInitialised();
- server.destroyQueue(HornetQDestination.createQueueAddressFromName(name), null, !removeConsumers, removeConsumers);
+ server.destroyQueue(ActiveMQDestination.createQueueAddressFromName(name), null, !removeConsumers, removeConsumers);
// if the queue has consumers and 'removeConsumers' is false then the queue won't actually be removed
// therefore only remove the queue from JNDI, etc. if the queue is actually removed
- if (this.server.getPostOffice().getBinding(HornetQDestination.createQueueAddressFromName(name)) == null)
+ if (this.server.getPostOffice().getBinding(ActiveMQDestination.createQueueAddressFromName(name)) == null)
{
removeFromJNDI(queues, queueJNDI, name);
@@ -946,7 +946,7 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
{
checkInitialised();
AddressControl addressControl = (AddressControl) server.getManagementService()
- .getResource(ResourceNames.CORE_ADDRESS + HornetQDestination.createTopicAddressFromName(name));
+ .getResource(ResourceNames.CORE_ADDRESS + ActiveMQDestination.createTopicAddressFromName(name));
if (addressControl != null)
{
for (String queueName : addressControl.getQueueNames())
@@ -954,7 +954,7 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
Binding binding = server.getPostOffice().getBinding(new SimpleString(queueName));
if (binding == null)
{
- HornetQJMSServerLogger.LOGGER.noQueueOnTopic(queueName, name);
+ ActiveMQJMSServerLogger.LOGGER.noQueueOnTopic(queueName, name);
continue;
}
@@ -997,7 +997,7 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
String... jndiBindings) throws Exception
{
checkInitialised();
- HornetQConnectionFactory cf = connectionFactories.get(name);
+ ActiveMQConnectionFactory cf = connectionFactories.get(name);
if (cf == null)
{
ConnectionFactoryConfiguration configuration = new ConnectionFactoryConfigurationImpl()
@@ -1047,7 +1047,7 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
String... jndiBindings) throws Exception
{
checkInitialised();
- HornetQConnectionFactory cf = connectionFactories.get(name);
+ ActiveMQConnectionFactory cf = connectionFactories.get(name);
if (cf == null)
{
ConnectionFactoryConfiguration configuration = new ConnectionFactoryConfigurationImpl()
@@ -1126,7 +1126,7 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
final String... jndiBindings) throws Exception
{
checkInitialised();
- HornetQConnectionFactory cf = connectionFactories.get(name);
+ ActiveMQConnectionFactory cf = connectionFactories.get(name);
if (cf == null)
{
ConnectionFactoryConfiguration configuration = new ConnectionFactoryConfigurationImpl()
@@ -1175,7 +1175,7 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
final String... jndiBindings) throws Exception
{
checkInitialised();
- HornetQConnectionFactory cf = connectionFactories.get(name);
+ ActiveMQConnectionFactory cf = connectionFactories.get(name);
if (cf == null)
{
ConnectionFactoryConfiguration configuration = new ConnectionFactoryConfigurationImpl()
@@ -1187,18 +1187,18 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
}
}
- public synchronized HornetQConnectionFactory recreateCF(String name, ConnectionFactoryConfiguration cf) throws Exception
+ public synchronized ActiveMQConnectionFactory recreateCF(String name, ConnectionFactoryConfiguration cf) throws Exception
{
List<String> jndi = connectionFactoryJNDI.get(name);
if (jndi == null)
{
- throw HornetQJMSServerBundle.BUNDLE.cfDoesntExist(name);
+ throw ActiveMQJMSServerBundle.BUNDLE.cfDoesntExist(name);
}
String[] usedJNDI = jndi.toArray(new String[jndi.size()]);
- HornetQConnectionFactory realCF = internalCreateCFPOJO(cf);
+ ActiveMQConnectionFactory realCF = internalCreateCFPOJO(cf);
if (cf.isPersisted())
{
@@ -1232,7 +1232,7 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
{
checkJNDI(jndi);
- HornetQConnectionFactory cf = internalCreateCF(storeConfig, cfConfig);
+ ActiveMQConnectionFactory cf = internalCreateCF(storeConfig, cfConfig);
ArrayList<String> bindings = new ArrayList<String>();
@@ -1270,7 +1270,7 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
}
catch (Exception e)
{
- HornetQJMSServerLogger.LOGGER.warn("Failed to send notification : " + notif);
+ ActiveMQJMSServerLogger.LOGGER.warn("Failed to send notification : " + notif);
}
}
@@ -1308,27 +1308,27 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
}
else
{
- HornetQQueue hqQueue = HornetQDestination.createQueue(queueName);
+ ActiveMQQueue activeMQQueue = ActiveMQDestination.createQueue(queueName);
// Convert from JMS selector to core filter
String coreFilterString = null;
if (selectorString != null)
{
- coreFilterString = SelectorTranslator.convertToHornetQFilterString(selectorString);
+ coreFilterString = SelectorTranslator.convertToActiveMQFilterString(selectorString);
}
- Queue queue = server.deployQueue(SimpleString.toSimpleString(hqQueue.getAddress()),
- SimpleString.toSimpleString(hqQueue.getAddress()),
+ Queue queue = server.deployQueue(SimpleString.toSimpleString(activeMQQueue.getAddress()),
+ SimpleString.toSimpleString(activeMQQueue.getAddress()),
SimpleString.toSimpleString(coreFilterString),
durable,
false);
- queues.put(queueName, hqQueue);
+ queues.put(queueName, activeMQQueue);
this.recoverJndiBindings(queueName, PersistedType.Queue);
- jmsManagementService.registerQueue(hqQueue, queue);
+ jmsManagementService.registerQueue(activeMQQueue, queue);
return true;
}
@@ -1351,22 +1351,22 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
}
else
{
- HornetQTopic hqTopic = HornetQDestination.createTopic(topicName);
+ ActiveMQTopic activeMQTopic = ActiveMQDestination.createTopic(topicName);
// We create a dummy subscription on the topic, that never receives messages - this is so we can perform JMS
// checks when routing messages to a topic that
// does not exist - otherwise we would not be able to distinguish from a non existent topic and one with no
// subscriptions - core has no notion of a topic
- server.deployQueue(SimpleString.toSimpleString(hqTopic.getAddress()),
- SimpleString.toSimpleString(hqTopic.getAddress()),
+ server.deployQueue(SimpleString.toSimpleString(activeMQTopic.getAddress()),
+ SimpleString.toSimpleString(activeMQTopic.getAddress()),
SimpleString.toSimpleString(JMSServerManagerImpl.REJECT_FILTER),
true,
false);
- topics.put(topicName, hqTopic);
+ topics.put(topicName, activeMQTopic);
this.recoverJndiBindings(topicName, PersistedType.Topic);
- jmsManagementService.registerTopic(hqTopic);
+ jmsManagementService.registerTopic(activeMQTopic);
return true;
}
@@ -1376,12 +1376,12 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
* @param cfConfig
* @throws Exception
*/
- private HornetQConnectionFactory internalCreateCF(final boolean persisted,
+ private ActiveMQConnectionFactory internalCreateCF(final boolean persisted,
final ConnectionFactoryConfiguration cfConfig) throws Exception
{
checkInitialised();
- HornetQConnectionFactory cf = connectionFactories.get(cfConfig.getName());
+ ActiveMQConnectionFactory cf = connectionFactories.get(cfConfig.getName());
if (cf == null)
{
@@ -1400,9 +1400,9 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
* @return
* @throws org.apache.activemq.api.core.ActiveMQException
*/
- protected HornetQConnectionFactory internalCreateCFPOJO(final ConnectionFactoryConfiguration cfConfig) throws ActiveMQException
+ protected ActiveMQConnectionFactory internalCreateCFPOJO(final ConnectionFactoryConfiguration cfConfig) throws ActiveMQException
{
- HornetQConnectionFactory cf;
+ ActiveMQConnectionFactory cf;
if (cfConfig.getDiscoveryGroupName() != null)
{
DiscoveryGroupConfiguration groupConfig = server.getConfiguration()
@@ -1411,23 +1411,23 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
if (groupConfig == null)
{
- throw HornetQJMSServerBundle.BUNDLE.discoveryGroupDoesntExist(cfConfig.getDiscoveryGroupName());
+ throw ActiveMQJMSServerBundle.BUNDLE.discoveryGroupDoesntExist(cfConfig.getDiscoveryGroupName());
}
if (cfConfig.isHA())
{
- cf = HornetQJMSClient.createConnectionFactoryWithHA(groupConfig, cfConfig.getFactoryType());
+ cf = ActiveMQJMSClient.createConnectionFactoryWithHA(groupConfig, cfConfig.getFactoryType());
}
else
{
- cf = HornetQJMSClient.createConnectionFactoryWithoutHA(groupConfig, cfConfig.getFactoryType());
+ cf = ActiveMQJMSClient.createConnectionFactoryWithoutHA(groupConfig, cfConfig.getFactoryType());
}
}
else
{
if (cfConfig.getConnectorNames() == null || cfConfig.getConnectorNames().size() == 0)
{
- throw HornetQJMSServerBundle.BUNDLE.noConnectorNameOnCF();
+ throw ActiveMQJMSServerBundle.BUNDLE.noConnectorNameOnCF();
}
TransportConfiguration[] configs = new TransportConfiguration[cfConfig.getConnectorNames().size()];
@@ -1438,7 +1438,7 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
TransportConfiguration connector = server.getConfiguration().getConnectorConfigurations().get(name);
if (connector == null)
{
- throw HornetQJMSServerBundle.BUNDLE.noConnectorNameConfiguredOnCF(name);
+ throw ActiveMQJMSServerBundle.BUNDLE.noConnectorNameConfiguredOnCF(name);
}
correctInvalidNettyConnectorHost(connector);
configs[count++] = connector;
@@ -1446,11 +1446,11 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
if (cfConfig.isHA())
{
- cf = HornetQJMSClient.createConnectionFactoryWithHA(cfConfig.getFactoryType(), configs);
+ cf = ActiveMQJMSClient.createConnectionFactoryWithHA(cfConfig.getFactoryType(), configs);
}
else
{
- cf = HornetQJMSClient.createConnectionFactoryWithoutHA(cfConfig.getFactoryType(), configs);
+ cf = ActiveMQJMSClient.createConnectionFactoryWithoutHA(cfConfig.getFactoryType(), configs);
}
}
@@ -1547,42 +1547,42 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
public String[] listRemoteAddresses() throws Exception
{
checkInitialised();
- return server.getHornetQServerControl().listRemoteAddresses();
+ return server.getActiveMQServerControl().listRemoteAddresses();
}
public String[] listRemoteAddresses(final String ipAddress) throws Exception
{
checkInitialised();
- return server.getHornetQServerControl().listRemoteAddresses(ipAddress);
+ return server.getActiveMQServerControl().listRemoteAddresses(ipAddress);
}
public boolean closeConnectionsForAddress(final String ipAddress) throws Exception
{
checkInitialised();
- return server.getHornetQServerControl().closeConnectionsForAddress(ipAddress);
+ return server.getActiveMQServerControl().closeConnectionsForAddress(ipAddress);
}
public boolean closeConsumerConnectionsForAddress(final String address) throws Exception
{
checkInitialised();
- return server.getHornetQServerControl().closeConsumerConnectionsForAddress(address);
+ return server.getActiveMQServerControl().closeConsumerConnectionsForAddress(address);
}
public boolean closeConnectionsForUser(final String userName) throws Exception
{
checkInitialised();
- return server.getHornetQServerControl().closeConnectionsForUser(userName);
+ return server.getActiveMQServerControl().closeConnectionsForUser(userName);
}
public String[] listConnectionIDs() throws Exception
{
- return server.getHornetQServerControl().listConnectionIDs();
+ return server.getActiveMQServerControl().listConnectionIDs();
}
public String[] listSessions(final String connectionID) throws Exception
{
checkInitialised();
- return server.getHornetQServerControl().listSessions(connectionID);
+ return server.getActiveMQServerControl().listSessions(connectionID);
}
public String listPreparedTransactionDetailsAsJSON() throws Exception
@@ -1797,7 +1797,7 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
}
catch (Exception e)
{
- HornetQJMSServerLogger.LOGGER.jndiUnbindError(e, key);
+ ActiveMQJMSServerLogger.LOGGER.jndiUnbindError(e, key);
}
}
}
@@ -1924,7 +1924,7 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
}
else
{
- HornetQJMSServerLogger.LOGGER.serverCachingCommand(runnable);
+ ActiveMQJMSServerLogger.LOGGER.serverCachingCommand(runnable);
cachedCommands.add(runnable);
return false;
}
@@ -1940,7 +1940,7 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
}
catch (Exception e)
{
- HornetQJMSServerLogger.LOGGER.jmsServerError(e);
+ ActiveMQJMSServerLogger.LOGGER.jmsServerError(e);
}
}
@@ -1958,12 +1958,12 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
try
{
String newHost = InetAddress.getLocalHost().getHostName();
- HornetQJMSServerLogger.LOGGER.invalidHostForConnector(transportConfiguration.getName(), newHost);
+ ActiveMQJMSServerLogger.LOGGER.invalidHostForConnector(transportConfiguration.getName(), newHost);
params.put(TransportConstants.HOST_PROP_NAME, newHost);
}
catch (UnknownHostException e)
{
- HornetQJMSServerLogger.LOGGER.failedToCorrectHost(e, transportConfiguration.getName());
+ ActiveMQJMSServerLogger.LOGGER.failedToCorrectHost(e, transportConfiguration.getName());
}
}
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/StandaloneNamingServer.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/StandaloneNamingServer.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/StandaloneNamingServer.java
index 2652990..c060b93 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/StandaloneNamingServer.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/StandaloneNamingServer.java
@@ -17,9 +17,9 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import org.apache.activemq.core.server.ActivateCallback;
-import org.apache.activemq.core.server.HornetQComponent;
-import org.apache.activemq.core.server.HornetQServer;
-import org.apache.activemq.core.server.HornetQServerLogger;
+import org.apache.activemq.core.server.ActiveMQComponent;
+import org.apache.activemq.core.server.ActiveMQServer;
+import org.apache.activemq.core.server.ActiveMQServerLogger;
import org.jnp.server.Main;
import org.jnp.server.NamingBeanImpl;
@@ -30,11 +30,11 @@ import org.jnp.server.NamingBeanImpl;
* @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
* 11/8/12
*/
-public class StandaloneNamingServer implements HornetQComponent
+public class StandaloneNamingServer implements ActiveMQComponent
{
private Main jndiServer;
- private HornetQServer server;
+ private ActiveMQServer server;
private NamingBeanImpl namingBean;
@@ -48,7 +48,7 @@ public class StandaloneNamingServer implements HornetQComponent
private ExecutorService executor;
- public StandaloneNamingServer(HornetQServer server)
+ public StandaloneNamingServer(ActiveMQServer server)
{
this.server = server;
}
@@ -117,7 +117,7 @@ public class StandaloneNamingServer implements HornetQComponent
}
catch (Exception e)
{
- HornetQServerLogger.LOGGER.unableToStartNamingServer(e);
+ ActiveMQServerLogger.LOGGER.unableToStartNamingServer(e);
}
activated = true;
@@ -144,7 +144,7 @@ public class StandaloneNamingServer implements HornetQComponent
}
catch (Exception e)
{
- HornetQServerLogger.LOGGER.unableToStopNamingServer(e);
+ ActiveMQServerLogger.LOGGER.unableToStopNamingServer(e);
}
}
if (namingBean != null)