You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by an...@apache.org on 2015/03/12 12:11:52 UTC
[1/5] activemq-6 git commit: A few changes around logging-processor
Repository: activemq-6
Updated Branches:
refs/heads/master 670f5841b -> 87520f760
A few changes around logging-processor
- Bumped up version to 2.0.0.Alpha
- Client bundle changes to be copmatible with 2.0.0
- Fixing bundle / Logging classes for missing format (it was an issue with the previous one already)
- Fixed up dependencies to avoid transient downloads
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/e065d25b
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/e065d25b
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/e065d25b
Branch: refs/heads/master
Commit: e065d25b6fb4cdfa7f5b72afd52d6f4771b50634
Parents: d36a1d7
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Mar 11 18:49:10 2015 -0400
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Thu Mar 12 10:49:17 2015 +0000
----------------------------------------------------------------------
activemq-bootstrap/pom.xml | 2 +
activemq-commons/pom.xml | 2 +
activemq-core-client/pom.xml | 2 +
.../client/ActiveMQClientMessageBundle.java | 105 ++++++++-----------
activemq-jms-client/pom.xml | 2 +
.../jms/client/ActiveMQJMSClientBundle.java | 23 ++--
activemq-jms-server/pom.xml | 2 +
.../jms/server/ActiveMQJMSServerBundle.java | 10 +-
activemq-journal/pom.xml | 2 +
.../activemq/journal/ActiveMQJournalBundle.java | 7 +-
.../activemq-amqp-protocol/pom.xml | 2 +
.../activemq-openwire-protocol/pom.xml | 2 +
activemq-protocols/activemq-proton-plug/pom.xml | 2 +
.../ActiveMQAMQPProtocolMessageBundle.java | 16 +--
.../activemq-stomp-protocol/pom.xml | 2 +
.../ActiveMQStompProtocolMessageBundle.java | 40 +++----
activemq-ra/pom.xml | 2 +
.../apache/activemq/ra/ActiveMQRABundle.java | 19 ++--
activemq-rest/pom.xml | 3 +
activemq-server/pom.xml | 2 +
.../core/server/ActiveMQMessageBundle.java | 80 ++++++--------
activemq-service-extensions/pom.xml | 2 +
activemq-tools/pom.xml | 2 +
.../activemq-aerogear-integration/pom.xml | 2 +
.../aerogear/ActiveMQAeroGearBundle.java | 6 +-
integration/activemq-spring-integration/pom.xml | 2 +
integration/activemq-vertx-integration/pom.xml | 10 +-
pom.xml | 14 ++-
tests/extra-tests/pom.xml | 2 +
tests/integration-tests/pom.xml | 2 +
tests/jms-tests/pom.xml | 3 +
tests/unit-tests/pom.xml | 10 +-
32 files changed, 191 insertions(+), 191 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-bootstrap/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-bootstrap/pom.xml b/activemq-bootstrap/pom.xml
index 21ceb88..00005c6 100644
--- a/activemq-bootstrap/pom.xml
+++ b/activemq-bootstrap/pom.xml
@@ -50,6 +50,8 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-commons/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-commons/pom.xml b/activemq-commons/pom.xml
index 1296b07..5b62f98 100644
--- a/activemq-commons/pom.xml
+++ b/activemq-commons/pom.xml
@@ -35,6 +35,8 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.jboss.logmanager</groupId>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-core-client/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-core-client/pom.xml b/activemq-core-client/pom.xml
index 640d625..e3d5ed5 100644
--- a/activemq-core-client/pom.xml
+++ b/activemq-core-client/pom.xml
@@ -35,6 +35,8 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.jgroups</groupId>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-core-client/src/main/java/org/apache/activemq/core/client/ActiveMQClientMessageBundle.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/ActiveMQClientMessageBundle.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/ActiveMQClientMessageBundle.java
index cfa9cf0..d06a114 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/ActiveMQClientMessageBundle.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/core/client/ActiveMQClientMessageBundle.java
@@ -50,45 +50,40 @@ public interface ActiveMQClientMessageBundle
{
ActiveMQClientMessageBundle BUNDLE = Messages.getBundle(ActiveMQClientMessageBundle.class);
- @Message(id = 119000, value = "ClientSession closed while creating session", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119000, value = "ClientSession closed while creating session")
ActiveMQInternalErrorException clientSessionClosed();
- @Message(id = 119001, value = "Failed to create session", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119001, value = "Failed to create session")
ActiveMQInternalErrorException failedToCreateSession(@Cause Throwable t);
- @Message(id = 119002, value = "Internal Error! ClientSessionFactoryImpl::createSessionInternal "
- + "just reached a condition that was not supposed to happen. "
- + "Please inform this condition to the ActiveMQ team", format = Message.Format.MESSAGE_FORMAT)
- ActiveMQInternalErrorException clietSessionInternal();
-
- @Message(id = 119003, value = "Queue can not be both durable and temporary", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119003, value = "Queue can not be both durable and temporary")
ActiveMQInternalErrorException queueMisConfigured();
- @Message(id = 119004, value = "Failed to initialise session factory", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119004, value = "Failed to initialise session factory")
ActiveMQInternalErrorException failedToInitialiseSessionFactory(@Cause Exception e);
- @Message(id = 119005, value = "Exception in Netty transport", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119005, value = "Exception in Netty transport")
ActiveMQInternalErrorException nettyError();
- @Message(id = 119006, value = "Channel disconnected", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119006, value = "Channel disconnected")
ActiveMQNotConnectedException channelDisconnected();
- @Message(id = 119007, value = "Cannot connect to server(s). Tried with all available servers.", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119007, value = "Cannot connect to server(s). Tried with all available servers.")
ActiveMQNotConnectedException cannotConnectToServers();
- @Message(id = 119008, value = "Failed to connect to any static connectors", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119008, value = "Failed to connect to any static connectors")
ActiveMQNotConnectedException cannotConnectToStaticConnectors(@Cause Exception e);
- @Message(id = 119009, value = "Failed to connect to any static connectors", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119009, value = "Failed to connect to any static connectors")
ActiveMQNotConnectedException cannotConnectToStaticConnectors2();
- @Message(id = 119010, value = "Connection is destroyed", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119010, value = "Connection is destroyed")
ActiveMQNotConnectedException connectionDestroyed();
@Message(id = 119011, value = "Did not receive data from server for {0}", format = Message.Format.MESSAGE_FORMAT)
ActiveMQConnectionTimedOutException connectionTimedOut(Connection transportConnection);
- @Message(id = 119012, value = "Timed out waiting to receive initial broadcast from cluster", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119012, value = "Timed out waiting to receive initial broadcast from cluster")
ActiveMQConnectionTimedOutException connectionTimedOutInInitialBroadcast();
@Message(id = 119013, value = "Timed out waiting to receive cluster topology. Group:{0}", format = Message.Format.MESSAGE_FORMAT)
@@ -97,58 +92,56 @@ public interface ActiveMQClientMessageBundle
@Message(id = 119014, value = "Timed out after waiting {0} ms for response when sending packet {1}", format = Message.Format.MESSAGE_FORMAT)
ActiveMQConnectionTimedOutException timedOutSendingPacket(long timeout, Byte type);
- @Message(id = 119015, value = "The connection was disconnected because of server shutdown", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119015, value = "The connection was disconnected because of server shutdown")
ActiveMQDisconnectedException disconnected();
- @Message(id = 119016, value = "Connection failure detected. Unblocking a blocking call that will never get a resp" +
- "onse", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119016, value = "Connection failure detected. Unblocking a blocking call that will never get a response")
ActiveMQUnBlockedException unblockingACall(@Cause Throwable t);
- @Message(id = 119017, value = "Consumer is closed", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119017, value = "Consumer is closed")
ActiveMQObjectClosedException consumerClosed();
- @Message(id = 119018, value = "Producer is closed", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119018, value = "Producer is closed")
ActiveMQObjectClosedException producerClosed();
- @Message(id = 119019, value = "Session is closed", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119019, value = "Session is closed")
ActiveMQObjectClosedException sessionClosed();
- @Message(id = 119020, value = "Cannot call receive(...) - a MessageHandler is set", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119020, value = "Cannot call receive(...) - a MessageHandler is set")
ActiveMQIllegalStateException messageHandlerSet();
- @Message(id = 119021, value = "Cannot set MessageHandler - consumer is in receive(...)", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119021, value = "Cannot set MessageHandler - consumer is in receive(...)")
ActiveMQIllegalStateException inReceive();
@Message(id = 119022, value = "Header size ({0}) is too big, use the messageBody for large data, or increase minLargeMessageSize",
format = Message.Format.MESSAGE_FORMAT)
ActiveMQIllegalStateException headerSizeTooBig(Integer headerSize);
- @Message(id = 119023, value = "The large message lost connection with its session, either because of a rollback or a closed session", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119023, value = "The large message lost connection with its session, either because of a rollback or a closed session")
ActiveMQIllegalStateException largeMessageLostSession();
- @Message(id = 119024, value = "Could not select a TransportConfiguration to create SessionFactory", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119024, value = "Could not select a TransportConfiguration to create SessionFactory")
ActiveMQIllegalStateException noTCForSessionFactory();
- @Message(id = 119025, value = "Error saving the message body", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119025, value = "Error saving the message body")
ActiveMQLargeMessageException errorSavingBody(@Cause Exception e);
- @Message(id = 119026, value = "Error reading the LargeMessageBody", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119026, value = "Error reading the LargeMessageBody")
ActiveMQLargeMessageException errorReadingBody(@Cause Exception e);
- @Message(id = 119027, value = "Error closing stream from LargeMessageBody", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119027, value = "Error closing stream from LargeMessageBody")
ActiveMQLargeMessageException errorClosingLargeMessage(@Cause Exception e);
- @Message(id = 119028, value = "Timeout waiting for LargeMessage Body", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119028, value = "Timeout waiting for LargeMessage Body")
ActiveMQLargeMessageException timeoutOnLargeMessage();
- @Message(id = 119029, value = "Error writing body of message", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119029, value = "Error writing body of message")
ActiveMQLargeMessageException errorWritingLargeMessage(@Cause Exception e);
- @Message(id = 119030, value = "The transaction was rolled back on failover to a backup server", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119030, value = "The transaction was rolled back on failover to a backup server")
ActiveMQTransactionRolledBackException txRolledBack();
- @Message(id = 119031, value = "The transaction was rolled back on failover however commit may have been successful" +
- "", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119031, value = "The transaction was rolled back on failover however commit may have been successful")
ActiveMQTransactionOutcomeUnknownException txOutcomeUnknown();
@Message(id = 119032, value = "Invalid type: {0}", format = Message.Format.MESSAGE_FORMAT)
@@ -164,70 +157,67 @@ public interface ActiveMQClientMessageBundle
@Message(id = 119035, value = "Invalid window size {0}", format = Message.Format.MESSAGE_FORMAT)
IllegalArgumentException invalidWindowSize(Integer size);
- @Message(id = 119036, value = "No operation mapped to int {0}", format = Message.Format.MESSAGE_FORMAT)
- IllegalArgumentException noOperationMapped(Integer operation);
-
@Message(id = 119037, value = "Invalid last Received Command ID: {0}", format = Message.Format.MESSAGE_FORMAT)
IllegalArgumentException invalidCommandID(Integer lastReceivedCommandID);
@Message(id = 119038, value = "Cannot find channel with id {0} to close", format = Message.Format.MESSAGE_FORMAT)
IllegalArgumentException noChannelToClose(Long id);
- @Message(id = 119039, value = "Close Listener cannot be null", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119039, value = "Close Listener cannot be null")
IllegalArgumentException closeListenerCannotBeNull();
- @Message(id = 119040, value = "Fail Listener cannot be null", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119040, value = "Fail Listener cannot be null")
IllegalArgumentException failListenerCannotBeNull();
@Message(id = 119041, value = "Connection already exists with id {0}", format = Message.Format.MESSAGE_FORMAT)
IllegalArgumentException connectionExists(Object id);
- @Message(id = 119042, value = "Invalid argument null listener", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119042, value = "Invalid argument null listener")
IllegalArgumentException nullListener();
- @Message(id = 119043, value = "Invalid argument null handler", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119043, value = "Invalid argument null handler")
IllegalArgumentException nullHandler();
- @Message(id = 119044, value = "No available codec to decode password!", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119044, value = "No available codec to decode password!")
IllegalArgumentException noCodec();
- @Message(id = 119045, value = "the first node to be compared is null", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119045, value = "the first node to be compared is null")
IllegalArgumentException firstNodeNull();
- @Message(id = 119046, value = "the second node to be compared is null", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119046, value = "the second node to be compared is null")
IllegalArgumentException secondNodeNull();
- @Message(id = 119047, value = "nodes have different node names", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119047, value = "nodes have different node names")
IllegalArgumentException nodeHaveDifferentNames();
- @Message(id = 119048, value = "nodes hava a different number of attributes", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119048, value = "nodes hava a different number of attributes")
IllegalArgumentException nodeHaveDifferentAttNumber();
@Message(id = 119049, value = "attribute {0}={1} does not match", format = Message.Format.MESSAGE_FORMAT)
IllegalArgumentException attsDontMatch(String name, String value);
- @Message(id = 119050, value = "one node has children and the other does not" , format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119050, value = "one node has children and the other does not")
IllegalArgumentException oneNodeHasChildren();
- @Message(id = 119051, value = "nodes hava a different number of children" , format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119051, value = "nodes hava a different number of children")
IllegalArgumentException nodeHasDifferentChildNumber();
- @Message(id = 119052, value = "Element {0} requires a valid Boolean value, but ''{1}'' cannot be parsed as a Boolean" , format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119052, value = "Element {0} requires a valid Boolean value, but ''{1}'' cannot be parsed as a Boolean", format = Message.Format.MESSAGE_FORMAT)
IllegalArgumentException mustBeBoolean(Node elem, String value);
- @Message(id = 119053, value = "Element {0} requires a valid Double value, but ''{1}'' cannot be parsed as a Double" , format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119053, value = "Element {0} requires a valid Double value, but ''{1}'' cannot be parsed as a Double", format = Message.Format.MESSAGE_FORMAT)
IllegalArgumentException mustBeDouble(Node elem, String value);
- @Message(id = 119054, value = "Element {0} requires a valid Integer value, but ''{1}'' cannot be parsed as a Integer" , format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119054, value = "Element {0} requires a valid Integer value, but ''{1}'' cannot be parsed as a Integer", format = Message.Format.MESSAGE_FORMAT)
IllegalArgumentException mustBeInteger(Node elem, String value);
- @Message(id = 119055, value = "Element {0} requires a valid Long value, but ''{1}'' cannot be parsed as a Long" , format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119055, value = "Element {0} requires a valid Long value, but ''{1}'' cannot be parsed as a Long", format = Message.Format.MESSAGE_FORMAT)
IllegalArgumentException mustBeLong(Node elem, String value);
- @Message(id = 119056, value = "Failed to get decoder" , format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119056, value = "Failed to get decoder")
IllegalArgumentException failedToGetDecoder(@Cause Exception e);
- @Message(id = 119057, value = "Error decoding password" , format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119057, value = "Error decoding password")
IllegalArgumentException errordecodingPassword(@Cause Exception e);
@Message(id = 119058, value = "Address \"{0}\" is full. Message encode size = {1}B", format = Message.Format.MESSAGE_FORMAT)
@@ -237,11 +227,6 @@ public interface ActiveMQClientMessageBundle
, format = Message.Format.MESSAGE_FORMAT)
ActiveMQInterceptorRejectedPacketException interceptorRejectedPacket(String interceptionResult);
- @Message(id = 119060, value = "Large Message Transmission interrupted on consumer shutdown."
- , format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119060, value = "Large Message Transmission interrupted on consumer shutdown.")
ActiveMQLargeMessageInterruptedException largeMessageInterrupted();
-
- @Message(id = 119061, value = "error decoding AMQP frame", format = Message.Format.MESSAGE_FORMAT)
- String decodeError();
-
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-jms-client/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-jms-client/pom.xml b/activemq-jms-client/pom.xml
index 67e2251..6168ef8 100644
--- a/activemq-jms-client/pom.xml
+++ b/activemq-jms-client/pom.xml
@@ -35,6 +35,8 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQJMSClientBundle.java
----------------------------------------------------------------------
diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQJMSClientBundle.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQJMSClientBundle.java
index f396c9c..eb6802b 100644
--- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQJMSClientBundle.java
+++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQJMSClientBundle.java
@@ -49,48 +49,47 @@ public interface ActiveMQJMSClientBundle
@Message(id = 129000, value = "Invalid filter: {0}", format = Message.Format.MESSAGE_FORMAT)
ActiveMQInvalidFilterExpressionException invalidFilter(@Cause Throwable e, SimpleString filter);
- @Message(id = 129001, value = "Invalid Subscription Name. It is required to set the subscription name", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 129001, value = "Invalid Subscription Name. It is required to set the subscription name")
ActiveMQIllegalStateException invalidSubscriptionName();
@Message(id = 129002, value = "Destination {0} does not exist", format = Message.Format.MESSAGE_FORMAT)
ActiveMQNonExistentQueueException destinationDoesNotExist(SimpleString destination);
- @Message(id = 129003, value = "name cannot be null", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 129003, value = "name cannot be null")
IllegalArgumentException nameCannotBeNull();
- @Message(id = 129004, value = "name cannot be empty", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 129004, value = "name cannot be empty")
IllegalArgumentException nameCannotBeEmpty();
- @Message(id = 129005, value = "It is illegal to call this method from within a Message Listener", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 129005, value = "It is illegal to call this method from within a Message Listener")
IllegalStateRuntimeException callingMethodFromListenerRuntime();
- @Message(id = 129006, value = "It is illegal to call this method from within a Message Listener", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 129006, value = "It is illegal to call this method from within a Message Listener")
IllegalStateException callingMethodFromListener();
- @Message(id = 129007, value = "It is illegal to call this method from within a Completion Listener", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 129007, value = "It is illegal to call this method from within a Completion Listener")
IllegalStateRuntimeException callingMethodFromCompletionListenerRuntime();
- @Message(id = 129008, value = "It is illegal to call this method from within a Completion Listener", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 129008, value = "It is illegal to call this method from within a Completion Listener")
IllegalStateException callingMethodFromCompletionListener();
@Message(id = 129009, value = "Null {0} is not allowed", format = Message.Format.MESSAGE_FORMAT)
IllegalArgumentException nullArgumentNotAllowed(String type);
- @Message(id = 129010, value = "Topic (Destination) cannot be null", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 129010, value = "Topic (Destination) cannot be null")
InvalidDestinationException nullTopic();
- @Message(id = 129011, value = "LargeMessage streaming is only possible on ByteMessage or StreamMessage",
- format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 129011, value = "LargeMessage streaming is only possible on ByteMessage or StreamMessage")
IllegalStateException onlyValidForByteOrStreamMessages();
@Message(id = 129012, value = "The property name ''{0}'' is not a valid java identifier.",
format = Message.Format.MESSAGE_FORMAT)
JMSRuntimeException invalidJavaIdentifier(String propertyName);
- @Message(id = 129013, value = "Message is read-only", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 129013, value = "Message is read-only")
MessageNotWriteableException messageNotWritable();
- @Message(id = 129014, value = "Message is write-only", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 129014, value = "Message is write-only")
MessageNotReadableException messageNotReadable();
@Message(id = 129015, value = "Illegal deliveryMode value: {0}", format = Message.Format.MESSAGE_FORMAT)
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-jms-server/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-jms-server/pom.xml b/activemq-jms-server/pom.xml
index 475e9ce..783afcb 100644
--- a/activemq-jms-server/pom.xml
+++ b/activemq-jms-server/pom.xml
@@ -35,6 +35,8 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/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
index b2747a8..535534b 100644
--- 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
@@ -40,16 +40,10 @@ public interface ActiveMQJMSServerBundle
@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)
+ @Message(id = 129004, value = "No Connector name configured on create ConnectionFactory")
ActiveMQIllegalStateException noConnectorNameOnCF();
@Message(id = 129005, value = "Connector ''{0}'' not found on the main configuration file" , format = Message.Format.MESSAGE_FORMAT)
@@ -58,6 +52,6 @@ public interface ActiveMQJMSServerBundle
@Message(id = 129006, value = "Binding {0} is already being used by another connection factory", format = Message.Format.MESSAGE_FORMAT)
ActiveMQAddressExistsException cfBindingsExists(String name);
- @Message(id = 129007, value = "Error decoding password using codec instance", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 129007, value = "Error decoding password using codec instance")
ActiveMQIllegalStateException errorDecodingPassword(@Cause Exception e);
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-journal/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-journal/pom.xml b/activemq-journal/pom.xml
index 3a48c9f..f94fd54 100644
--- a/activemq-journal/pom.xml
+++ b/activemq-journal/pom.xml
@@ -35,6 +35,8 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
</dependency>
<!--
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-journal/src/main/java/org/apache/activemq/journal/ActiveMQJournalBundle.java
----------------------------------------------------------------------
diff --git a/activemq-journal/src/main/java/org/apache/activemq/journal/ActiveMQJournalBundle.java b/activemq-journal/src/main/java/org/apache/activemq/journal/ActiveMQJournalBundle.java
index 0754142..053f440 100644
--- a/activemq-journal/src/main/java/org/apache/activemq/journal/ActiveMQJournalBundle.java
+++ b/activemq-journal/src/main/java/org/apache/activemq/journal/ActiveMQJournalBundle.java
@@ -37,13 +37,12 @@ public interface ActiveMQJournalBundle
@Message(id = 149000, value = "failed to rename file {0} to {1}", format = Message.Format.MESSAGE_FORMAT)
ActiveMQIOErrorException ioRenameFileError(String name, String newFileName);
- @Message(id = 149001, value = "Journal data belong to a different version", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 149001, value = "Journal data belong to a different version")
ActiveMQIOErrorException journalDifferentVersion();
- @Message(id = 149002, value = "Journal files version mismatch. You should export the data from the previous version and import it as explained on the user''s manual",
- format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 149002, value = "Journal files version mismatch. You should export the data from the previous version and import it as explained on the user''s manual")
ActiveMQIOErrorException journalFileMisMatch();
- @Message(id = 149003, value = "File not opened", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 149003, value = "File not opened")
ActiveMQIOErrorException fileNotOpened();
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-protocols/activemq-amqp-protocol/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-protocols/activemq-amqp-protocol/pom.xml b/activemq-protocols/activemq-amqp-protocol/pom.xml
index 11993b8..74e7ac1 100644
--- a/activemq-protocols/activemq-amqp-protocol/pom.xml
+++ b/activemq-protocols/activemq-amqp-protocol/pom.xml
@@ -43,6 +43,8 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
</dependency>
<!--
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-protocols/activemq-openwire-protocol/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-protocols/activemq-openwire-protocol/pom.xml b/activemq-protocols/activemq-openwire-protocol/pom.xml
index f51a7b7..6458866 100644
--- a/activemq-protocols/activemq-openwire-protocol/pom.xml
+++ b/activemq-protocols/activemq-openwire-protocol/pom.xml
@@ -32,6 +32,8 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
</dependency>
<!--
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-protocols/activemq-proton-plug/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-protocols/activemq-proton-plug/pom.xml b/activemq-protocols/activemq-proton-plug/pom.xml
index cc545b2..db125c4 100644
--- a/activemq-protocols/activemq-proton-plug/pom.xml
+++ b/activemq-protocols/activemq-proton-plug/pom.xml
@@ -43,6 +43,8 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
</dependency>
<!--
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/logger/ActiveMQAMQPProtocolMessageBundle.java
----------------------------------------------------------------------
diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/logger/ActiveMQAMQPProtocolMessageBundle.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/logger/ActiveMQAMQPProtocolMessageBundle.java
index c2aa7fc..b3d2258 100644
--- a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/logger/ActiveMQAMQPProtocolMessageBundle.java
+++ b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/logger/ActiveMQAMQPProtocolMessageBundle.java
@@ -38,21 +38,18 @@ public interface ActiveMQAMQPProtocolMessageBundle
ActiveMQAMQPProtocolMessageBundle BUNDLE = Messages.getBundle(ActiveMQAMQPProtocolMessageBundle.class);
- @Message(id = 219000, value = "target address not set", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 219000, value = "target address not set")
ActiveMQAMQPInvalidFieldException targetAddressNotSet();
@Message(id = 219001, value = "error creating temporary queue, {0}", format = Message.Format.MESSAGE_FORMAT)
ActiveMQAMQPInternalErrorException errorCreatingTemporaryQueue(String message);
- @Message(id = 219002, value = "target address does not exist", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 219002, value = "target address does not exist")
ActiveMQAMQPIllegalStateException addressDoesntExist();
@Message(id = 219003, value = "error finding temporary queue, {0}", format = Message.Format.MESSAGE_FORMAT)
ActiveMQAMQPInternalErrorException errorFindingTemporaryQueue(String message);
- @Message(id = 219004, value = "error creating ActiveMQ Session, {0}", format = Message.Format.MESSAGE_FORMAT)
- ActiveMQAMQPInternalErrorException errorCreatingActiveMQSession(String message);
-
@Message(id = 219005, value = "error creating ActiveMQ Consumer, {0}", format = Message.Format.MESSAGE_FORMAT)
ActiveMQAMQPInternalErrorException errorCreatingActiveMQConsumer(String message);
@@ -65,13 +62,10 @@ public interface ActiveMQAMQPProtocolMessageBundle
@Message(id = 219008, value = "error cancelling message {0}, {1}", format = Message.Format.MESSAGE_FORMAT)
ActiveMQAMQPIllegalStateException errorCancellingMessage(String messageID, String message);
- @Message(id = 219009, value = "error closing consumer {0}, {1}", format = Message.Format.MESSAGE_FORMAT)
- ActiveMQAMQPIllegalStateException errorClosingConsumer(long consumerID, String message);
-
- @Message(id = 219010, value = "source address does not exist", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 219010, value = "source address does not exist")
ActiveMQAMQPInvalidFieldException sourceAddressDoesntExist();
- @Message(id = 219011, value = "source address not set", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 219011, value = "source address not set")
ActiveMQAMQPInvalidFieldException sourceAddressNotSet();
@Message(id = 219012, value = "error rolling back coordinator: {0}", format = Message.Format.MESSAGE_FORMAT)
@@ -80,6 +74,4 @@ public interface ActiveMQAMQPProtocolMessageBundle
@Message(id = 219013, value = "error committing coordinator: {0}", format = Message.Format.MESSAGE_FORMAT)
ActiveMQAMQPIllegalStateException errorCommittingCoordinator(String message);
- @Message(id = 219015, value = "error decoding AMQP frame", format = Message.Format.MESSAGE_FORMAT)
- String decodeError();
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-protocols/activemq-stomp-protocol/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-protocols/activemq-stomp-protocol/pom.xml b/activemq-protocols/activemq-stomp-protocol/pom.xml
index 2ee12a4..b47320a 100644
--- a/activemq-protocols/activemq-stomp-protocol/pom.xml
+++ b/activemq-protocols/activemq-stomp-protocol/pom.xml
@@ -32,6 +32,8 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
</dependency>
<!--
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/ActiveMQStompProtocolMessageBundle.java
----------------------------------------------------------------------
diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/ActiveMQStompProtocolMessageBundle.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/ActiveMQStompProtocolMessageBundle.java
index 8cf2a90..6879f7d 100644
--- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/ActiveMQStompProtocolMessageBundle.java
+++ b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/ActiveMQStompProtocolMessageBundle.java
@@ -46,28 +46,28 @@ public interface ActiveMQStompProtocolMessageBundle
@Message(id = 339002, value = "Stomp versions not supported: {0}", format = Message.Format.MESSAGE_FORMAT)
ActiveMQStompException versionNotSupported(String acceptVersion);
- @Message(id = 339003, value = "Header host is null", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 339003, value = "Header host is null")
ActiveMQStompException nullHostHeader();
- @Message(id = 339004, value = "Cannot accept null as host", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 339004, value = "Cannot accept null as host")
String hostCannotBeNull();
- @Message(id = 339005, value = "Header host does not match server host", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 339005, value = "Header host does not match server host")
ActiveMQStompException hostNotMatch();
@Message(id = 339006, value = "host {0} does not match server host name", format = Message.Format.MESSAGE_FORMAT)
String hostNotMatchDetails(String host);
- @Message(id = 339007, value = "Connection was destroyed.", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 339007, value = "Connection was destroyed.")
ActiveMQStompException connectionDestroyed();
- @Message(id = 339008, value = "Connection has not been established.", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 339008, value = "Connection has not been established.")
ActiveMQStompException connectionNotEstablished();
- @Message(id = 339009, value = "Exception getting session", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 339009, value = "Exception getting session")
ActiveMQStompException errorGetSession(@Cause Exception e);
- @Message(id = 339010, value = "Connection is not valid.", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 339010, value = "Connection is not valid.")
ActiveMQStompException invalidConnection();
@Message(id = 339011, value = "Error sending message {0}", format = Message.Format.MESSAGE_FORMAT)
@@ -82,7 +82,7 @@ public interface ActiveMQStompProtocolMessageBundle
@Message(id = 339014, value = "Error aborting {0}", format = Message.Format.MESSAGE_FORMAT)
ActiveMQStompException errorAbortTx(String txID, @Cause Exception e);
- @Message(id = 339015, value = "Client must set destination or id header to a SUBSCRIBE command", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 339015, value = "Client must set destination or id header to a SUBSCRIBE command")
ActiveMQStompException noDestination();
@Message(id = 339016, value = "Error creating subscription {0}", format = Message.Format.MESSAGE_FORMAT)
@@ -94,10 +94,10 @@ public interface ActiveMQStompProtocolMessageBundle
@Message(id = 339018, value = "Error acknowledging message {0}", format = Message.Format.MESSAGE_FORMAT)
ActiveMQStompException errorAck(String messageID, @Cause Exception e);
- @Message(id = 339019, value = "Invalid char sequence: two consecutive CRs.", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 339019, value = "Invalid char sequence: two consecutive CRs.")
ActiveMQStompException invalidTwoCRs();
- @Message(id = 339020, value = "Invalid char sequence: There is a CR not followed by an LF", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 339020, value = "Invalid char sequence: There is a CR not followed by an LF")
ActiveMQStompException badCRs();
@Message(id = 339021, value = "Expect new line char but is {0}", format = Message.Format.MESSAGE_FORMAT)
@@ -118,36 +118,36 @@ public interface ActiveMQStompProtocolMessageBundle
@Message(id = 339026, value = "subscription id {0} does not match {1}", format = Message.Format.MESSAGE_FORMAT)
ActiveMQStompException subscriptionIDMismatch(String subscriptionID, String actualID);
- @Message(id = 339027, value = "Cannot create a subscriber on the durable subscription if the client-id of the connection is not set", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 339027, value = "Cannot create a subscriber on the durable subscription if the client-id of the connection is not set")
IllegalStateException missingClientID();
- @Message(id = 339028, value = "Message header too big, increase minLargeMessageSize please.", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 339028, value = "Message header too big, increase minLargeMessageSize please.")
Exception headerTooBig();
@Message(id = 339029, value = "Unsupported command: {0}", format = Message.Format.MESSAGE_FORMAT)
ActiveMQStompException unknownCommand(String command);
- @Message(id = 339030, value = "transaction header is mandatory to COMMIT a transaction", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 339030, value = "transaction header is mandatory to COMMIT a transaction")
ActiveMQStompException needTxIDHeader();
- @Message(id = 339031, value = "Error handling send", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 339031, value = "Error handling send")
ActiveMQStompException errorHandleSend(@Cause Exception e);
- @Message(id = 339032, value = "Need a transaction id to begin", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 339032, value = "Need a transaction id to begin")
ActiveMQStompException beginTxNoID();
- @Message(id = 339033, value = "transaction header is mandatory to ABORT a transaction", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 339033, value = "transaction header is mandatory to ABORT a transaction")
ActiveMQStompException abortTxNoID();
- @Message(id = 339034, value = "This method should not be called", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 339034, value = "This method should not be called")
IllegalStateException invalidCall();
- @Message(id = 339035, value = "Must specify the subscription''s id or the destination you are unsubscribing from", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 339035, value = "Must specify the subscription''s id or the destination you are unsubscribing from")
ActiveMQStompException needIDorDestination();
- @Message(id = 339037, value = "Must specify the subscription''s id", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 339037, value = "Must specify the subscription''s id")
ActiveMQStompException needSubscriptionID();
- @Message(id = 339039, value = "No id header in ACK/NACK frame.", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 339039, value = "No id header in ACK/NACK frame.")
ActiveMQStompException noIDInAck();
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-ra/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-ra/pom.xml b/activemq-ra/pom.xml
index b3ac13b..676effa 100644
--- a/activemq-ra/pom.xml
+++ b/activemq-ra/pom.xml
@@ -35,6 +35,8 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
</dependency>
<!--
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRABundle.java
----------------------------------------------------------------------
diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRABundle.java b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRABundle.java
index dfc3556..7b06c72 100644
--- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRABundle.java
+++ b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRABundle.java
@@ -23,7 +23,6 @@ import org.jboss.logging.annotations.Message;
import org.jboss.logging.annotations.MessageBundle;
import org.jboss.logging.Messages;
-import javax.jms.JMSException;
import javax.jms.JMSRuntimeException;
import javax.resource.NotSupportedException;
@@ -42,30 +41,24 @@ public interface ActiveMQRABundle
ActiveMQRABundle BUNDLE = Messages.getBundle(ActiveMQRABundle.class);
- @Message(id = 159000, value = "Error decoding password using codec instance", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 159000, value = "Error decoding password using codec instance")
ActiveMQIllegalStateException errorDecodingPassword(@Cause Exception e);
- @Message(id = 159001, value = "MDB cannot be deployed as it has no Activation Spec. Please provide an Activation!", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 159001, value = "MDB cannot be deployed as it has no Activation Spec. Please provide an Activation!")
NotSupportedException noActivationSpec();
- @Message(id = 159002, value = "Please provide a destination for the MDB", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 159002, value = "Please provide a destination for the MDB")
IllegalArgumentException noDestinationName();
- @Message(id = 159003, value = ISE, format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 159003, value = ISE)
JMSRuntimeException illegalJEEMethod();
- @Message(id = 159004, value = "Invalid Session Mode SESSION_TRANSACTED", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 159004, value = "Invalid Session Mode SESSION_TRANSACTED")
JMSRuntimeException invalidSessionTransactedModeRuntime();
- @Message(id = 159005, value = "Invalid Session Mode CLIENT_ACKNOWLEDGE", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 159005, value = "Invalid Session Mode CLIENT_ACKNOWLEDGE")
JMSRuntimeException invalidClientAcknowledgeModeRuntime();
@Message(id = 159006, value = "Invalid Session Mode {0}", format = Message.Format.MESSAGE_FORMAT)
JMSRuntimeException invalidAcknowledgeMode(int sessionMode);
-
- @Message(id = 159007, value = "Invalid Session Mode SESSION_TRANSACTED", format = Message.Format.MESSAGE_FORMAT)
- JMSException invalidSessionTransactedMode();
-
- @Message(id = 159008, value = "Invalid Session Mode CLIENT_ACKNOWLEDGE", format = Message.Format.MESSAGE_FORMAT)
- JMSException invalidClientAcknowledgeMode();
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-rest/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-rest/pom.xml b/activemq-rest/pom.xml
index e567267..4e2772d 100644
--- a/activemq-rest/pom.xml
+++ b/activemq-rest/pom.xml
@@ -38,6 +38,9 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
+
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-server/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-server/pom.xml b/activemq-server/pom.xml
index 06909b0..18bbf8a 100644
--- a/activemq-server/pom.xml
+++ b/activemq-server/pom.xml
@@ -35,6 +35,8 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
</dependency>
<!--
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-server/src/main/java/org/apache/activemq/core/server/ActiveMQMessageBundle.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/ActiveMQMessageBundle.java b/activemq-server/src/main/java/org/apache/activemq/core/server/ActiveMQMessageBundle.java
index ef2e810..48e51a7 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/ActiveMQMessageBundle.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/ActiveMQMessageBundle.java
@@ -22,7 +22,6 @@ import org.apache.activemq.api.core.ActiveMQConnectionTimedOutException;
import org.apache.activemq.api.core.ActiveMQDisconnectedException;
import org.apache.activemq.api.core.ActiveMQDuplicateMetaDataException;
import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQIOErrorException;
import org.apache.activemq.api.core.ActiveMQIllegalStateException;
import org.apache.activemq.api.core.ActiveMQIncompatibleClientServerException;
import org.apache.activemq.api.core.ActiveMQInternalErrorException;
@@ -67,7 +66,7 @@ public interface ActiveMQMessageBundle
@Message(id = 119002, value = "Thread {0} name = {1} id = {2} group = {3}", format = Message.Format.MESSAGE_FORMAT)
String threadDump(Thread key, String name, Long id, ThreadGroup threadGroup);
- @Message(id = 119003, value = "End Thread dump", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119003, value = "End Thread dump")
String endThreadDump();
@Message(id = 119004, value = "Information about server {0}\nCluster Connection:{1}", format = Message.Format.MESSAGE_FORMAT)
@@ -76,22 +75,22 @@ public interface ActiveMQMessageBundle
@Message(id = 119005, value = "connections for {0} closed by management", format = Message.Format.MESSAGE_FORMAT)
ActiveMQInternalErrorException connectionsClosedByManagement(String ipAddress);
- @Message(id = 119006, value = "journals are not JournalImpl. You can''t set a replicator!", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119006, value = "journals are not JournalImpl. You can''t set a replicator!")
ActiveMQInternalErrorException notJournalImpl();
- @Message(id = 119007, value = "unhandled error during replication", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119007, value = "unhandled error during replication")
ActiveMQInternalErrorException replicationUnhandledError(@Cause Exception e);
- @Message(id = 119008, value = "Live Node contains more journals than the backup node. Probably a version match error", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119008, value = "Live Node contains more journals than the backup node. Probably a version match error")
ActiveMQInternalErrorException replicationTooManyJournals();
@Message(id = 119009, value = "Unhandled file type {0}", format = Message.Format.MESSAGE_FORMAT)
ActiveMQInternalErrorException replicationUnhandledFileType(ReplicationSyncFileMessage.FileType fileType);
- @Message(id = 119010, value = "Remote Backup can not be up-to-date!", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119010, value = "Remote Backup can not be up-to-date!")
ActiveMQInternalErrorException replicationBackupUpToDate();
- @Message(id = 119011, value = "unhandled data type!", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119011, value = "unhandled data type!")
ActiveMQInternalErrorException replicationUnhandledDataType();
@Message(id = 119012, value = "No binding for divert {0}", format = Message.Format.MESSAGE_FORMAT)
@@ -109,12 +108,6 @@ public interface ActiveMQMessageBundle
" The connection will now be closed.", format = Message.Format.MESSAGE_FORMAT)
ActiveMQConnectionTimedOutException clientExited(String remoteAddress);
- @Message(id = 119015, value = "Timeout on waiting I/O completion", format = Message.Format.MESSAGE_FORMAT)
- ActiveMQIOErrorException ioTimeout();
-
- @Message(id = 119016, value = "queue {0} has been removed cannot deliver message, queues should not be removed when grouping is used", format = Message.Format.MESSAGE_FORMAT)
- ActiveMQNonExistentQueueException groupingQueueRemoved(SimpleString chosenClusterName);
-
@Message(id = 119017, value = "Queue {0} does not exist", format = Message.Format.MESSAGE_FORMAT)
ActiveMQNonExistentQueueException noSuchQueue(SimpleString queueName);
@@ -127,22 +120,22 @@ public interface ActiveMQMessageBundle
@Message(id = 119020, value = "Invalid filter: {0}", format = Message.Format.MESSAGE_FORMAT)
ActiveMQInvalidFilterExpressionException invalidFilter(@Cause Throwable e, SimpleString filter);
- @Message(id = 119021, value = "MessageId was not assigned to Message", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119021, value = "MessageId was not assigned to Message")
ActiveMQIllegalStateException messageIdNotAssigned();
- @Message(id = 119022, value = "Cannot compare journals if not in sync!", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119022, value = "Cannot compare journals if not in sync!")
ActiveMQIllegalStateException journalsNotInSync();
- @Message(id = 119023, value = "Connected server is not a backup server", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119023, value = "Connected server is not a backup server")
ActiveMQIllegalStateException serverNotBackupServer();
- @Message(id = 119024, value = "Backup replication server is already connected to another server", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119024, value = "Backup replication server is already connected to another server")
ActiveMQIllegalStateException alreadyHaveReplicationServer();
@Message(id = 119025, value = "Cannot delete queue {0} on binding {1} - it has consumers = {2}", format = Message.Format.MESSAGE_FORMAT)
ActiveMQIllegalStateException cannotDeleteQueue(SimpleString name, SimpleString queueName, String s);
- @Message(id = 119026, value = "Backup Server was not yet in sync with live", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119026, value = "Backup Server was not yet in sync with live")
ActiveMQIllegalStateException backupServerNotInSync();
@Message(id = 119027, value = "Could not find reference on consumer ID={0}, messageId = {1} queue = {2}", format = Message.Format.MESSAGE_FORMAT)
@@ -151,10 +144,10 @@ public interface ActiveMQMessageBundle
@Message(id = 119028, value = "Consumer {0} doesn''t exist on the server", format = Message.Format.MESSAGE_FORMAT)
ActiveMQIllegalStateException consumerDoesntExist(long consumerID);
- @Message(id = 119029, value = "No address configured on the Server''s Session", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119029, value = "No address configured on the Server''s Session")
ActiveMQIllegalStateException noAddress();
- @Message(id = 119030, value = "large-message not initialized on server", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119030, value = "large-message not initialized on server")
ActiveMQIllegalStateException largeMessageNotInitialised();
@Message(id = 119031, value = "Unable to validate user: {0}", format = Message.Format.MESSAGE_FORMAT)
@@ -163,10 +156,10 @@ public interface ActiveMQMessageBundle
@Message(id = 119032, value = "User: {0} does not have permission=''{1}'' on address {2}", format = Message.Format.MESSAGE_FORMAT)
ActiveMQSecurityException userNoPermissions(String username, CheckType checkType, String saddress);
- @Message(id = 119033, value = "Server and client versions incompatible", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119033, value = "Server and client versions incompatible")
ActiveMQIncompatibleClientServerException incompatibleClientServer();
- @Message(id = 119034, value = "Server not started", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119034, value = "Server not started")
ActiveMQSessionCreationException serverNotStarted();
@Message(id = 119035, value = "Metadata {0}={1} had been set already", format = Message.Format.MESSAGE_FORMAT)
@@ -175,9 +168,6 @@ public interface ActiveMQMessageBundle
@Message(id = 119036, value = "Invalid type: {0}", format = Message.Format.MESSAGE_FORMAT)
IllegalArgumentException invalidType(Object type);
- @Message(id = 119037, value = "retry interval must be positive, was {0}", format = Message.Format.MESSAGE_FORMAT)
- IllegalArgumentException invalidRetryInterval(Long size);
-
@Message(id = 119038, value = "{0} must neither be null nor empty", format = Message.Format.MESSAGE_FORMAT)
IllegalArgumentException emptyOrNull(String name);
@@ -214,7 +204,7 @@ public interface ActiveMQMessageBundle
@Message(id = 119049, value = "No queue found for {0}", format = Message.Format.MESSAGE_FORMAT)
IllegalArgumentException noQueueFound(String otherQueueName);
- @Message(id = 119050, value = "Only NIO and AsyncIO are supported journals", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119050, value = "Only NIO and AsyncIO are supported journals")
IllegalArgumentException invalidJournal();
@Message(id = 119051, value = "Invalid journal type {0}", format = Message.Format.MESSAGE_FORMAT)
@@ -223,28 +213,25 @@ public interface ActiveMQMessageBundle
@Message(id = 119052, value = "Directory {0} does not exist and cannot be created", format = Message.Format.MESSAGE_FORMAT)
IllegalArgumentException cannotCreateDir(String dir);
- @Message(id = 119053, value = "Invalid index {0}", format = Message.Format.MESSAGE_FORMAT)
- IllegalArgumentException invalidIndex(Integer index);
-
- @Message(id = 119054, value = "Cannot convert to int", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119054, value = "Cannot convert to int")
IllegalArgumentException cannotConvertToInt();
- @Message(id = 119055, value = "Routing name is null", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119055, value = "Routing name is null")
IllegalArgumentException routeNameIsNull();
- @Message(id = 119056, value = "Cluster name is null", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119056, value = "Cluster name is null")
IllegalArgumentException clusterNameIsNull();
- @Message(id = 119057, value = "Address is null", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119057, value = "Address is null")
IllegalArgumentException addressIsNull();
- @Message(id = 119058, value = "Binding type not specified", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119058, value = "Binding type not specified")
IllegalArgumentException bindingTypeNotSpecified();
- @Message(id = 119059, value = "Binding ID is null", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119059, value = "Binding ID is null")
IllegalArgumentException bindingIdNotSpecified();
- @Message(id = 119060, value = "Distance is null", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119060, value = "Distance is null")
IllegalArgumentException distancenotSpecified();
@Message(id = 119061, value = "Connection already exists with id {0}", format = Message.Format.MESSAGE_FORMAT)
@@ -259,10 +246,10 @@ public interface ActiveMQMessageBundle
@Message(id = 119064, value = "Unknown protocol {0}", format = Message.Format.MESSAGE_FORMAT)
IllegalArgumentException unknownProtocol(String protocol);
- @Message(id = 119065, value = "node id is null", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119065, value = "node id is null")
IllegalArgumentException nodeIdNull();
- @Message(id = 119066, value = "Queue name is null", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119066, value = "Queue name is null")
IllegalArgumentException queueNameIsNull();
@Message(id = 119067, value = "Cannot find resource with name {0}", format = Message.Format.MESSAGE_FORMAT)
@@ -274,16 +261,16 @@ public interface ActiveMQMessageBundle
@Message(id = 119069, value = "no operation {0}/{1}", format = Message.Format.MESSAGE_FORMAT)
IllegalArgumentException noOperation(String operation, Integer length);
- @Message(id = 119070, value = "match can not be null", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119070, value = "match can not be null")
IllegalArgumentException nullMatch();
- @Message(id = 119071, value = "# can only be at end of match", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119071, value = "# can only be at end of match")
IllegalArgumentException invalidMatch();
- @Message(id = 119072, value = "User cannot be null", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119072, value = "User cannot be null")
IllegalArgumentException nullUser();
- @Message(id = 119073, value = "Password cannot be null", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119073, value = "Password cannot be null")
IllegalArgumentException nullPassword();
@Message(id = 119074, value = "Error instantiating transformer class {0}", format = Message.Format.MESSAGE_FORMAT)
@@ -316,7 +303,7 @@ public interface ActiveMQMessageBundle
@Message(id = 119079, value = "No session found with {0}={1}", format = Message.Format.MESSAGE_FORMAT)
String destroyConnectionWithSessionMetadataNoSessionFound(String key, String value);
- @Message(id = 119080, value = "Invalid Page IO, PagingManager was stopped or closed", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119080, value = "Invalid Page IO, PagingManager was stopped or closed")
ActiveMQIllegalStateException invalidPageIO();
@Message(id = 119081, value = "No Discovery Group configuration named {0} found", format = Message.Format.MESSAGE_FORMAT)
@@ -349,15 +336,12 @@ public interface ActiveMQMessageBundle
@Message(id = 119102, value = "Address \"{0}\" is full.", format = Message.Format.MESSAGE_FORMAT)
ActiveMQAddressFullException addressIsFull(String addressName);
- @Message(id = 119103, value = "No Connectors or Discovery Groups configured for Scale Down", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119103, value = "No Connectors or Discovery Groups configured for Scale Down")
ActiveMQException noConfigurationFoundForScaleDown();
- @Message(id = 119104, value = "Server is stopping. Message grouping not allowed", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 119104, value = "Server is stopping. Message grouping not allowed")
ActiveMQException groupWhileStopping();
- @Message(id = 119105, value = "Server will not accept create session request since scale down has not occurred", format = Message.Format.MESSAGE_FORMAT)
- ActiveMQSessionCreationException sessionNotFailedOver();
-
@Message(id = 119106, value = "Invalid slow consumer policy type {0}", format = Message.Format.MESSAGE_FORMAT)
IllegalArgumentException invalidSlowConsumerPolicyType(String val);
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-service-extensions/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-service-extensions/pom.xml b/activemq-service-extensions/pom.xml
index da50e32..e305dca 100644
--- a/activemq-service-extensions/pom.xml
+++ b/activemq-service-extensions/pom.xml
@@ -45,6 +45,8 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-tools/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-tools/pom.xml b/activemq-tools/pom.xml
index 11bfd13..99c083a 100644
--- a/activemq-tools/pom.xml
+++ b/activemq-tools/pom.xml
@@ -35,6 +35,8 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/integration/activemq-aerogear-integration/pom.xml
----------------------------------------------------------------------
diff --git a/integration/activemq-aerogear-integration/pom.xml b/integration/activemq-aerogear-integration/pom.xml
index 8f6a20a..d109a9d 100644
--- a/integration/activemq-aerogear-integration/pom.xml
+++ b/integration/activemq-aerogear-integration/pom.xml
@@ -36,6 +36,8 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
</dependency>
<!--
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/ActiveMQAeroGearBundle.java
----------------------------------------------------------------------
diff --git a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/ActiveMQAeroGearBundle.java b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/ActiveMQAeroGearBundle.java
index c5b7877..945e484 100644
--- a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/ActiveMQAeroGearBundle.java
+++ b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/ActiveMQAeroGearBundle.java
@@ -33,13 +33,13 @@ public interface ActiveMQAeroGearBundle
{
ActiveMQAeroGearBundle BUNDLE = Messages.getBundle(ActiveMQAeroGearBundle.class);
- @Message(id = 239000, value = "endpoint can not be null", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 239000, value = "endpoint can not be null")
ActiveMQIllegalStateException endpointNull();
- @Message(id = 239001, value = "application-id can not be null", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 239001, value = "application-id can not be null")
ActiveMQIllegalStateException applicationIdNull();
- @Message(id = 239002, value = "master-secret can not be null", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 239002, value = "master-secret can not be null")
ActiveMQIllegalStateException masterSecretNull();
@Message(id = 239003, value = "{0}: queue {1} not found", format = Message.Format.MESSAGE_FORMAT)
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/integration/activemq-spring-integration/pom.xml
----------------------------------------------------------------------
diff --git a/integration/activemq-spring-integration/pom.xml b/integration/activemq-spring-integration/pom.xml
index 576e477..4f03b08 100644
--- a/integration/activemq-spring-integration/pom.xml
+++ b/integration/activemq-spring-integration/pom.xml
@@ -37,6 +37,8 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
</dependency>
<!--
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/integration/activemq-vertx-integration/pom.xml
----------------------------------------------------------------------
diff --git a/integration/activemq-vertx-integration/pom.xml b/integration/activemq-vertx-integration/pom.xml
index 2d64717..ae81e1e 100644
--- a/integration/activemq-vertx-integration/pom.xml
+++ b/integration/activemq-vertx-integration/pom.xml
@@ -76,10 +76,12 @@
</repositories>
<dependencies>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-processor</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
<!--
JBoss Logging
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cc8d53b..4352960 100644
--- a/pom.xml
+++ b/pom.xml
@@ -200,10 +200,18 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
- <version>1.2.1.Final</version>
- <scope>compile</scope>
+ <version>2.0.0.Alpha1</version>
+ <optional>true</optional>
<!-- License: LGPL-->
</dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-annotations</artifactId>
+ <version>2.0.0.Alpha1</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ <!-- License: Apache 2.0-->
+ </dependency>
<!--needed to compile the logging jar-->
<dependency>
<groupId>log4j</groupId>
@@ -594,7 +602,7 @@
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
- <artifactId>javacc-maven-plugin</artifactId>
+ <artifactId>javacc-maven-plugin</artifactId>
<version>2.6</version>
<executions>
<execution>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/tests/extra-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/extra-tests/pom.xml b/tests/extra-tests/pom.xml
index b439ae8..c6c5bf0 100644
--- a/tests/extra-tests/pom.xml
+++ b/tests/extra-tests/pom.xml
@@ -155,6 +155,8 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/tests/integration-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/pom.xml b/tests/integration-tests/pom.xml
index d1d6b36..6eec0ff 100644
--- a/tests/integration-tests/pom.xml
+++ b/tests/integration-tests/pom.xml
@@ -137,6 +137,8 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/tests/jms-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/jms-tests/pom.xml b/tests/jms-tests/pom.xml
index 3771e8c..48b8507 100644
--- a/tests/jms-tests/pom.xml
+++ b/tests/jms-tests/pom.xml
@@ -105,6 +105,9 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
+
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/tests/unit-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/unit-tests/pom.xml b/tests/unit-tests/pom.xml
index 7b87b1a..9b2bd95 100644
--- a/tests/unit-tests/pom.xml
+++ b/tests/unit-tests/pom.xml
@@ -78,10 +78,12 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-processor</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
<!--
JBoss Logging
-->
[4/5] activemq-6 git commit: Send error on create producer when no
dest exists
Posted by an...@apache.org.
Send error on create producer when no dest exists
Returns an error to the client causing InvalidDestinationException to be
thrown when an ActiveMQ 5.x client attempts to create a producer with a
destination that does not exist. (Over OpenWire Protocol).
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/77921956
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/77921956
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/77921956
Branch: refs/heads/master
Commit: 77921956c5fffb5c0ac824d6b34fa559872f36de
Parents: 7c3e5d1
Author: Martyn Taylor <mt...@redhat.com>
Authored: Wed Mar 11 17:37:06 2015 +0000
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Thu Mar 12 10:49:17 2015 +0000
----------------------------------------------------------------------
.../protocol/openwire/OpenWireConnection.java | 25 +++++++++++++--
.../openwire/OpenWireProtocolManager.java | 2 +-
.../core/protocol/openwire/OpenWireUtil.java | 20 ++++++++++++
.../core/protocol/openwire/amq/AMQProducer.java | 6 ++--
.../core/protocol/openwire/amq/AMQSession.java | 2 +-
.../openwire/SimpleOpenWireTest.java | 33 ++++++++++++++++++++
6 files changed, 81 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/77921956/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireConnection.java
----------------------------------------------------------------------
diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireConnection.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireConnection.java
index 1f7ec86..db14e0a 100644
--- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireConnection.java
+++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireConnection.java
@@ -31,12 +31,14 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.locks.ReentrantReadWriteLock;
+import javax.jms.InvalidDestinationException;
import javax.jms.JMSSecurityException;
import javax.jms.ResourceAllocationException;
import org.apache.activemq.api.core.ActiveMQBuffer;
import org.apache.activemq.api.core.ActiveMQBuffers;
import org.apache.activemq.api.core.ActiveMQException;
+import org.apache.activemq.api.core.ActiveMQNonExistentQueueException;
import org.apache.activemq.api.core.ActiveMQSecurityException;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ActiveMQMessage;
@@ -1242,8 +1244,27 @@ public class OpenWireConnection implements RemotingConnection, CommandVisitor
@Override
public Response processAddProducer(ProducerInfo info) throws Exception
{
- protocolManager.addProducer(this, info);
- return null;
+ Response resp = null;
+ try
+ {
+ protocolManager.addProducer(this, info);
+ }
+ catch (Exception e)
+ {
+ if (e instanceof ActiveMQSecurityException)
+ {
+ resp = new ExceptionResponse(new JMSSecurityException(e.getMessage()));
+ }
+ else if (e instanceof ActiveMQNonExistentQueueException)
+ {
+ resp = new ExceptionResponse(new InvalidDestinationException(e.getMessage()));
+ }
+ else
+ {
+ resp = new ExceptionResponse(e);
+ }
+ }
+ return resp;
}
@Override
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/77921956/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireProtocolManager.java
----------------------------------------------------------------------
diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireProtocolManager.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireProtocolManager.java
index 363d092..dfa4e4a 100644
--- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireProtocolManager.java
+++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireProtocolManager.java
@@ -440,7 +440,7 @@ public class OpenWireProtocolManager implements ProtocolManager
return false;
}
- public void addProducer(OpenWireConnection theConn, ProducerInfo info)
+ public void addProducer(OpenWireConnection theConn, ProducerInfo info) throws Exception
{
SessionId sessionId = info.getProducerId().getParentId();
ConnectionId connectionId = sessionId.getParentId();
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/77921956/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireUtil.java
----------------------------------------------------------------------
diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireUtil.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireUtil.java
index 1824447..e0b9872 100644
--- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireUtil.java
+++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/OpenWireUtil.java
@@ -20,6 +20,10 @@ package org.apache.activemq.core.protocol.openwire;
import org.apache.activemq.api.core.ActiveMQBuffer;
import org.apache.activemq.api.core.ActiveMQBuffers;
import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.core.protocol.openwire.amq.AMQServerSession;
+import org.apache.activemq.core.protocol.openwire.amq.AMQSession;
+import org.apache.activemq.core.server.ActiveMQMessageBundle;
+import org.apache.activemq.core.server.BindingQueryResult;
import org.apache.activemq.util.ByteSequence;
import org.apache.activemq.api.core.SimpleString;
@@ -47,6 +51,22 @@ public class OpenWireUtil
}
}
+ /**
+ * Checks to see if this destination exists. If it does not throw an invalid destination exception.
+ * @param destination
+ * @param amqSession
+ */
+ public static void validateDestination(ActiveMQDestination destination, AMQSession amqSession) throws Exception
+ {
+ AMQServerSession coreSession = amqSession.getCoreSession();
+ SimpleString physicalName = OpenWireUtil.toCoreAddress(destination);
+ BindingQueryResult result = coreSession.executeBindingQuery(physicalName);
+ if (!result.isExists())
+ {
+ throw ActiveMQMessageBundle.BUNDLE.noSuchQueue(physicalName);
+ }
+ }
+
/*
*This util converts amq wildcards to compatible core wildcards
*The conversion is like this:
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/77921956/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQProducer.java
----------------------------------------------------------------------
diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQProducer.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQProducer.java
index bdf486c..06f7da7 100644
--- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQProducer.java
+++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQProducer.java
@@ -17,6 +17,7 @@
package org.apache.activemq.core.protocol.openwire.amq;
import org.apache.activemq.command.ProducerInfo;
+import org.apache.activemq.core.protocol.openwire.OpenWireUtil;
public class AMQProducer
{
@@ -29,9 +30,8 @@ public class AMQProducer
this.info = info;
}
- public void init()
+ public void init() throws Exception
{
- //activemq doesn't have producer at server.
+ OpenWireUtil.validateDestination(info.getDestination(), amqSession);
}
-
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/77921956/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSession.java
----------------------------------------------------------------------
diff --git a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSession.java b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSession.java
index d7fdce5..1d7740e 100644
--- a/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSession.java
+++ b/activemq-protocols/activemq-openwire-protocol/src/main/java/org/apache/activemq/core/protocol/openwire/amq/AMQSession.java
@@ -245,7 +245,7 @@ public class AMQSession implements SessionCallback
AMQConsumer consumer = consumers.remove(nativeId);
}
- public void createProducer(ProducerInfo info)
+ public void createProducer(ProducerInfo info) throws Exception
{
AMQProducer producer = new AMQProducer(this, info);
producer.init();
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/77921956/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/SimpleOpenWireTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/SimpleOpenWireTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/SimpleOpenWireTest.java
index a767bda..87b962c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/SimpleOpenWireTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/SimpleOpenWireTest.java
@@ -18,6 +18,8 @@ package org.apache.activemq.tests.integration.openwire;
import javax.jms.Connection;
import javax.jms.Destination;
+import javax.jms.InvalidDestinationException;
+import javax.jms.JMSException;
import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
import javax.jms.Queue;
@@ -25,15 +27,21 @@ import javax.jms.Session;
import javax.jms.TemporaryQueue;
import javax.jms.TemporaryTopic;
import javax.jms.TextMessage;
+import javax.jms.Topic;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.command.ActiveMQTopic;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.ExpectedException;
public class SimpleOpenWireTest extends BasicOpenWireTest
{
+ @Rule
+ public ExpectedException thrown= ExpectedException.none();
+
@Override
@Before
public void setUp() throws Exception
@@ -220,6 +228,31 @@ public class SimpleOpenWireTest extends BasicOpenWireTest
session.close();
}
+ @Test
+ public void testInvalidDestinationExceptionWhenNoQueueExistsOnCreateProducer() throws Exception
+ {
+ connection.start();
+ Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ Queue queue = session.createQueue("fake.queue");
+
+ thrown.expect(InvalidDestinationException.class);
+ thrown.expect(JMSException.class);
+ session.createProducer(queue);
+ session.close();
+ }
+
+ @Test
+ public void testInvalidDestinationExceptionWhenNoTopicExistsOnCreateProducer() throws Exception
+ {
+ connection.start();
+ Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ Destination destination = session.createTopic("fake.queue");
+
+ thrown.expect(InvalidDestinationException.class);
+ session.createProducer(destination);
+ session.close();
+ }
+
/**
* This is the example shipped with the distribution
* @throws Exception
[2/5] activemq-6 git commit: Fixing test dependencies
Posted by an...@apache.org.
Fixing test dependencies
- removing unused methods
- moving JMSXdeliveryCountTest to /extra-tests
- A few transactions methods that were not being used and creating issues to the release
due to an old dependency to the TM
This closes #173
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/d36a1d74
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/d36a1d74
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/d36a1d74
Branch: refs/heads/master
Commit: d36a1d74afa8dc59dab129cf65114f141d7cd04f
Parents: 7792195
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Mar 11 19:21:00 2015 -0400
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Thu Mar 12 10:49:17 2015 +0000
----------------------------------------------------------------------
.../extras/jms/xa/JMSXDeliveryCountTest.java | 814 +++++++++++++++++++
.../openwire/SimpleOpenWireTest.java | 4 +-
.../jms/tests/ActiveMQServerTestCase.java | 17 -
.../tests/message/JMSXDeliveryCountTest.java | 789 ------------------
tests/soak-tests/pom.xml | 7 -
5 files changed, 816 insertions(+), 815 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d36a1d74/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/jms/xa/JMSXDeliveryCountTest.java
----------------------------------------------------------------------
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/jms/xa/JMSXDeliveryCountTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/jms/xa/JMSXDeliveryCountTest.java
new file mode 100644
index 0000000..02ac354
--- /dev/null
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/tests/extras/jms/xa/JMSXDeliveryCountTest.java
@@ -0,0 +1,814 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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.tests.extras.jms.xa;
+
+import javax.jms.Connection;
+import javax.jms.DeliveryMode;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Queue;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import javax.jms.Topic;
+import javax.jms.XAConnection;
+import javax.jms.XAConnectionFactory;
+import javax.jms.XASession;
+import javax.transaction.Transaction;
+import javax.transaction.TransactionManager;
+import javax.transaction.xa.XAException;
+import javax.transaction.xa.XAResource;
+import javax.transaction.xa.Xid;
+
+import com.arjuna.ats.arjuna.coordinator.TransactionReaper;
+import com.arjuna.ats.arjuna.coordinator.TxControl;
+import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple;
+
+import org.apache.activemq.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.tests.util.JMSTestBase;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ *
+ * A JMSXDeliveryCountTest
+ */
+public class JMSXDeliveryCountTest extends JMSTestBase
+{
+ Queue queue1;
+ Topic topic1;
+
+ protected XAConnectionFactory xacf;
+
+ @Override
+ @Before
+ public void setUp() throws Exception
+ {
+ super.setUp();
+
+ xacf = ActiveMQJMSClient.createConnectionFactory("tcp://localhost:61616", "test");
+
+ queue1 = createQueue("queue1");
+ topic1 = createTopic("topic1");
+
+ TxControl.enable();
+ }
+
+ @Override
+ @After
+ public void tearDown() throws Exception
+ {
+ TxControl.disable(true);
+
+ TransactionReaper.terminate(false);
+
+ super.tearDown();
+
+ }
+
+ @Test
+ public void testSimpleJMSXDeliveryCount() throws Exception
+ {
+ Connection conn = null;
+
+ try
+ {
+ conn = cf.createConnection();
+ Session s = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ MessageProducer p = s.createProducer(queue1);
+ p.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
+
+ p.send(s.createTextMessage("xoxo"));
+
+ s.close();
+
+ s = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE);
+ MessageConsumer c = s.createConsumer(queue1);
+
+ conn.start();
+
+ TextMessage tm = (TextMessage)c.receive(1000);
+
+ Assert.assertEquals("xoxo", tm.getText());
+ Assert.assertTrue("JMSXDeliveryCount is supposed to exist as a property",
+ tm.propertyExists("JMSXDeliveryCount"));
+ Assert.assertEquals(1, tm.getIntProperty("JMSXDeliveryCount"));
+
+ s.recover();
+
+ tm = (TextMessage)c.receive(1000);
+
+ Assert.assertEquals("xoxo", tm.getText());
+ Assert.assertTrue("JMSXDeliveryCount is supposed to exist as a property",
+ tm.propertyExists("JMSXDeliveryCount"));
+ Assert.assertEquals(2, tm.getIntProperty("JMSXDeliveryCount"));
+
+ tm.acknowledge();
+
+ conn.close();
+ }
+ finally
+ {
+ if (conn != null)
+ {
+ conn.close();
+ }
+ }
+ }
+
+ @Test
+ public void testJMSXDeliveryCountNotDeliveredMessagesNotUpdated() throws Exception
+ {
+ Connection conn = null;
+
+ try
+ {
+ conn = cf.createConnection();
+
+ Session s = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE);
+
+ MessageProducer p = s.createProducer(queue1);
+
+ p.send(s.createTextMessage("message1"));
+ p.send(s.createTextMessage("message2"));
+ p.send(s.createTextMessage("message3"));
+ p.send(s.createTextMessage("message4"));
+ p.send(s.createTextMessage("message5"));
+
+ MessageConsumer c = s.createConsumer(queue1);
+
+ conn.start();
+
+ TextMessage tm = (TextMessage)c.receive(1000);
+
+ Assert.assertEquals("message1", tm.getText());
+ Assert.assertFalse(tm.getJMSRedelivered());
+ Assert.assertEquals(1, tm.getIntProperty("JMSXDeliveryCount"));
+
+ s.close();
+
+ s = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+ c = s.createConsumer(queue1);
+
+ tm = (TextMessage)c.receive(1000);
+
+ Assert.assertEquals("message1", tm.getText());
+ Assert.assertTrue(tm.getJMSRedelivered());
+ Assert.assertEquals(2, tm.getIntProperty("JMSXDeliveryCount"));
+
+ tm = (TextMessage)c.receive(1000);
+
+ Assert.assertEquals("message2", tm.getText());
+ Assert.assertFalse(tm.getJMSRedelivered());
+ Assert.assertEquals(1, tm.getIntProperty("JMSXDeliveryCount"));
+
+ tm = (TextMessage)c.receive(1000);
+
+ Assert.assertEquals("message3", tm.getText());
+ Assert.assertFalse(tm.getJMSRedelivered());
+ Assert.assertEquals(1, tm.getIntProperty("JMSXDeliveryCount"));
+
+ tm = (TextMessage)c.receive(1000);
+
+ Assert.assertEquals("message4", tm.getText());
+ Assert.assertFalse(tm.getJMSRedelivered());
+ Assert.assertEquals(1, tm.getIntProperty("JMSXDeliveryCount"));
+
+ tm = (TextMessage)c.receive(1000);
+
+ Assert.assertEquals("message5", tm.getText());
+ Assert.assertFalse(tm.getJMSRedelivered());
+ Assert.assertEquals(1, tm.getIntProperty("JMSXDeliveryCount"));
+
+ tm.acknowledge();
+ }
+ finally
+ {
+ if (conn != null)
+ {
+ conn.close();
+ }
+ }
+ }
+
+ @Test
+ public void testRedeliveryOnQueue() throws Exception
+ {
+ Connection conn = null;
+
+ try
+ {
+ conn = cf.createConnection();
+
+ Session sess1 = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+ MessageProducer prod = sess1.createProducer(queue1);
+
+ prod.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
+
+ final int NUM_MESSAGES = 100;
+
+ final int NUM_RECOVERIES = 8;
+
+ for (int i = 0; i < NUM_MESSAGES; i++)
+ {
+ TextMessage tm = sess1.createTextMessage();
+ tm.setText("testing" + i);
+ prod.send(tm);
+ }
+
+ Session sess2 = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE);
+
+ MessageConsumer cons = sess2.createConsumer(queue1);
+
+ conn.start();
+
+ TextMessage tm = null;
+
+ for (int j = 0; j < NUM_RECOVERIES; j++)
+ {
+ for (int i = 0; i < NUM_MESSAGES; i++)
+ {
+ tm = (TextMessage)cons.receive(3000);
+ Assert.assertNotNull(tm);
+ Assert.assertEquals("testing" + i, tm.getText());
+ Assert.assertTrue("JMSXDeliveryCount is supposed to exist as a property",
+ tm.propertyExists("JMSXDeliveryCount"));
+ Assert.assertEquals(j + 1, tm.getIntProperty("JMSXDeliveryCount"));
+ }
+ if (j != NUM_RECOVERIES - 1)
+ {
+ sess2.recover();
+ }
+ }
+
+ tm.acknowledge();
+ }
+ finally
+ {
+ if (conn != null)
+ {
+ conn.close();
+ }
+ }
+ }
+
+ @Test
+ public void testRedeliveryOnTopic() throws Exception
+ {
+ Connection conn = null;
+
+ try
+ {
+ conn = cf.createConnection();
+
+ conn.setClientID("myclientid");
+
+ Session sess1 = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE);
+ Session sess2 = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE);
+ Session sess3 = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE);
+
+ MessageConsumer cons1 = sess1.createConsumer(topic1);
+ MessageConsumer cons2 = sess2.createConsumer(topic1);
+ MessageConsumer cons3 = sess3.createDurableSubscriber(topic1, "subxyz");
+
+ conn.start();
+
+ final int NUM_MESSAGES = 100;
+ final int NUM_RECOVERIES = 9;
+
+ Receiver r1 = new Receiver("R1", sess1, cons1, NUM_MESSAGES, NUM_RECOVERIES);
+ Receiver r2 = new Receiver("R2", sess2, cons2, NUM_MESSAGES, NUM_RECOVERIES);
+ Receiver r3 = new Receiver("R3", sess3, cons3, NUM_MESSAGES, NUM_RECOVERIES);
+
+ Thread t1 = new Thread(r1);
+ Thread t2 = new Thread(r2);
+ Thread t3 = new Thread(r3);
+
+ t1.start();
+ t2.start();
+ t3.start();
+
+ Session sessSend = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ MessageProducer prod = sessSend.createProducer(topic1);
+ prod.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
+
+ for (int i = 0; i < NUM_MESSAGES; i++)
+ {
+ TextMessage tm1 = sessSend.createTextMessage("testing" + i);
+ prod.send(tm1);
+ }
+
+ t1.join();
+ t2.join();
+ t3.join();
+
+ Assert.assertFalse(r1.failed);
+ Assert.assertFalse(r2.failed);
+ Assert.assertFalse(r3.failed);
+
+ cons3.close();
+
+ sess3.unsubscribe("subxyz");
+ }
+ finally
+ {
+ if (conn != null)
+ {
+ conn.close();
+ }
+ }
+ }
+
+ @Test
+ public void testDeliveryCountUpdatedOnCloseTransacted() throws Exception
+ {
+ Connection conn = null;
+
+ try
+ {
+ conn = cf.createConnection();
+
+ Session producerSess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ MessageProducer producer = producerSess.createProducer(queue1);
+
+ Session consumerSess = conn.createSession(true, Session.SESSION_TRANSACTED);
+ MessageConsumer consumer = consumerSess.createConsumer(queue1);
+ conn.start();
+
+ TextMessage tm = producerSess.createTextMessage("message1");
+
+ producer.send(tm);
+
+ TextMessage rm = (TextMessage)consumer.receive(1000);
+
+ Assert.assertNotNull(rm);
+
+ Assert.assertEquals(tm.getText(), rm.getText());
+
+ Assert.assertTrue("JMSXDeliveryCount is supposed to exist as a property",
+ tm.propertyExists("JMSXDeliveryCount"));
+ Assert.assertEquals(1, rm.getIntProperty("JMSXDeliveryCount"));
+
+ Assert.assertFalse(rm.getJMSRedelivered());
+
+ consumerSess.rollback();
+
+ rm = (TextMessage)consumer.receive(1000);
+
+ Assert.assertNotNull(rm);
+
+ Assert.assertEquals(tm.getText(), rm.getText());
+
+ Assert.assertEquals(2, rm.getIntProperty("JMSXDeliveryCount"));
+
+ Assert.assertTrue(rm.getJMSRedelivered());
+
+ consumerSess.rollback();
+
+ rm = (TextMessage)consumer.receive(1000);
+
+ Assert.assertNotNull(rm);
+
+ Assert.assertEquals(tm.getText(), rm.getText());
+
+ Assert.assertEquals(3, rm.getIntProperty("JMSXDeliveryCount"));
+
+ Assert.assertTrue(rm.getJMSRedelivered());
+
+ // Now close the session without committing
+
+ consumerSess.close();
+
+ consumerSess = conn.createSession(true, Session.SESSION_TRANSACTED);
+
+ consumer = consumerSess.createConsumer(queue1);
+
+ rm = (TextMessage)consumer.receive(1000);
+
+ Assert.assertNotNull(rm);
+
+ Assert.assertEquals(tm.getText(), rm.getText());
+
+ Assert.assertEquals(4, rm.getIntProperty("JMSXDeliveryCount"));
+
+ Assert.assertTrue(rm.getJMSRedelivered());
+
+ consumerSess.commit();
+ }
+ finally
+ {
+ if (conn != null)
+ {
+ conn.close();
+ }
+ }
+ }
+
+ @Test
+ public void testDeliveryCountUpdatedOnCloseClientAck() throws Exception
+ {
+ Connection conn = null;
+
+ try
+ {
+ conn = cf.createConnection();
+
+ Session producerSess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ MessageProducer producer = producerSess.createProducer(queue1);
+
+ Session consumerSess = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE);
+ MessageConsumer consumer = consumerSess.createConsumer(queue1);
+ conn.start();
+
+ TextMessage tm = producerSess.createTextMessage("message1");
+
+ producer.send(tm);
+
+ TextMessage rm = (TextMessage)consumer.receive(1000);
+
+ Assert.assertNotNull(rm);
+
+ Assert.assertEquals(tm.getText(), rm.getText());
+
+ Assert.assertEquals(1, rm.getIntProperty("JMSXDeliveryCount"));
+
+ Assert.assertFalse(rm.getJMSRedelivered());
+
+ consumerSess.recover();
+
+ rm = (TextMessage)consumer.receive(1000);
+
+ Assert.assertNotNull(rm);
+
+ Assert.assertEquals(tm.getText(), rm.getText());
+
+ Assert.assertEquals(2, rm.getIntProperty("JMSXDeliveryCount"));
+
+ Assert.assertTrue(rm.getJMSRedelivered());
+
+ consumerSess.recover();
+
+ rm = (TextMessage)consumer.receive(1000);
+
+ Assert.assertNotNull(rm);
+
+ Assert.assertEquals(tm.getText(), rm.getText());
+
+ Assert.assertEquals(3, rm.getIntProperty("JMSXDeliveryCount"));
+
+ Assert.assertTrue(rm.getJMSRedelivered());
+
+ // Now close the session without committing
+
+ consumerSess.close();
+
+ consumerSess = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE);
+
+ consumer = consumerSess.createConsumer(queue1);
+
+ rm = (TextMessage)consumer.receive(1000);
+
+ Assert.assertNotNull(rm);
+
+ Assert.assertEquals(tm.getText(), rm.getText());
+
+ Assert.assertEquals(4, rm.getIntProperty("JMSXDeliveryCount"));
+
+ Assert.assertTrue(rm.getJMSRedelivered());
+
+ rm.acknowledge();
+ }
+ finally
+ {
+ if (conn != null)
+ {
+ conn.close();
+ }
+ }
+ }
+
+ @Test
+ public void testDeliveryCountUpdatedOnCloseXA() throws Exception
+ {
+ XAConnection xaConn = null;
+
+ Connection conn = null;
+ TransactionManager mgr = new TransactionManagerImple();
+
+ Transaction toResume = null;
+
+ Transaction tx = null;
+
+ try
+ {
+ toResume = mgr.suspend();
+
+ conn = cf.createConnection();
+
+ // Send a message
+
+ Session producerSess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ MessageProducer producer = producerSess.createProducer(queue1);
+
+ TextMessage tm = producerSess.createTextMessage("message1");
+
+ producer.send(tm);
+
+ xaConn = xacf.createXAConnection();
+
+ XASession consumerSess = xaConn.createXASession();
+ MessageConsumer consumer = consumerSess.createConsumer(queue1);
+ xaConn.start();
+
+ DummyXAResource res = new DummyXAResource();
+
+ mgr.begin();
+
+ tx = mgr.getTransaction();
+
+ tx.enlistResource(res);
+
+ tx.enlistResource(consumerSess.getXAResource());
+
+ TextMessage rm = (TextMessage)consumer.receive(1000);
+
+ Assert.assertNotNull(rm);
+
+ Assert.assertEquals(tm.getText(), rm.getText());
+
+ Assert.assertEquals(1, rm.getIntProperty("JMSXDeliveryCount"));
+
+ Assert.assertFalse(rm.getJMSRedelivered());
+
+ tx.delistResource(res, XAResource.TMSUCCESS);
+
+ tx.delistResource(consumerSess.getXAResource(), XAResource.TMSUCCESS);
+
+ mgr.rollback();
+
+ mgr.begin();
+
+ tx = mgr.getTransaction();
+
+ tx.enlistResource(res);
+
+ tx.enlistResource(consumerSess.getXAResource());
+
+ rm = (TextMessage)consumer.receive(1000);
+
+ Assert.assertNotNull(rm);
+
+ Assert.assertEquals(tm.getText(), rm.getText());
+
+ Assert.assertEquals(2, rm.getIntProperty("JMSXDeliveryCount"));
+
+ Assert.assertTrue(rm.getJMSRedelivered());
+
+ tx.delistResource(res, XAResource.TMSUCCESS);
+
+ tx.delistResource(consumerSess.getXAResource(), XAResource.TMSUCCESS);
+
+ mgr.rollback();
+
+ mgr.begin();
+
+ tx = mgr.getTransaction();
+
+ tx.enlistResource(res);
+
+ tx.enlistResource(consumerSess.getXAResource());
+
+ rm = (TextMessage)consumer.receive(1000);
+
+ Assert.assertNotNull(rm);
+
+ Assert.assertEquals(tm.getText(), rm.getText());
+
+ Assert.assertEquals(3, rm.getIntProperty("JMSXDeliveryCount"));
+
+ Assert.assertTrue(rm.getJMSRedelivered());
+
+ tx.delistResource(res, XAResource.TMSUCCESS);
+
+ tx.delistResource(consumerSess.getXAResource(), XAResource.TMSUCCESS);
+
+ mgr.rollback();
+
+ // Must close consumer first
+
+ consumer.close();
+
+ consumerSess.close();
+
+ consumerSess = xaConn.createXASession();
+
+ consumer = consumerSess.createConsumer(queue1);
+
+ mgr.begin();
+
+ tx = mgr.getTransaction();
+
+ tx.enlistResource(res);
+
+ tx.enlistResource(consumerSess.getXAResource());
+
+ rm = (TextMessage)consumer.receive(1000);
+
+ Assert.assertNotNull(rm);
+
+ Assert.assertEquals(tm.getText(), rm.getText());
+
+ Assert.assertEquals(4, rm.getIntProperty("JMSXDeliveryCount"));
+
+ Assert.assertTrue(rm.getJMSRedelivered());
+
+ tx.delistResource(res, XAResource.TMSUCCESS);
+
+ tx.delistResource(consumerSess.getXAResource(), XAResource.TMSUCCESS);
+ }
+ finally
+ {
+ if (conn != null)
+ {
+ conn.close();
+ }
+
+ if (tx != null)
+ {
+ try
+ {
+ mgr.commit();
+ }
+ catch (Exception ignore)
+ {
+ }
+ }
+ if (xaConn != null)
+ {
+ xaConn.close();
+ }
+
+ if (toResume != null)
+ {
+ try
+ {
+ mgr.resume(toResume);
+ }
+ catch (Exception ignore)
+ {
+ }
+ }
+ }
+ }
+
+ class Receiver implements Runnable
+ {
+ MessageConsumer cons;
+
+ int numMessages;
+
+ int numRecoveries;
+
+ boolean failed;
+
+ Session sess;
+
+ String name;
+
+ Receiver(final String name,
+ final Session sess,
+ final MessageConsumer cons,
+ final int numMessages,
+ final int numRecoveries)
+ {
+ this.sess = sess;
+ this.cons = cons;
+ this.numMessages = numMessages;
+ this.numRecoveries = numRecoveries;
+ this.name = name;
+ }
+
+ public void run()
+ {
+ try
+ {
+ Message lastMessage = null;
+ for (int j = 0; j < numRecoveries; j++)
+ {
+
+ for (int i = 0; i < numMessages; i++)
+ {
+ TextMessage tm = (TextMessage)cons.receive();
+ lastMessage = tm;
+
+ if (tm == null)
+ {
+ failed = true;
+ }
+
+ if (!tm.getText().equals("testing" + i))
+ {
+ failed = true;
+ }
+
+ if (tm.getIntProperty("JMSXDeliveryCount") != j + 1)
+ {
+ failed = true;
+ }
+ }
+ if (j != numRecoveries - 1)
+ {
+ sess.recover();
+ }
+
+ }
+ lastMessage.acknowledge();
+ }
+ catch (Exception e)
+ {
+ failed = true;
+ }
+ }
+ }
+
+ // Package protected ----------------------------------------------------------------------------
+
+ // Protected ------------------------------------------------------------------------------------
+
+ // Private --------------------------------------------------------------------------------------
+
+ // Inner classes --------------------------------------------------------------------------------
+
+ static class DummyXAResource implements XAResource
+ {
+ DummyXAResource()
+ {
+ }
+
+ public void commit(final Xid arg0, final boolean arg1) throws XAException
+ {
+ }
+
+ public void end(final Xid arg0, final int arg1) throws XAException
+ {
+ }
+
+ public void forget(final Xid arg0) throws XAException
+ {
+ }
+
+ public int getTransactionTimeout() throws XAException
+ {
+ return 0;
+ }
+
+ public boolean isSameRM(final XAResource arg0) throws XAException
+ {
+ return false;
+ }
+
+ public int prepare(final Xid arg0) throws XAException
+ {
+ return XAResource.XA_OK;
+ }
+
+ public Xid[] recover(final int arg0) throws XAException
+ {
+ return null;
+ }
+
+ public void rollback(final Xid arg0) throws XAException
+ {
+ }
+
+ public boolean setTransactionTimeout(final int arg0) throws XAException
+ {
+ return false;
+ }
+
+ public void start(final Xid arg0, final int arg1) throws XAException
+ {
+
+ }
+
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d36a1d74/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/SimpleOpenWireTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/SimpleOpenWireTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/SimpleOpenWireTest.java
index 87b962c..2adc74b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/SimpleOpenWireTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/SimpleOpenWireTest.java
@@ -27,7 +27,6 @@ import javax.jms.Session;
import javax.jms.TemporaryQueue;
import javax.jms.TemporaryTopic;
import javax.jms.TextMessage;
-import javax.jms.Topic;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.command.ActiveMQQueue;
@@ -40,7 +39,7 @@ import org.junit.rules.ExpectedException;
public class SimpleOpenWireTest extends BasicOpenWireTest
{
@Rule
- public ExpectedException thrown= ExpectedException.none();
+ public ExpectedException thrown = ExpectedException.none();
@Override
@Before
@@ -255,6 +254,7 @@ public class SimpleOpenWireTest extends BasicOpenWireTest
/**
* This is the example shipped with the distribution
+ *
* @throws Exception
*/
@Test
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d36a1d74/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/ActiveMQServerTestCase.java
----------------------------------------------------------------------
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/ActiveMQServerTestCase.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/ActiveMQServerTestCase.java
index 939380f..823d346 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/ActiveMQServerTestCase.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/ActiveMQServerTestCase.java
@@ -29,7 +29,6 @@ import javax.jms.Topic;
import javax.jms.TopicConnectionFactory;
import javax.jms.XAConnectionFactory;
import javax.naming.InitialContext;
-import javax.transaction.TransactionManager;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.HashMap;
@@ -37,7 +36,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple;
import org.apache.activemq.api.core.SimpleString;
import org.apache.activemq.api.jms.JMSFactoryType;
import org.apache.activemq.core.postoffice.Binding;
@@ -362,21 +360,6 @@ public abstract class ActiveMQServerTestCase
return (XAConnectionFactory) getInitialContext().lookup("/CF_XA_TRUE");
}
- public InitialContext getInitialContext(final int serverid) throws Exception
- {
- return new InitialContext(ServerManagement.getJNDIEnvironment(serverid));
- }
-
- protected TransactionManager getTransactionManager()
- {
- return new TransactionManagerImple();
- }
-
- public void configureSecurityForDestination(final String destName, final boolean isQueue, final HashSet<Role> roles) throws Exception
- {
- ActiveMQServerTestCase.servers.get(0).configureSecurityForDestination(destName, isQueue, roles);
- }
-
public void createQueue(final String name) throws Exception
{
ActiveMQServerTestCase.servers.get(0).createQueue(name, null);
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d36a1d74/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSXDeliveryCountTest.java
----------------------------------------------------------------------
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSXDeliveryCountTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSXDeliveryCountTest.java
deleted file mode 100644
index 0ba8a0c..0000000
--- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/JMSXDeliveryCountTest.java
+++ /dev/null
@@ -1,789 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF 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.tests.message;
-
-import javax.jms.Connection;
-import javax.jms.DeliveryMode;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-import javax.jms.XAConnection;
-import javax.jms.XASession;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-import javax.transaction.xa.XAException;
-import javax.transaction.xa.XAResource;
-import javax.transaction.xa.Xid;
-
-import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple;
-
-import org.apache.activemq.jms.tests.ActiveMQServerTestCase;
-import org.apache.activemq.jms.tests.util.ProxyAssertSupport;
-import org.junit.Test;
-
-/**
- *
- * A JMSXDeliveryCountTest
- */
-public class JMSXDeliveryCountTest extends ActiveMQServerTestCase
-{
- // Constants ------------------------------------------------------------------------------------
-
- // Static ---------------------------------------------------------------------------------------
-
- // Attributes -----------------------------------------------------------------------------------
-
- // Constructors ---------------------------------------------------------------------------------
-
- // Public ---------------------------------------------------------------------------------------
-
- @Test
- public void testSimpleJMSXDeliveryCount() throws Exception
- {
- Connection conn = null;
-
- try
- {
- conn = getConnectionFactory().createConnection();
- Session s = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
- MessageProducer p = s.createProducer(queue1);
- p.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
-
- p.send(s.createTextMessage("xoxo"));
-
- s.close();
-
- s = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE);
- MessageConsumer c = s.createConsumer(queue1);
-
- conn.start();
-
- TextMessage tm = (TextMessage)c.receive(1000);
-
- ProxyAssertSupport.assertEquals("xoxo", tm.getText());
- ProxyAssertSupport.assertTrue("JMSXDeliveryCount is supposed to exist as a property",
- tm.propertyExists("JMSXDeliveryCount"));
- ProxyAssertSupport.assertEquals(1, tm.getIntProperty("JMSXDeliveryCount"));
-
- s.recover();
-
- tm = (TextMessage)c.receive(1000);
-
- ProxyAssertSupport.assertEquals("xoxo", tm.getText());
- ProxyAssertSupport.assertTrue("JMSXDeliveryCount is supposed to exist as a property",
- tm.propertyExists("JMSXDeliveryCount"));
- ProxyAssertSupport.assertEquals(2, tm.getIntProperty("JMSXDeliveryCount"));
-
- tm.acknowledge();
-
- conn.close();
- }
- finally
- {
- if (conn != null)
- {
- conn.close();
- }
- }
- }
-
- @Test
- public void testJMSXDeliveryCountNotDeliveredMessagesNotUpdated() throws Exception
- {
- Connection conn = null;
-
- try
- {
- conn = getConnectionFactory().createConnection();
-
- Session s = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE);
-
- MessageProducer p = s.createProducer(queue1);
-
- p.send(s.createTextMessage("message1"));
- p.send(s.createTextMessage("message2"));
- p.send(s.createTextMessage("message3"));
- p.send(s.createTextMessage("message4"));
- p.send(s.createTextMessage("message5"));
-
- MessageConsumer c = s.createConsumer(queue1);
-
- conn.start();
-
- TextMessage tm = (TextMessage)c.receive(1000);
-
- ProxyAssertSupport.assertEquals("message1", tm.getText());
- ProxyAssertSupport.assertFalse(tm.getJMSRedelivered());
- ProxyAssertSupport.assertEquals(1, tm.getIntProperty("JMSXDeliveryCount"));
-
- s.close();
-
- s = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
- c = s.createConsumer(queue1);
-
- tm = (TextMessage)c.receive(1000);
-
- ProxyAssertSupport.assertEquals("message1", tm.getText());
- ProxyAssertSupport.assertTrue(tm.getJMSRedelivered());
- ProxyAssertSupport.assertEquals(2, tm.getIntProperty("JMSXDeliveryCount"));
-
- tm = (TextMessage)c.receive(1000);
-
- ProxyAssertSupport.assertEquals("message2", tm.getText());
- ProxyAssertSupport.assertFalse(tm.getJMSRedelivered());
- ProxyAssertSupport.assertEquals(1, tm.getIntProperty("JMSXDeliveryCount"));
-
- tm = (TextMessage)c.receive(1000);
-
- ProxyAssertSupport.assertEquals("message3", tm.getText());
- ProxyAssertSupport.assertFalse(tm.getJMSRedelivered());
- ProxyAssertSupport.assertEquals(1, tm.getIntProperty("JMSXDeliveryCount"));
-
- tm = (TextMessage)c.receive(1000);
-
- ProxyAssertSupport.assertEquals("message4", tm.getText());
- ProxyAssertSupport.assertFalse(tm.getJMSRedelivered());
- ProxyAssertSupport.assertEquals(1, tm.getIntProperty("JMSXDeliveryCount"));
-
- tm = (TextMessage)c.receive(1000);
-
- ProxyAssertSupport.assertEquals("message5", tm.getText());
- ProxyAssertSupport.assertFalse(tm.getJMSRedelivered());
- ProxyAssertSupport.assertEquals(1, tm.getIntProperty("JMSXDeliveryCount"));
-
- tm.acknowledge();
- }
- finally
- {
- if (conn != null)
- {
- conn.close();
- }
- }
- }
-
- @Test
- public void testRedeliveryOnQueue() throws Exception
- {
- Connection conn = null;
-
- try
- {
- conn = getConnectionFactory().createConnection();
-
- Session sess1 = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
- MessageProducer prod = sess1.createProducer(queue1);
-
- prod.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
-
- final int NUM_MESSAGES = 100;
-
- final int NUM_RECOVERIES = 8;
-
- for (int i = 0; i < NUM_MESSAGES; i++)
- {
- TextMessage tm = sess1.createTextMessage();
- tm.setText("testing" + i);
- prod.send(tm);
- }
-
- Session sess2 = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE);
-
- MessageConsumer cons = sess2.createConsumer(queue1);
-
- conn.start();
-
- TextMessage tm = null;
-
- for (int j = 0; j < NUM_RECOVERIES; j++)
- {
- for (int i = 0; i < NUM_MESSAGES; i++)
- {
- tm = (TextMessage)cons.receive(3000);
- ProxyAssertSupport.assertNotNull(tm);
- ProxyAssertSupport.assertEquals("testing" + i, tm.getText());
- ProxyAssertSupport.assertTrue("JMSXDeliveryCount is supposed to exist as a property",
- tm.propertyExists("JMSXDeliveryCount"));
- ProxyAssertSupport.assertEquals(j + 1, tm.getIntProperty("JMSXDeliveryCount"));
- }
- if (j != NUM_RECOVERIES - 1)
- {
- sess2.recover();
- }
- }
-
- tm.acknowledge();
- }
- finally
- {
- if (conn != null)
- {
- conn.close();
- }
- }
- }
-
- @Test
- public void testRedeliveryOnTopic() throws Exception
- {
- Connection conn = null;
-
- try
- {
- conn = getConnectionFactory().createConnection();
-
- conn.setClientID("myclientid");
-
- Session sess1 = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE);
- Session sess2 = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE);
- Session sess3 = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE);
-
- MessageConsumer cons1 = sess1.createConsumer(ActiveMQServerTestCase.topic1);
- MessageConsumer cons2 = sess2.createConsumer(ActiveMQServerTestCase.topic1);
- MessageConsumer cons3 = sess3.createDurableSubscriber(ActiveMQServerTestCase.topic1, "subxyz");
-
- conn.start();
-
- final int NUM_MESSAGES = 100;
- final int NUM_RECOVERIES = 9;
-
- Receiver r1 = new Receiver("R1", sess1, cons1, NUM_MESSAGES, NUM_RECOVERIES);
- Receiver r2 = new Receiver("R2", sess2, cons2, NUM_MESSAGES, NUM_RECOVERIES);
- Receiver r3 = new Receiver("R3", sess3, cons3, NUM_MESSAGES, NUM_RECOVERIES);
-
- Thread t1 = new Thread(r1);
- Thread t2 = new Thread(r2);
- Thread t3 = new Thread(r3);
-
- t1.start();
- t2.start();
- t3.start();
-
- Session sessSend = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
- MessageProducer prod = sessSend.createProducer(ActiveMQServerTestCase.topic1);
- prod.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
-
- for (int i = 0; i < NUM_MESSAGES; i++)
- {
- TextMessage tm1 = sessSend.createTextMessage("testing" + i);
- prod.send(tm1);
- }
-
- t1.join();
- t2.join();
- t3.join();
-
- ProxyAssertSupport.assertFalse(r1.failed);
- ProxyAssertSupport.assertFalse(r2.failed);
- ProxyAssertSupport.assertFalse(r3.failed);
-
- cons3.close();
-
- sess3.unsubscribe("subxyz");
- }
- finally
- {
- if (conn != null)
- {
- conn.close();
- }
- }
- }
-
- @Test
- public void testDeliveryCountUpdatedOnCloseTransacted() throws Exception
- {
- Connection conn = null;
-
- try
- {
- conn = getConnectionFactory().createConnection();
-
- Session producerSess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
- MessageProducer producer = producerSess.createProducer(queue1);
-
- Session consumerSess = conn.createSession(true, Session.SESSION_TRANSACTED);
- MessageConsumer consumer = consumerSess.createConsumer(queue1);
- conn.start();
-
- TextMessage tm = producerSess.createTextMessage("message1");
-
- producer.send(tm);
-
- TextMessage rm = (TextMessage)consumer.receive(1000);
-
- ProxyAssertSupport.assertNotNull(rm);
-
- ProxyAssertSupport.assertEquals(tm.getText(), rm.getText());
-
- ProxyAssertSupport.assertTrue("JMSXDeliveryCount is supposed to exist as a property",
- tm.propertyExists("JMSXDeliveryCount"));
- ProxyAssertSupport.assertEquals(1, rm.getIntProperty("JMSXDeliveryCount"));
-
- ProxyAssertSupport.assertFalse(rm.getJMSRedelivered());
-
- consumerSess.rollback();
-
- rm = (TextMessage)consumer.receive(1000);
-
- ProxyAssertSupport.assertNotNull(rm);
-
- ProxyAssertSupport.assertEquals(tm.getText(), rm.getText());
-
- ProxyAssertSupport.assertEquals(2, rm.getIntProperty("JMSXDeliveryCount"));
-
- ProxyAssertSupport.assertTrue(rm.getJMSRedelivered());
-
- consumerSess.rollback();
-
- rm = (TextMessage)consumer.receive(1000);
-
- ProxyAssertSupport.assertNotNull(rm);
-
- ProxyAssertSupport.assertEquals(tm.getText(), rm.getText());
-
- ProxyAssertSupport.assertEquals(3, rm.getIntProperty("JMSXDeliveryCount"));
-
- ProxyAssertSupport.assertTrue(rm.getJMSRedelivered());
-
- // Now close the session without committing
-
- consumerSess.close();
-
- consumerSess = conn.createSession(true, Session.SESSION_TRANSACTED);
-
- consumer = consumerSess.createConsumer(queue1);
-
- rm = (TextMessage)consumer.receive(1000);
-
- ProxyAssertSupport.assertNotNull(rm);
-
- ProxyAssertSupport.assertEquals(tm.getText(), rm.getText());
-
- ProxyAssertSupport.assertEquals(4, rm.getIntProperty("JMSXDeliveryCount"));
-
- ProxyAssertSupport.assertTrue(rm.getJMSRedelivered());
-
- consumerSess.commit();
- }
- finally
- {
- if (conn != null)
- {
- conn.close();
- }
- }
- }
-
- @Test
- public void testDeliveryCountUpdatedOnCloseClientAck() throws Exception
- {
- Connection conn = null;
-
- try
- {
- conn = getConnectionFactory().createConnection();
-
- Session producerSess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
- MessageProducer producer = producerSess.createProducer(queue1);
-
- Session consumerSess = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE);
- MessageConsumer consumer = consumerSess.createConsumer(queue1);
- conn.start();
-
- TextMessage tm = producerSess.createTextMessage("message1");
-
- producer.send(tm);
-
- TextMessage rm = (TextMessage)consumer.receive(1000);
-
- ProxyAssertSupport.assertNotNull(rm);
-
- ProxyAssertSupport.assertEquals(tm.getText(), rm.getText());
-
- ProxyAssertSupport.assertEquals(1, rm.getIntProperty("JMSXDeliveryCount"));
-
- ProxyAssertSupport.assertFalse(rm.getJMSRedelivered());
-
- consumerSess.recover();
-
- rm = (TextMessage)consumer.receive(1000);
-
- ProxyAssertSupport.assertNotNull(rm);
-
- ProxyAssertSupport.assertEquals(tm.getText(), rm.getText());
-
- ProxyAssertSupport.assertEquals(2, rm.getIntProperty("JMSXDeliveryCount"));
-
- ProxyAssertSupport.assertTrue(rm.getJMSRedelivered());
-
- consumerSess.recover();
-
- rm = (TextMessage)consumer.receive(1000);
-
- ProxyAssertSupport.assertNotNull(rm);
-
- ProxyAssertSupport.assertEquals(tm.getText(), rm.getText());
-
- ProxyAssertSupport.assertEquals(3, rm.getIntProperty("JMSXDeliveryCount"));
-
- ProxyAssertSupport.assertTrue(rm.getJMSRedelivered());
-
- // Now close the session without committing
-
- consumerSess.close();
-
- consumerSess = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE);
-
- consumer = consumerSess.createConsumer(queue1);
-
- rm = (TextMessage)consumer.receive(1000);
-
- ProxyAssertSupport.assertNotNull(rm);
-
- ProxyAssertSupport.assertEquals(tm.getText(), rm.getText());
-
- ProxyAssertSupport.assertEquals(4, rm.getIntProperty("JMSXDeliveryCount"));
-
- ProxyAssertSupport.assertTrue(rm.getJMSRedelivered());
-
- rm.acknowledge();
- }
- finally
- {
- if (conn != null)
- {
- conn.close();
- }
- }
- }
-
- @Test
- public void testDeliveryCountUpdatedOnCloseXA() throws Exception
- {
- XAConnection xaConn = null;
-
- Connection conn = null;
- TransactionManager mgr = new TransactionManagerImple();
-
- Transaction toResume = null;
-
- Transaction tx = null;
-
- try
- {
- toResume = mgr.suspend();
-
- conn = getConnectionFactory().createConnection();
-
- // Send a message
-
- Session producerSess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
- MessageProducer producer = producerSess.createProducer(queue1);
-
- TextMessage tm = producerSess.createTextMessage("message1");
-
- producer.send(tm);
-
- xaConn = getXAConnectionFactory().createXAConnection();
-
- XASession consumerSess = xaConn.createXASession();
- MessageConsumer consumer = consumerSess.createConsumer(queue1);
- xaConn.start();
-
- DummyXAResource res = new DummyXAResource();
-
- mgr.begin();
-
- tx = mgr.getTransaction();
-
- tx.enlistResource(res);
-
- tx.enlistResource(consumerSess.getXAResource());
-
- TextMessage rm = (TextMessage)consumer.receive(1000);
-
- ProxyAssertSupport.assertNotNull(rm);
-
- ProxyAssertSupport.assertEquals(tm.getText(), rm.getText());
-
- ProxyAssertSupport.assertEquals(1, rm.getIntProperty("JMSXDeliveryCount"));
-
- ProxyAssertSupport.assertFalse(rm.getJMSRedelivered());
-
- tx.delistResource(res, XAResource.TMSUCCESS);
-
- tx.delistResource(consumerSess.getXAResource(), XAResource.TMSUCCESS);
-
- mgr.rollback();
-
- mgr.begin();
-
- tx = mgr.getTransaction();
-
- tx.enlistResource(res);
-
- tx.enlistResource(consumerSess.getXAResource());
-
- rm = (TextMessage)consumer.receive(1000);
-
- ProxyAssertSupport.assertNotNull(rm);
-
- ProxyAssertSupport.assertEquals(tm.getText(), rm.getText());
-
- ProxyAssertSupport.assertEquals(2, rm.getIntProperty("JMSXDeliveryCount"));
-
- ProxyAssertSupport.assertTrue(rm.getJMSRedelivered());
-
- tx.delistResource(res, XAResource.TMSUCCESS);
-
- tx.delistResource(consumerSess.getXAResource(), XAResource.TMSUCCESS);
-
- mgr.rollback();
-
- mgr.begin();
-
- tx = mgr.getTransaction();
-
- tx.enlistResource(res);
-
- tx.enlistResource(consumerSess.getXAResource());
-
- rm = (TextMessage)consumer.receive(1000);
-
- ProxyAssertSupport.assertNotNull(rm);
-
- ProxyAssertSupport.assertEquals(tm.getText(), rm.getText());
-
- ProxyAssertSupport.assertEquals(3, rm.getIntProperty("JMSXDeliveryCount"));
-
- ProxyAssertSupport.assertTrue(rm.getJMSRedelivered());
-
- tx.delistResource(res, XAResource.TMSUCCESS);
-
- tx.delistResource(consumerSess.getXAResource(), XAResource.TMSUCCESS);
-
- mgr.rollback();
-
- // Must close consumer first
-
- consumer.close();
-
- consumerSess.close();
-
- consumerSess = xaConn.createXASession();
-
- consumer = consumerSess.createConsumer(queue1);
-
- mgr.begin();
-
- tx = mgr.getTransaction();
-
- tx.enlistResource(res);
-
- tx.enlistResource(consumerSess.getXAResource());
-
- rm = (TextMessage)consumer.receive(1000);
-
- ProxyAssertSupport.assertNotNull(rm);
-
- ProxyAssertSupport.assertEquals(tm.getText(), rm.getText());
-
- ProxyAssertSupport.assertEquals(4, rm.getIntProperty("JMSXDeliveryCount"));
-
- ProxyAssertSupport.assertTrue(rm.getJMSRedelivered());
-
- tx.delistResource(res, XAResource.TMSUCCESS);
-
- tx.delistResource(consumerSess.getXAResource(), XAResource.TMSUCCESS);
- }
- finally
- {
- if (conn != null)
- {
- conn.close();
- }
-
- if (tx != null)
- {
- try
- {
- mgr.commit();
- }
- catch (Exception ignore)
- {
- }
- }
- if (xaConn != null)
- {
- xaConn.close();
- }
-
- if (toResume != null)
- {
- try
- {
- mgr.resume(toResume);
- }
- catch (Exception ignore)
- {
- }
- }
- }
- }
-
- class Receiver implements Runnable
- {
- MessageConsumer cons;
-
- int numMessages;
-
- int numRecoveries;
-
- boolean failed;
-
- Session sess;
-
- String name;
-
- Receiver(final String name,
- final Session sess,
- final MessageConsumer cons,
- final int numMessages,
- final int numRecoveries)
- {
- this.sess = sess;
- this.cons = cons;
- this.numMessages = numMessages;
- this.numRecoveries = numRecoveries;
- this.name = name;
- }
-
- public void run()
- {
- try
- {
- Message lastMessage = null;
- for (int j = 0; j < numRecoveries; j++)
- {
-
- for (int i = 0; i < numMessages; i++)
- {
- TextMessage tm = (TextMessage)cons.receive();
- lastMessage = tm;
-
- if (tm == null)
- {
- failed = true;
- }
-
- if (!tm.getText().equals("testing" + i))
- {
- log.error("Out of order!!");
- failed = true;
- }
-
- if (tm.getIntProperty("JMSXDeliveryCount") != j + 1)
- {
- log.error("DeliveryImpl count not expected value:" + (j + 1) +
- " actual:" +
- tm.getIntProperty("JMSXDeliveryCount"));
- failed = true;
- }
- }
- if (j != numRecoveries - 1)
- {
- sess.recover();
- }
-
- }
- lastMessage.acknowledge();
- }
- catch (Exception e)
- {
- failed = true;
- }
- }
- }
-
- // Package protected ----------------------------------------------------------------------------
-
- // Protected ------------------------------------------------------------------------------------
-
- // Private --------------------------------------------------------------------------------------
-
- // Inner classes --------------------------------------------------------------------------------
-
- static class DummyXAResource implements XAResource
- {
- DummyXAResource()
- {
- }
-
- public void commit(final Xid arg0, final boolean arg1) throws XAException
- {
- }
-
- public void end(final Xid arg0, final int arg1) throws XAException
- {
- }
-
- public void forget(final Xid arg0) throws XAException
- {
- }
-
- public int getTransactionTimeout() throws XAException
- {
- return 0;
- }
-
- public boolean isSameRM(final XAResource arg0) throws XAException
- {
- return false;
- }
-
- public int prepare(final Xid arg0) throws XAException
- {
- return XAResource.XA_OK;
- }
-
- public Xid[] recover(final int arg0) throws XAException
- {
- return null;
- }
-
- public void rollback(final Xid arg0) throws XAException
- {
- }
-
- public boolean setTransactionTimeout(final int arg0) throws XAException
- {
- return false;
- }
-
- public void start(final Xid arg0, final int arg1) throws XAException
- {
-
- }
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d36a1d74/tests/soak-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/soak-tests/pom.xml b/tests/soak-tests/pom.xml
index 91be57a..67e41db 100644
--- a/tests/soak-tests/pom.xml
+++ b/tests/soak-tests/pom.xml
@@ -61,13 +61,6 @@
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.activemq.tests</groupId>
- <artifactId>jms-tests</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-jms-client</artifactId>
<version>${project.version}</version>
[5/5] activemq-6 git commit: merge #173 - Fix CatX dep and OpenWire
issue
Posted by an...@apache.org.
merge #173 - Fix CatX dep and OpenWire issue
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/87520f76
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/87520f76
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/87520f76
Branch: refs/heads/master
Commit: 87520f760e03460380904f9eadfd60c8aef738aa
Parents: 670f584 e065d25
Author: Andy Taylor <an...@gmail.com>
Authored: Thu Mar 12 11:06:33 2015 +0000
Committer: Andy Taylor <an...@gmail.com>
Committed: Thu Mar 12 11:06:33 2015 +0000
----------------------------------------------------------------------
activemq-bootstrap/pom.xml | 2 +
activemq-commons/pom.xml | 2 +
activemq-core-client/pom.xml | 2 +
.../client/ActiveMQClientMessageBundle.java | 105 +--
activemq-jms-client/pom.xml | 2 +
.../jms/client/ActiveMQJMSClientBundle.java | 23 +-
activemq-jms-server/pom.xml | 2 +
.../jms/server/ActiveMQJMSServerBundle.java | 10 +-
activemq-journal/pom.xml | 2 +
.../activemq/journal/ActiveMQJournalBundle.java | 7 +-
.../activemq-amqp-protocol/pom.xml | 2 +
.../activemq-openwire-protocol/pom.xml | 2 +
.../protocol/openwire/OpenWireConnection.java | 25 +-
.../openwire/OpenWireProtocolManager.java | 2 +-
.../core/protocol/openwire/OpenWireUtil.java | 20 +
.../core/protocol/openwire/amq/AMQProducer.java | 6 +-
.../core/protocol/openwire/amq/AMQSession.java | 2 +-
activemq-protocols/activemq-proton-plug/pom.xml | 2 +
.../ActiveMQAMQPProtocolMessageBundle.java | 16 +-
.../activemq-stomp-protocol/pom.xml | 2 +
.../ActiveMQStompProtocolMessageBundle.java | 40 +-
activemq-ra/pom.xml | 2 +
.../apache/activemq/ra/ActiveMQRABundle.java | 19 +-
activemq-rest/pom.xml | 3 +
activemq-server/pom.xml | 2 +
.../core/server/ActiveMQMessageBundle.java | 80 +-
activemq-service-extensions/pom.xml | 2 +
activemq-tools/pom.xml | 2 +
.../activemq-aerogear-integration/pom.xml | 2 +
.../aerogear/ActiveMQAeroGearBundle.java | 6 +-
integration/activemq-spring-integration/pom.xml | 2 +
integration/activemq-vertx-integration/pom.xml | 10 +-
pom.xml | 14 +-
tests/extra-tests/pom.xml | 2 +
.../extras/jms/xa/JMSXDeliveryCountTest.java | 814 +++++++++++++++++++
tests/integration-tests/pom.xml | 2 +
.../openwire/SimpleOpenWireTest.java | 33 +
tests/jms-tests/pom.xml | 8 +-
.../jms/tests/ActiveMQServerTestCase.java | 17 -
.../tests/message/JMSXDeliveryCountTest.java | 789 ------------------
tests/soak-tests/pom.xml | 7 -
tests/unit-tests/pom.xml | 10 +-
42 files changed, 1086 insertions(+), 1016 deletions(-)
----------------------------------------------------------------------
[3/5] activemq-6 git commit: Remove JbossJacorb from JMS test pom
Posted by an...@apache.org.
Remove JbossJacorb from JMS test pom
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/7c3e5d1c
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/7c3e5d1c
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/7c3e5d1c
Branch: refs/heads/master
Commit: 7c3e5d1c0e729e91ecf6fb21105a5f6231255947
Parents: 670f584
Author: Martyn Taylor <mt...@redhat.com>
Authored: Wed Mar 11 13:30:06 2015 +0000
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Thu Mar 12 10:49:17 2015 +0000
----------------------------------------------------------------------
tests/jms-tests/pom.xml | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/7c3e5d1c/tests/jms-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/jms-tests/pom.xml b/tests/jms-tests/pom.xml
index 60e51a0..3771e8c 100644
--- a/tests/jms-tests/pom.xml
+++ b/tests/jms-tests/pom.xml
@@ -114,11 +114,6 @@
<groupId>org.jboss.logmanager</groupId>
<artifactId>jboss-logmanager</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss.jbossts.jts</groupId>
- <artifactId>jbossjts-jacorb</artifactId>
- <version>4.17.13.Final</version>
- </dependency>
</dependencies>
<build>