Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This closes #246 - cleanup activemq refs

This commit is contained in:
Clebert Suconic 2015-05-11 12:45:33 -04:00
parent 555ea4799f 2cbeedab89
commit efd6261d25
22 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artemis-cli/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapLogger.java
View File

@ -46,11 +46,11 @@ public interface ActiveMQBootstrapLogger extends BasicLogger
ActiveMQBootstrapLogger LOGGER = Logger.getMessageLogger(ActiveMQBootstrapLogger.class, ActiveMQBootstrapLogger.class.getPackage().getName());
@LogMessage(level = Logger.Level.INFO)
@Message(id = 101000, value = "Starting ActiveMQ Server", format = Message.Format.MESSAGE_FORMAT)
@Message(id = 101000, value = "Starting ActiveMQ Artemis Server", format = Message.Format.MESSAGE_FORMAT)
void serverStarting();
@LogMessage(level = Logger.Level.INFO)
@Message(id = 101001, value = "Stopping ActiveMQ Server", format = Message.Format.MESSAGE_FORMAT)
@Message(id = 101001, value = "Stopping ActiveMQ Artemis Server", format = Message.Format.MESSAGE_FORMAT)
void serverStopping();
@LogMessage(level = Logger.Level.INFO)

4
artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
View File

@ -484,8 +484,8 @@ public interface ActiveMQServerControl
/**
* Closes all the connections of clients connected to this server which matches the specified IP address.
*/
@Operation(desc = "Closes all the consumer connections for the given ActiveMQ address", impact = MBeanOperationInfo.INFO)
boolean closeConsumerConnectionsForAddress(@Parameter(desc = "a ActiveMQ address", name = "address") String address) throws Exception;
@Operation(desc = "Closes all the consumer connections for the given messaging address", impact = MBeanOperationInfo.INFO)
boolean closeConsumerConnectionsForAddress(@Parameter(desc = "a messaging address", name = "address") String address) throws Exception;
/**
* Closes all the connections of sessions with a matching user name.

2
artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSManagementHelper.java
View File

@ -31,7 +31,7 @@ public class JMSManagementHelper
{
if (jmsMessage instanceof ActiveMQMessage == false)
{
throw new IllegalArgumentException("Cannot send a non ActiveMQ message as a management message " + jmsMessage.getClass()
throw new IllegalArgumentException("Cannot send a foreign message as a management message " + jmsMessage.getClass()
.getName());
}

4
artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSServerControl.java
View File

@ -271,8 +271,8 @@ public interface JMSServerControl
/**
* Closes all the connections on this server for consumers which are consuming from a queue associated with a particular address.
*/
@Operation(desc = "Closes all the consumer connections for the given ActiveMQ address", impact = MBeanOperationInfo.INFO)
boolean closeConsumerConnectionsForAddress(@Parameter(desc = "a ActiveMQ address", name = "address") String address) throws Exception;
@Operation(desc = "Closes all the consumer connections for the given messaging address", impact = MBeanOperationInfo.INFO)
boolean closeConsumerConnectionsForAddress(@Parameter(desc = "a messaging address", name = "address") String address) throws Exception;
/**
* Closes all the connections on this server for sessions using a particular user name.

2
artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
View File

@ -398,7 +398,7 @@ public class ActiveMQMessage implements javax.jms.Message
{
if (dest instanceof ActiveMQDestination == false)
{
throw new InvalidDestinationException("Not a ActiveMQ destination " + dest);
throw new InvalidDestinationException("Foreign destination " + dest);
}
ActiveMQDestination jbd = (ActiveMQDestination)dest;

2
artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java
View File

@ -330,7 +330,7 @@ public class ActiveMQMessageProducer implements MessageProducer, QueueSender, To
{
if (destination != null && !(destination instanceof ActiveMQDestination))
{
throw new InvalidDestinationException("Not a ActiveMQ Destination:" + destination);
throw new InvalidDestinationException("Foreign destination:" + destination);
}
if (destination != null && defaultDestination != null)
{

2
artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSServerControlImpl.java
View File

@ -905,7 +905,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
{
if (!server.isStarted())
{
throw new IllegalStateException("ActiveMQ JMS Server is not started. it can not be managed yet");
throw new IllegalStateException("ActiveMQ Artemis JMS Server is not started. It can not be managed yet");
}
}

2
artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerLogger.java
View File

@ -66,7 +66,7 @@ public interface ActiveMQJMSServerLogger extends BasicLogger
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)
@Message(id = 122008, value = "XA Recovery can not connect to any broker on recovery {0}" , format = Message.Format.MESSAGE_FORMAT)
void recoveryConnectFailed(String s);
@LogMessage(level = Logger.Level.WARN)

2
artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/server/ActiveMQBootstrap.java
View File

@ -155,7 +155,7 @@ public class ActiveMQBootstrap
{
restartFile.delete();
}
final Timer timer = new Timer("ActiveMQ Server Shutdown Timer", false);
final Timer timer = new Timer("ActiveMQ Artemis Server Shutdown Timer", false);
timer.scheduleAtFixedRate(new ServerStopTimerTask(stopFile, killFile, restartFile, timer), 500, 500);
}
}

2
artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSenderContext.java
View File

@ -155,7 +155,7 @@ public class ProtonServerSenderContext extends AbstractProtonContextSender imple
}
catch (Exception e)
{
throw ActiveMQAMQPProtocolMessageBundle.BUNDLE.errorCreatingActiveMQConsumer(e.getMessage());
throw ActiveMQAMQPProtocolMessageBundle.BUNDLE.errorCreatingConsumer(e.getMessage());
}
}
}

6
artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/logger/ActiveMQAMQPProtocolMessageBundle.java
View File

@ -50,10 +50,10 @@ public interface ActiveMQAMQPProtocolMessageBundle
@Message(id = 219003, value = "error finding temporary queue, {0}", format = Message.Format.MESSAGE_FORMAT)
ActiveMQAMQPInternalErrorException errorFindingTemporaryQueue(String message);
@Message(id = 219005, value = "error creating ActiveMQ Consumer, {0}", format = Message.Format.MESSAGE_FORMAT)
ActiveMQAMQPInternalErrorException errorCreatingActiveMQConsumer(String message);
@Message(id = 219005, value = "error creating consumer, {0}", format = Message.Format.MESSAGE_FORMAT)
ActiveMQAMQPInternalErrorException errorCreatingConsumer(String message);
@Message(id = 219006, value = "error starting ActiveMQ Consumer, {0}", format = Message.Format.MESSAGE_FORMAT)
@Message(id = 219006, value = "error starting consumer, {0}", format = Message.Format.MESSAGE_FORMAT)
ActiveMQAMQPIllegalStateException errorStartingConsumer(String message);
@Message(id = 219007, value = "error acknowledging message {0}, {1}", format = Message.Format.MESSAGE_FORMAT)

4
artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java
View File

@ -49,8 +49,8 @@ import static org.apache.activemq.artemis.core.protocol.stomp.ActiveMQStompProto
public final class StompConnection implements RemotingConnection
{
protected static final String CONNECTION_ID_PROP = "__AMQ_CID";
private static final String SERVER_NAME = "ActiveMQ/" + VersionLoader.getVersion().getFullVersion() +
" ActiveMQ Messaging Engine";
private static final String SERVER_NAME = "ActiveMQ-Artemis/" + VersionLoader.getVersion().getFullVersion() +
" ActiveMQ Artemis Messaging Engine";
private final StompProtocolManager manager;

2
artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionMetaData.java
View File

@ -94,7 +94,7 @@ public class ActiveMQRAConnectionMetaData implements ConnectionMetaData
ActiveMQRALogger.LOGGER.trace("getJMSProviderName()");
}
return "ActiveMQ";
return "ActiveMQ Artemis";
}
/**

12
artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRALogger.java
View File

@ -58,11 +58,11 @@ public interface ActiveMQRALogger extends BasicLogger
void attemptingReconnect(ActiveMQActivationSpec spec);
@LogMessage(level = Logger.Level.INFO)
@Message(id = 151002, value = "Reconnected with ActiveMQ", format = Message.Format.MESSAGE_FORMAT)
@Message(id = 151002, value = "Reconnected with broker", format = Message.Format.MESSAGE_FORMAT)
void reconnected();
@LogMessage(level = Logger.Level.INFO)
@Message(id = 151003, value = "ActiveMQ resource adaptor stopped", format = Message.Format.MESSAGE_FORMAT)
@Message(id = 151003, value = "resource adaptor stopped", format = Message.Format.MESSAGE_FORMAT)
void raStopped();
@LogMessage(level = Logger.Level.INFO)
@ -70,11 +70,11 @@ public interface ActiveMQRALogger extends BasicLogger
void instantiatingDestination(String destinationType, String destination);
@LogMessage(level = Logger.Level.INFO)
@Message(id = 151005, value = "awaiting ActiveMQ Server availability", format = Message.Format.MESSAGE_FORMAT)
@Message(id = 151005, value = "awaiting server availability", format = Message.Format.MESSAGE_FORMAT)
void awaitingJMSServerCreation();
@LogMessage(level = Logger.Level.WARN)
@Message(id = 152001, value = "problem resetting ActiveMQ xa session after failure", format = Message.Format.MESSAGE_FORMAT)
@Message(id = 152001, value = "problem resetting xa session after failure", format = Message.Format.MESSAGE_FORMAT)
void problemResettingXASession();
@LogMessage(level = Logger.Level.WARN)
@ -90,7 +90,7 @@ public interface ActiveMQRALogger extends BasicLogger
void handlingJMSFailure(@Cause Exception e);
@LogMessage(level = Logger.Level.WARN)
@Message(id = 152005, value = "Failure in ActiveMQ activation {0}", format = Message.Format.MESSAGE_FORMAT)
@Message(id = 152005, value = "Failure in broker activation {0}", format = Message.Format.MESSAGE_FORMAT)
void failureInActivation(@Cause Throwable t, ActiveMQActivationSpec spec);
@LogMessage(level = Logger.Level.WARN)
@ -102,7 +102,7 @@ public interface ActiveMQRALogger extends BasicLogger
void errorCreatingReference(@Cause Exception e);
@LogMessage(level = Logger.Level.ERROR)
@Message(id = 154001, value = "Unable to stop ActiveMQ resource adapter.", format = Message.Format.MESSAGE_FORMAT)
@Message(id = 154001, value = "Unable to stop resource adapter.", format = Message.Format.MESSAGE_FORMAT)
void errorStoppingRA(@Cause Exception e);
@LogMessage(level = Logger.Level.ERROR)

2
artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMetaData.java
View File

@ -57,7 +57,7 @@ public class ActiveMQRAMetaData implements ManagedConnectionMetaData
ActiveMQRALogger.LOGGER.trace("getEISProductName()");
}
return "ActiveMQ";
return "ActiveMQ Artemis";
}
/**

8
artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQResourceAdapter.java
View File

@ -68,7 +68,7 @@ public class ActiveMQResourceAdapter implements ResourceAdapter, Serializable
/**
* The Name of the product that this resource adapter represents.
*/
public static final String PRODUCT_NAME = "ActiveMQ";
public static final String PRODUCT_NAME = "ActiveMQ Artemis";
/**
* Trace enabled
@ -262,7 +262,7 @@ public class ActiveMQResourceAdapter implements ResourceAdapter, Serializable
}
}
ActiveMQRALogger.LOGGER.info("ActiveMQ resource adaptor started");
ActiveMQRALogger.LOGGER.info("Resource adaptor started");
}
/**
@ -1982,7 +1982,7 @@ public class ActiveMQResourceAdapter implements ResourceAdapter, Serializable
}
else
{
throw new IllegalArgumentException("must provide either TransportType or DiscoveryGroupAddress and DiscoveryGroupPort for ActiveMQ ResourceAdapter Connection Factory");
throw new IllegalArgumentException("must provide either TransportType or DiscoveryGroupAddress and DiscoveryGroupPort for ResourceAdapter Connection Factory");
}
setParams(cf, overrideProperties);
@ -2041,7 +2041,7 @@ public class ActiveMQResourceAdapter implements ResourceAdapter, Serializable
}
if (endpointFactory == null)
{
throw new IllegalArgumentException("must provide either TransportType or DiscoveryGroupAddress and DiscoveryGroupPort for ActiveMQ ResourceAdapter Connection Factory");
throw new IllegalArgumentException("must provide either TransportType or DiscoveryGroupAddress and DiscoveryGroupPort for ResourceAdapter Connection Factory");
}
}

2
artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/ActiveMQPushStrategy.java
View File

@ -48,7 +48,7 @@ public class ActiveMQPushStrategy extends UriTemplateStrategy
ClientResponse<?> res = request.head();
if (res.getStatus() != 200)
{
throw new RuntimeException("Failed to query ActiveMQ REST destination for init information. Status: " + res.getStatus());
throw new RuntimeException("Failed to query REST destination for init information. Status: " + res.getStatus());
}
String url = (String)res.getHeaders().getFirst("msg-create-with-id");
if (url == null)

2
artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
View File

@ -1089,7 +1089,7 @@ public class ConfigurationImpl implements Configuration, Serializable
@Override
public String toString()
{
StringBuilder sb = new StringBuilder("ActiveMQ Configuration (");
StringBuilder sb = new StringBuilder("Broker Configuration (");
sb.append("clustered=").append(isClustered()).append(",");
sb.append("journalDirectory=").append(journalDirectory).append(",");
sb.append("bindingsDirectory=").append(bindingsDirectory).append(",");

2
artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
View File

@ -2148,7 +2148,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
{
if (!server.isStarted())
{
throw new IllegalStateException("ActiveMQ Server is not started. It can not be managed yet");
throw new IllegalStateException("Broker is not started. It can not be managed yet");
}
}

2
artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
View File

@ -1031,7 +1031,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl
{
if (!postOffice.isStarted())
{
throw new IllegalStateException("ActiveMQ Server is not started. Queue can not be managed yet");
throw new IllegalStateException("Broker is not started. Queue can not be managed yet");
}
}

2
artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXARecoveryLogger.java
View File

@ -66,7 +66,7 @@ public interface ActiveMQXARecoveryLogger extends BasicLogger
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)
@Message(id = 122008, value = "XA Recovery can not connect to any broker on recovery {0}" , format = Message.Format.MESSAGE_FORMAT)
void recoveryConnectFailed(String s);
@LogMessage(level = Logger.Level.WARN)

2
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java
View File

@ -1111,7 +1111,7 @@ public abstract class ClusterTestBase extends ServiceTestBase
{
String br = "-------------------------\n";
String out = br;
out += "ActiveMQ server " + server + "\n";
out += "ActiveMQ Artemis server " + server + "\n";
ClusterManager clusterManager = server.getClusterManager();
if (clusterManager == null)
{