Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2504D17EAB for ; Thu, 12 Mar 2015 11:11:53 +0000 (UTC) Received: (qmail 93400 invoked by uid 500); 12 Mar 2015 11:11:53 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 93350 invoked by uid 500); 12 Mar 2015 11:11:53 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 93341 invoked by uid 99); 12 Mar 2015 11:11:53 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Mar 2015 11:11:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D98F7E0A4E; Thu, 12 Mar 2015 11:11:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: andytaylor@apache.org To: commits@activemq.apache.org Date: Thu, 12 Mar 2015 11:11:52 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [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 Authored: Wed Mar 11 18:49:10 2015 -0400 Committer: Martyn Taylor 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 @@ org.jboss.logging jboss-logging-processor + provided + true org.jboss.logging 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 @@ org.jboss.logging jboss-logging-processor + provided + true org.jboss.logmanager 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 @@ org.jboss.logging jboss-logging-processor + provided + true org.jgroups 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 @@ org.jboss.logging jboss-logging-processor + provided + true org.apache.activemq 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 @@ org.jboss.logging jboss-logging-processor + provided + true org.apache.activemq 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 @@ org.jboss.logging jboss-logging-processor + provided + true + + org.jboss.logging + jboss-logging-annotations + 2.0.0.Alpha1 + provided + true + + log4j @@ -594,7 +602,7 @@ org.codehaus.mojo - javacc-maven-plugin + javacc-maven-plugin 2.6 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 @@ org.jboss.logging jboss-logging-processor + provided + true org.jboss.logging 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 @@ org.jboss.logging jboss-logging-processor + provided + true org.jboss.logging 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 @@ org.jboss.logging jboss-logging-processor + provided + true + org.jboss.logging 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 @@ junit junit - - org.jboss.logging - jboss-logging-processor - + + org.jboss.logging + jboss-logging-processor + provided + true +