Author: timfox Date: 2010-01-05 12:41:42 -0500 (Tue, 05 Jan 2010) New Revision: 8720 Added: trunk/src/main/org/hornetq/api/jms/HornetQMessageConstants.java Modified: trunk/examples/jms/message-group/src/org/hornetq/jms/example/MessageGroupExample.java trunk/examples/jms/scheduled-message/src/org/hornetq/jms/example/ScheduledMessageExample.java trunk/examples/jms/transaction-failover/src/org/hornetq/jms/example/TransactionFailoverExample.java trunk/src/main/org/hornetq/api/core/client/ClientSessionFactory.java trunk/src/main/org/hornetq/api/core/message/Message.java trunk/src/main/org/hornetq/api/jms/bridge/JMSBridgeImpl.java trunk/src/main/org/hornetq/core/client/impl/ClientProducerImpl.java trunk/src/main/org/hornetq/core/message/impl/MessageImpl.java trunk/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java trunk/src/main/org/hornetq/core/postoffice/impl/BindingsImpl.java trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java trunk/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java trunk/src/main/org/hornetq/core/server/impl/LastValueQueue.java trunk/src/main/org/hornetq/core/server/impl/QueueImpl.java trunk/src/main/org/hornetq/core/server/impl/ServerMessageImpl.java trunk/src/main/org/hornetq/jms/client/HornetQMessage.java trunk/tests/src/org/hornetq/tests/integration/DuplicateDetectionTest.java trunk/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java trunk/tests/src/org/hornetq/tests/integration/client/ExpiryAddressTest.java trunk/tests/src/org/hornetq/tests/integration/client/MessageExpirationTest.java trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingTest.java trunk/tests/src/org/hornetq/tests/integration/client/PagingTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusteredGroupingTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverTestBase.java trunk/tests/src/org/hornetq/tests/integration/jms/bridge/JMSBridgeTest.java trunk/tests/src/org/hornetq/tests/integration/jms/client/ReSendLargeMessageTest.java trunk/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.java trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java trunk/tests/src/org/hornetq/tests/integration/scheduling/ScheduledMessageTest.java trunk/tests/src/org/hornetq/tests/integration/server/LVQRecoveryTest.java trunk/tests/src/org/hornetq/tests/integration/server/LVQTest.java Log: move constants out of MessageImpl and HornetQMessage Modified: trunk/examples/jms/message-group/src/org/hornetq/jms/example/MessageGroupExample.java =================================================================== --- trunk/examples/jms/message-group/src/org/hornetq/jms/example/MessageGroupExample.java 2010-01-05 17:11:47 UTC (rev 8719) +++ trunk/examples/jms/message-group/src/org/hornetq/jms/example/MessageGroupExample.java 2010-01-05 17:41:42 UTC (rev 8720) @@ -83,7 +83,7 @@ for (int i = 0; i < msgCount; i++) { groupMessages[i] = session.createTextMessage("Group-0 message " + i); - groupMessages[i].setStringProperty(HornetQMessage.JMSXGROUPID, "Group-0"); + groupMessages[i].setStringProperty("JMSXGroupID", "Group-0"); producer.send(groupMessages[i]); System.out.println("Sent message: " + groupMessages[i].getText()); } Modified: trunk/examples/jms/scheduled-message/src/org/hornetq/jms/example/ScheduledMessageExample.java =================================================================== --- trunk/examples/jms/scheduled-message/src/org/hornetq/jms/example/ScheduledMessageExample.java 2010-01-05 17:11:47 UTC (rev 8719) +++ trunk/examples/jms/scheduled-message/src/org/hornetq/jms/example/ScheduledMessageExample.java 2010-01-05 17:41:42 UTC (rev 8720) @@ -24,8 +24,8 @@ import javax.jms.TextMessage; import javax.naming.InitialContext; +import org.hornetq.api.core.message.Message; import org.hornetq.common.example.HornetQExample; -import org.hornetq.core.message.impl.MessageImpl; /** * A simple JMS scheduled delivery example that delivers a message in 5 seconds. @@ -70,7 +70,7 @@ // Step 8. Set the delivery time to be 5 sec later. long time = System.currentTimeMillis(); time += 5000; - message.setLongProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME.toString(), time); + message.setLongProperty(Message.HDR_SCHEDULED_DELIVERY_TIME.toString(), time); // Step 9. Send the Message producer.send(message); Modified: trunk/examples/jms/transaction-failover/src/org/hornetq/jms/example/TransactionFailoverExample.java =================================================================== --- trunk/examples/jms/transaction-failover/src/org/hornetq/jms/example/TransactionFailoverExample.java 2010-01-05 17:11:47 UTC (rev 8719) +++ trunk/examples/jms/transaction-failover/src/org/hornetq/jms/example/TransactionFailoverExample.java 2010-01-05 17:41:42 UTC (rev 8720) @@ -22,8 +22,8 @@ import javax.jms.TransactionRolledBackException; import javax.naming.InitialContext; +import org.hornetq.api.core.message.Message; import org.hornetq.common.example.HornetQExample; -import org.hornetq.core.message.impl.MessageImpl; /** * A simple example that demonstrates failover of the JMS connection from one node to another @@ -142,7 +142,7 @@ // We set the duplicate detection header - so the server will ignore the same message // if sent again after failover - message.setStringProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID.toString(), "uniqueid" + i); + message.setStringProperty(Message.HDR_DUPLICATE_DETECTION_ID.toString(), "uniqueid" + i); producer.send(message); @@ -164,7 +164,7 @@ // We set the duplicate detection header - so the server will ignore the same message // if sent again after failover - message.setStringProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID.toString(), "uniqueid" + i); + message.setStringProperty(Message.HDR_DUPLICATE_DETECTION_ID.toString(), "uniqueid" + i); producer.send(message); Modified: trunk/src/main/org/hornetq/api/core/client/ClientSessionFactory.java =================================================================== --- trunk/src/main/org/hornetq/api/core/client/ClientSessionFactory.java 2010-01-05 17:11:47 UTC (rev 8719) +++ trunk/src/main/org/hornetq/api/core/client/ClientSessionFactory.java 2010-01-05 17:41:42 UTC (rev 8720) @@ -410,7 +410,7 @@ * assign a group ID to the messages they sent. * * if <code>true</code>, a random unique group ID is created and set on each message for the property - * {@link org.hornetq.core.message.impl.MessageImpl#HDR_GROUP_ID}. + * {@link org.hornetq.api.core.message.Message#HDR_GROUP_ID}. * Default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_AUTO_GROUP}. * * @return whether producers will automatically assign a group ID to their messages @@ -426,7 +426,7 @@ void setAutoGroup(boolean autoGroup); /** - * Returns the group ID that will be eventually set on each message for the property {@link org.hornetq.core.message.impl.MessageImpl#HDR_GROUP_ID}. + * Returns the group ID that will be eventually set on each message for the property {@link org.hornetq.api.core.message.Message#HDR_GROUP_ID}. * * Default value is is <code>null</code> and no group ID will be set on the messages. * Modified: trunk/src/main/org/hornetq/api/core/message/Message.java =================================================================== --- trunk/src/main/org/hornetq/api/core/message/Message.java 2010-01-05 17:11:47 UTC (rev 8719) +++ trunk/src/main/org/hornetq/api/core/message/Message.java 2010-01-05 17:41:42 UTC (rev 8720) @@ -58,6 +58,20 @@ */ public interface Message { + public static final SimpleString HDR_ACTUAL_EXPIRY_TIME = new SimpleString("_HQ_ACTUAL_EXPIRY"); + + public static final SimpleString HDR_ORIGINAL_ADDRESS = new SimpleString("_HQ_ORIG_ADDRESS"); + + public static final SimpleString HDR_ORIG_MESSAGE_ID = new SimpleString("_HQ_ORIG_MESSAGE_ID"); + + public static final SimpleString HDR_GROUP_ID = new SimpleString("_HQ_GROUP_ID"); + + public static final SimpleString HDR_SCHEDULED_DELIVERY_TIME = new SimpleString("_HQ_SCHED_DELIVERY"); + + public static final SimpleString HDR_DUPLICATE_DETECTION_ID = new SimpleString("_HQ_DUPL_ID"); + + public static final SimpleString HDR_LAST_VALUE_NAME = new SimpleString("_HQ_LVQ_NAME"); + /** * Returns the messageID. * <br> Added: trunk/src/main/org/hornetq/api/jms/HornetQMessageConstants.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/HornetQMessageConstants.java (rev 0) +++ trunk/src/main/org/hornetq/api/jms/HornetQMessageConstants.java 2010-01-05 17:41:42 UTC (rev 8720) @@ -0,0 +1,32 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.api.jms; + +/** + * Constants for HornetQ for property keys used for HornetQ specific extensions to JMS + * + * @author Tim Fox + * + * + */ +public class HornetQMessageConstants +{ + public static final String JMS_HORNETQ_INPUT_STREAM = "JMS_HQ_InputStream"; + + public static final String JMS_HORNETQ_OUTPUT_STREAM = "JMS_HQ_OutputStream"; + + public static final String JMS_HORNETQ_SAVE_STREAM = "JMS_HQ_SaveStream"; + + public static final String JBOSS_MESSAGING_BRIDGE_MESSAGE_ID_LIST = "HQ_BRIDGE_MSG_ID_LIST"; +} Modified: trunk/src/main/org/hornetq/api/jms/bridge/JMSBridgeImpl.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/bridge/JMSBridgeImpl.java 2010-01-05 17:11:47 UTC (rev 8719) +++ trunk/src/main/org/hornetq/api/jms/bridge/JMSBridgeImpl.java 2010-01-05 17:41:42 UTC (rev 8720) @@ -41,10 +41,10 @@ import javax.transaction.xa.XAResource; import org.hornetq.api.core.client.ClientSession; +import org.hornetq.api.jms.HornetQMessageConstants; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQComponent; import org.hornetq.jms.bridge.impl.JMSBridgeControlImpl; -import org.hornetq.jms.client.HornetQMessage; import org.hornetq.jms.client.HornetQSession; /** @@ -1635,7 +1635,7 @@ String val = null; - val = msg.getStringProperty(HornetQMessage.JBOSS_MESSAGING_BRIDGE_MESSAGE_ID_LIST); + val = msg.getStringProperty(HornetQMessageConstants.JBOSS_MESSAGING_BRIDGE_MESSAGE_ID_LIST); if (val == null) { @@ -1650,7 +1650,7 @@ val = sb.toString(); } - msg.setStringProperty(HornetQMessage.JBOSS_MESSAGING_BRIDGE_MESSAGE_ID_LIST, val); + msg.setStringProperty(HornetQMessageConstants.JBOSS_MESSAGING_BRIDGE_MESSAGE_ID_LIST, val); } /* Modified: trunk/src/main/org/hornetq/core/client/impl/ClientProducerImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/ClientProducerImpl.java 2010-01-05 17:11:47 UTC (rev 8719) +++ trunk/src/main/org/hornetq/core/client/impl/ClientProducerImpl.java 2010-01-05 17:41:42 UTC (rev 8720) @@ -23,7 +23,6 @@ import org.hornetq.api.core.message.Message; import org.hornetq.core.logging.Logger; import org.hornetq.core.message.BodyEncoder; -import org.hornetq.core.message.impl.MessageImpl; import org.hornetq.core.message.impl.MessageInternal; import org.hornetq.core.remoting.Channel; import org.hornetq.core.remoting.impl.wireformat.SessionSendContinuationMessage; @@ -239,7 +238,7 @@ if (groupID != null) { - msgI.putStringProperty(MessageImpl.HDR_GROUP_ID, groupID); + msgI.putStringProperty(Message.HDR_GROUP_ID, groupID); } boolean sendBlocking = msgI.isDurable() ? blockOnDurableSend : blockOnNonDurableSend; Modified: trunk/src/main/org/hornetq/core/message/impl/MessageImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/message/impl/MessageImpl.java 2010-01-05 17:11:47 UTC (rev 8719) +++ trunk/src/main/org/hornetq/core/message/impl/MessageImpl.java 2010-01-05 17:41:42 UTC (rev 8720) @@ -51,26 +51,10 @@ private static final Logger log = Logger.getLogger(MessageImpl.class); - public static final SimpleString HDR_ACTUAL_EXPIRY_TIME = new SimpleString("_HQ_ACTUAL_EXPIRY"); - - public static final SimpleString HDR_ORIGINAL_ADDRESS = new SimpleString("_HQ_ORIG_ADDRESS"); - - public static final SimpleString HDR_ORIG_MESSAGE_ID = new SimpleString("_HQ_ORIG_MESSAGE_ID"); - - public static final SimpleString HDR_GROUP_ID = new SimpleString("_HQ_GROUP_ID"); - - public static final SimpleString HDR_SCHEDULED_DELIVERY_TIME = new SimpleString("_HQ_SCHED_DELIVERY"); - - public static final SimpleString HDR_DUPLICATE_DETECTION_ID = new SimpleString("_HQ_DUPL_ID"); - public static final SimpleString HDR_ROUTE_TO_IDS = new SimpleString("_HQ_ROUTE_TO"); public static final SimpleString HDR_FROM_CLUSTER = new SimpleString("_HQ_FROM_CLUSTER"); - public static final SimpleString HDR_LAST_VALUE_NAME = new SimpleString("_HQ_LVQ_NAME"); - - // Attributes ---------------------------------------------------- - protected long messageID; protected SimpleString address; Modified: trunk/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java 2010-01-05 17:11:47 UTC (rev 8719) +++ trunk/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java 2010-01-05 17:41:42 UTC (rev 8720) @@ -28,10 +28,10 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.message.Message; import org.hornetq.core.journal.SequentialFile; import org.hornetq.core.journal.SequentialFileFactory; import org.hornetq.core.logging.Logger; -import org.hornetq.core.message.impl.MessageImpl; import org.hornetq.core.paging.Page; import org.hornetq.core.paging.PageTransactionInfo; import org.hornetq.core.paging.PagedMessage; @@ -853,7 +853,7 @@ buff.putLong(message.getMessageID()); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, bytes); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, bytes); } PagedMessage pagedMessage; Modified: trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java =================================================================== --- trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2010-01-05 17:11:47 UTC (rev 8719) +++ trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2010-01-05 17:41:42 UTC (rev 8720) @@ -30,6 +30,7 @@ import org.hornetq.api.core.buffers.HornetQBuffers; import org.hornetq.api.core.config.Configuration; import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.message.Message; import org.hornetq.core.filter.Filter; import org.hornetq.core.journal.EncodingSupport; import org.hornetq.core.journal.IOAsyncTask; @@ -44,7 +45,6 @@ import org.hornetq.core.journal.impl.JournalImpl; import org.hornetq.core.journal.impl.NIOSequentialFileFactory; import org.hornetq.core.logging.Logger; -import org.hornetq.core.message.impl.MessageImpl; import org.hornetq.core.paging.PageTransactionInfo; import org.hornetq.core.paging.PagedMessage; import org.hornetq.core.paging.PagingManager; @@ -963,7 +963,7 @@ if (scheduledDeliveryTime != 0) { - record.message.putLongProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME, scheduledDeliveryTime); + record.message.putLongProperty(Message.HDR_SCHEDULED_DELIVERY_TIME, scheduledDeliveryTime); } MessageReference ref = postOffice.reroute(record.message, queue, null); @@ -972,7 +972,7 @@ if (scheduledDeliveryTime != 0) { - record.message.removeProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME); + record.message.removeProperty(Message.HDR_SCHEDULED_DELIVERY_TIME); } } } @@ -1255,9 +1255,9 @@ messageEncoding.decode(buff); - if (largeMessage.containsProperty(MessageImpl.HDR_ORIG_MESSAGE_ID)) + if (largeMessage.containsProperty(Message.HDR_ORIG_MESSAGE_ID)) { - long originalMessageID = largeMessage.getLongProperty(MessageImpl.HDR_ORIG_MESSAGE_ID); + long originalMessageID = largeMessage.getLongProperty(Message.HDR_ORIG_MESSAGE_ID); LargeServerMessage originalMessage = (LargeServerMessage)messages.get(originalMessageID); Modified: trunk/src/main/org/hornetq/core/postoffice/impl/BindingsImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/postoffice/impl/BindingsImpl.java 2010-01-05 17:11:47 UTC (rev 8719) +++ trunk/src/main/org/hornetq/core/postoffice/impl/BindingsImpl.java 2010-01-05 17:41:42 UTC (rev 8720) @@ -23,6 +23,7 @@ import org.hornetq.api.SimpleString; import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.message.Message; import org.hornetq.core.filter.Filter; import org.hornetq.core.logging.Logger; import org.hornetq.core.message.impl.MessageImpl; @@ -241,7 +242,7 @@ { routeFromCluster(message, context); } - else if (groupingHandler != null && message.containsProperty(MessageImpl.HDR_GROUP_ID)) + else if (groupingHandler != null && message.containsProperty(Message.HDR_GROUP_ID)) { routeUsingStrictOrdering(message, context, groupingHandler); } @@ -376,7 +377,7 @@ final RoutingContext context, final GroupingHandler groupingGroupingHandler) throws Exception { - SimpleString groupId = message.getSimpleStringProperty(MessageImpl.HDR_GROUP_ID); + SimpleString groupId = message.getSimpleStringProperty(Message.HDR_GROUP_ID); for (Map.Entry<SimpleString, List<Binding>> entry : routingNameBindingMap.entrySet()) { Modified: trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java 2010-01-05 17:11:47 UTC (rev 8719) +++ trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java 2010-01-05 17:41:42 UTC (rev 8720) @@ -29,10 +29,10 @@ import org.hornetq.api.core.exception.HornetQException; import org.hornetq.api.core.management.NotificationType; import org.hornetq.api.core.management.client.ManagementHelper; +import org.hornetq.api.core.message.Message; import org.hornetq.core.filter.Filter; import org.hornetq.core.journal.IOAsyncTask; import org.hornetq.core.logging.Logger; -import org.hornetq.core.message.impl.MessageImpl; import org.hornetq.core.paging.PageTransactionInfo; import org.hornetq.core.paging.PagingManager; import org.hornetq.core.paging.PagingStore; @@ -556,7 +556,7 @@ setPagingStore(message); - Object duplicateID = message.getObjectProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID); + Object duplicateID = message.getObjectProperty(Message.HDR_DUPLICATE_DETECTION_ID); DuplicateIDCache cache = null; @@ -682,9 +682,9 @@ MessageReference reference = message.createReference(queue); - if (message.containsProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME)) + if (message.containsProperty(Message.HDR_SCHEDULED_DELIVERY_TIME)) { - Long scheduledDeliveryTime = message.getLongProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME); + Long scheduledDeliveryTime = message.getLongProperty(Message.HDR_SCHEDULED_DELIVERY_TIME); reference.setScheduledDeliveryTime(scheduledDeliveryTime); } @@ -867,9 +867,9 @@ refs.add(reference); - if (message.containsProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME)) + if (message.containsProperty(Message.HDR_SCHEDULED_DELIVERY_TIME)) { - Long scheduledDeliveryTime = message.getLongProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME); + Long scheduledDeliveryTime = message.getLongProperty(Message.HDR_SCHEDULED_DELIVERY_TIME); reference.setScheduledDeliveryTime(scheduledDeliveryTime); } @@ -887,9 +887,9 @@ refs.add(reference); - if (message.containsProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME)) + if (message.containsProperty(Message.HDR_SCHEDULED_DELIVERY_TIME)) { - Long scheduledDeliveryTime = message.getLongProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME); + Long scheduledDeliveryTime = message.getLongProperty(Message.HDR_SCHEDULED_DELIVERY_TIME); reference.setScheduledDeliveryTime(scheduledDeliveryTime); } @@ -921,7 +921,7 @@ storageManager.storeReference(queue.getID(), message.getMessageID(), !iter.hasNext()); } - if (message.containsProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME)) + if (message.containsProperty(Message.HDR_SCHEDULED_DELIVERY_TIME)) { if (tx != null) { Modified: trunk/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2010-01-05 17:11:47 UTC (rev 8719) +++ trunk/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2010-01-05 17:41:42 UTC (rev 8720) @@ -437,7 +437,7 @@ message.putBooleanProperty(MessageImpl.HDR_FROM_CLUSTER, Boolean.TRUE); } - if (useDuplicateDetection && !message.containsProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID)) + if (useDuplicateDetection && !message.containsProperty(Message.HDR_DUPLICATE_DETECTION_ID)) { // If we are using duplicate detection and there's not already a duplicate detection header, then // we add a header composed of the persistent node id and the message id, which makes it globally unique @@ -455,7 +455,7 @@ bb.putLong(message.getMessageID()); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, bytes); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, bytes); } if (transformer != null) Modified: trunk/src/main/org/hornetq/core/server/impl/LastValueQueue.java =================================================================== --- trunk/src/main/org/hornetq/core/server/impl/LastValueQueue.java 2010-01-05 17:11:47 UTC (rev 8719) +++ trunk/src/main/org/hornetq/core/server/impl/LastValueQueue.java 2010-01-05 17:41:42 UTC (rev 8720) @@ -17,9 +17,9 @@ import java.util.concurrent.ScheduledExecutorService; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.message.Message; import org.hornetq.core.filter.Filter; import org.hornetq.core.logging.Logger; -import org.hornetq.core.message.impl.MessageImpl; import org.hornetq.core.persistence.StorageManager; import org.hornetq.core.postoffice.PostOffice; import org.hornetq.core.server.MessageReference; @@ -70,7 +70,7 @@ @Override public synchronized void add(final MessageReference ref, final boolean first) { - SimpleString prop = ref.getMessage().getSimpleStringProperty(MessageImpl.HDR_LAST_VALUE_NAME); + SimpleString prop = ref.getMessage().getSimpleStringProperty(Message.HDR_LAST_VALUE_NAME); if (prop != null) { Modified: trunk/src/main/org/hornetq/core/server/impl/QueueImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/impl/QueueImpl.java 2010-01-05 17:11:47 UTC (rev 8719) +++ trunk/src/main/org/hornetq/core/server/impl/QueueImpl.java 2010-01-05 17:41:42 UTC (rev 8720) @@ -31,11 +31,11 @@ import java.util.concurrent.atomic.AtomicInteger; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.message.Message; import org.hornetq.core.filter.Filter; import org.hornetq.core.list.PriorityLinkedList; import org.hornetq.core.list.impl.PriorityLinkedListImpl; import org.hornetq.core.logging.Logger; -import org.hornetq.core.message.impl.MessageImpl; import org.hornetq.core.persistence.StorageManager; import org.hornetq.core.postoffice.Bindings; import org.hornetq.core.postoffice.PostOffice; @@ -1136,7 +1136,7 @@ } else { - final SimpleString groupID = reference.getMessage().getSimpleStringProperty(MessageImpl.HDR_GROUP_ID); + final SimpleString groupID = reference.getMessage().getSimpleStringProperty(Message.HDR_GROUP_ID); boolean tryHandle = true; @@ -1225,7 +1225,7 @@ if (!checkExpired(reference)) { - SimpleString groupID = reference.getMessage().getSimpleStringProperty(MessageImpl.HDR_GROUP_ID); + SimpleString groupID = reference.getMessage().getSimpleStringProperty(Message.HDR_GROUP_ID); boolean tryHandle = true; Modified: trunk/src/main/org/hornetq/core/server/impl/ServerMessageImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/impl/ServerMessageImpl.java 2010-01-05 17:11:47 UTC (rev 8719) +++ trunk/src/main/org/hornetq/core/server/impl/ServerMessageImpl.java 2010-01-05 17:41:42 UTC (rev 8720) @@ -17,6 +17,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.message.Message; import org.hornetq.core.logging.Logger; import org.hornetq.core.message.impl.MessageImpl; import org.hornetq.core.paging.PagingStore; @@ -208,20 +209,20 @@ public void setOriginalHeaders(final ServerMessage other, final boolean expiry) { - if (other.containsProperty(MessageImpl.HDR_ORIG_MESSAGE_ID)) + if (other.containsProperty(Message.HDR_ORIG_MESSAGE_ID)) { - putStringProperty(MessageImpl.HDR_ORIGINAL_ADDRESS, - other.getSimpleStringProperty(MessageImpl.HDR_ORIGINAL_ADDRESS)); + putStringProperty(Message.HDR_ORIGINAL_ADDRESS, + other.getSimpleStringProperty(Message.HDR_ORIGINAL_ADDRESS)); - putLongProperty(MessageImpl.HDR_ORIG_MESSAGE_ID, other.getLongProperty(MessageImpl.HDR_ORIG_MESSAGE_ID)); + putLongProperty(Message.HDR_ORIG_MESSAGE_ID, other.getLongProperty(Message.HDR_ORIG_MESSAGE_ID)); } else { SimpleString originalQueue = other.getAddress(); - putStringProperty(MessageImpl.HDR_ORIGINAL_ADDRESS, originalQueue); + putStringProperty(Message.HDR_ORIGINAL_ADDRESS, originalQueue); - putLongProperty(MessageImpl.HDR_ORIG_MESSAGE_ID, other.getMessageID()); + putLongProperty(Message.HDR_ORIG_MESSAGE_ID, other.getMessageID()); } // reset expiry @@ -231,7 +232,7 @@ { long actualExpiryTime = System.currentTimeMillis(); - putLongProperty(MessageImpl.HDR_ACTUAL_EXPIRY_TIME, actualExpiryTime); + putLongProperty(Message.HDR_ACTUAL_EXPIRY_TIME, actualExpiryTime); } bufferValid = false; Modified: trunk/src/main/org/hornetq/jms/client/HornetQMessage.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQMessage.java 2010-01-05 17:11:47 UTC (rev 8719) +++ trunk/src/main/org/hornetq/jms/client/HornetQMessage.java 2010-01-05 17:41:42 UTC (rev 8720) @@ -40,9 +40,9 @@ import org.hornetq.api.core.exception.HornetQException; import org.hornetq.api.core.message.PropertyConversionException; import org.hornetq.api.jms.HornetQDestination; +import org.hornetq.api.jms.HornetQMessageConstants; import org.hornetq.core.client.impl.ClientMessageImpl; import org.hornetq.core.logging.Logger; -import org.hornetq.core.message.impl.MessageImpl; /** * HornetQ implementation of a JMS Message. @@ -66,13 +66,13 @@ { // Constants ----------------------------------------------------- - public static final SimpleString REPLYTO_HEADER_NAME = ClientMessageImpl.REPLYTO_HEADER_NAME; + private static final SimpleString REPLYTO_HEADER_NAME = ClientMessageImpl.REPLYTO_HEADER_NAME; - public static final SimpleString CORRELATIONID_HEADER_NAME = new SimpleString("JMSCorrelationID"); + private static final SimpleString CORRELATIONID_HEADER_NAME = new SimpleString("JMSCorrelationID"); public static final SimpleString HORNETQ_MESSAGE_ID = new SimpleString("JMSMessageID"); - public static final SimpleString TYPE_HEADER_NAME = new SimpleString("JMSType"); + private static final SimpleString TYPE_HEADER_NAME = new SimpleString("JMSType"); private static final SimpleString JMS = new SimpleString("JMS"); @@ -80,19 +80,10 @@ private static final SimpleString JMS_ = new SimpleString("JMS_"); - public static final String JMSXDELIVERYCOUNT = "JMSXDeliveryCount"; + private static final String JMSXDELIVERYCOUNT = "JMSXDeliveryCount"; - public static final String JMS_HORNETQ_INPUT_STREAM = "JMS_HQ_InputStream"; + private static final String JMSXGROUPID = "JMSXGroupID"; - public static final String JMS_HORNETQ_OUTPUT_STREAM = "JMS_HQ_OutputStream"; - - public static final String JMS_HORNETQ_SAVE_STREAM = "JMS_HQ_SaveStream"; - - public static final String JMSXGROUPID = "JMSXGroupID"; - - // Used when bridging a message - public static final String JBOSS_MESSAGING_BRIDGE_MESSAGE_ID_LIST = "HQ_BRIDGE_MSG_ID_LIST"; - public static final byte TYPE = 0; public static Map<String, Object> coreMaptoJMSMap(final Map<String, Object> coreMessage) @@ -579,7 +570,7 @@ { return message.containsProperty(new SimpleString(name)) || name.equals(HornetQMessage.JMSXDELIVERYCOUNT) || HornetQMessage.JMSXGROUPID.equals(name) && - message.containsProperty(MessageImpl.HDR_GROUP_ID); + message.containsProperty(org.hornetq.api.core.message.Message.HDR_GROUP_ID); } public boolean getBooleanProperty(final String name) throws JMSException @@ -687,7 +678,7 @@ { if (HornetQMessage.JMSXGROUPID.equals(name)) { - return message.getStringProperty(MessageImpl.HDR_GROUP_ID); + return message.getStringProperty(org.hornetq.api.core.message.Message.HDR_GROUP_ID); } else { @@ -788,7 +779,7 @@ if (HornetQMessage.JMSXGROUPID.equals(name)) { - message.putStringProperty(MessageImpl.HDR_GROUP_ID, new SimpleString(value)); + message.putStringProperty(org.hornetq.api.core.message.Message.HDR_GROUP_ID, new SimpleString(value)); } else { @@ -798,13 +789,13 @@ public void setObjectProperty(final String name, final Object value) throws JMSException { - if (HornetQMessage.JMS_HORNETQ_OUTPUT_STREAM.equals(name)) + if (HornetQMessageConstants.JMS_HORNETQ_OUTPUT_STREAM.equals(name)) { setOutputStream((OutputStream)value); return; } - else if (HornetQMessage.JMS_HORNETQ_SAVE_STREAM.equals(name)) + else if (HornetQMessageConstants.JMS_HORNETQ_SAVE_STREAM.equals(name)) { saveToOutputStream((OutputStream)value); @@ -819,7 +810,7 @@ return; } - if (HornetQMessage.JMS_HORNETQ_INPUT_STREAM.equals(name)) + if (HornetQMessageConstants.JMS_HORNETQ_INPUT_STREAM.equals(name)) { setInputStream((InputStream)value); @@ -987,11 +978,11 @@ { if (propertiesReadOnly) { - if (name.equals(HornetQMessage.JMS_HORNETQ_INPUT_STREAM)) + if (name.equals(HornetQMessageConstants.JMS_HORNETQ_INPUT_STREAM)) { - throw new MessageNotWriteableException("You cannot set the Input Stream on received messages. Did you mean " + HornetQMessage.JMS_HORNETQ_OUTPUT_STREAM + + throw new MessageNotWriteableException("You cannot set the Input Stream on received messages. Did you mean " + HornetQMessageConstants.JMS_HORNETQ_OUTPUT_STREAM + " or " + - HornetQMessage.JMS_HORNETQ_SAVE_STREAM + + HornetQMessageConstants.JMS_HORNETQ_SAVE_STREAM + "?"); } else Modified: trunk/tests/src/org/hornetq/tests/integration/DuplicateDetectionTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/DuplicateDetectionTest.java 2010-01-05 17:11:47 UTC (rev 8719) +++ trunk/tests/src/org/hornetq/tests/integration/DuplicateDetectionTest.java 2010-01-05 17:41:42 UTC (rev 8720) @@ -27,9 +27,9 @@ import org.hornetq.api.core.client.ClientSessionFactoryImpl; import org.hornetq.api.core.config.Configuration; import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.message.Message; import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.logging.Logger; -import org.hornetq.core.message.impl.MessageImpl; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.transaction.impl.XidImpl; import org.hornetq.tests.util.ServiceTestBase; @@ -77,19 +77,19 @@ message = createMessage(session, 1); SimpleString dupID = new SimpleString("abcdefg"); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); message2 = consumer.receive(1000); Assert.assertEquals(1, message2.getObjectProperty(propKey)); message = createMessage(session, 2); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); message2 = consumer.receiveImmediate(); Assert.assertNull(message2); message = createMessage(session, 3); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); message2 = consumer.receiveImmediate(); Assert.assertNull(message2); @@ -98,19 +98,19 @@ message = createMessage(session, 4); SimpleString dupID2 = new SimpleString("hijklmnop"); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); producer.send(message); message2 = consumer.receive(1000); Assert.assertEquals(4, message2.getObjectProperty(propKey)); message = createMessage(session, 5); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); producer.send(message); message2 = consumer.receiveImmediate(); Assert.assertNull(message2); message = createMessage(session, 6); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); message2 = consumer.receiveImmediate(); Assert.assertNull(message2); @@ -143,19 +143,19 @@ message = createMessage(session, 1); SimpleString dupID = new SimpleString("abcdefg"); - message.putStringProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID); + message.putStringProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID); producer.send(message); message2 = consumer.receive(1000); Assert.assertEquals(1, message2.getObjectProperty(propKey)); message = createMessage(session, 2); - message.putStringProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID); + message.putStringProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID); producer.send(message); message2 = consumer.receiveImmediate(); Assert.assertNull(message2); message = createMessage(session, 3); - message.putStringProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID); + message.putStringProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID); producer.send(message); message2 = consumer.receiveImmediate(); Assert.assertNull(message2); @@ -164,19 +164,19 @@ message = createMessage(session, 4); SimpleString dupID2 = new SimpleString("hijklmnop"); - message.putStringProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID2); + message.putStringProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID2); producer.send(message); message2 = consumer.receive(1000); Assert.assertEquals(4, message2.getObjectProperty(propKey)); message = createMessage(session, 5); - message.putStringProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID2); + message.putStringProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID2); producer.send(message); message2 = consumer.receiveImmediate(); Assert.assertNull(message2); message = createMessage(session, 6); - message.putStringProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID); + message.putStringProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID); producer.send(message); message2 = consumer.receiveImmediate(); Assert.assertNull(message2); @@ -221,7 +221,7 @@ ClientMessage message = createMessage(session, i); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer1.send(message); producer2.send(message); @@ -248,7 +248,7 @@ ClientMessage message = createMessage(session, i); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer1.send(message); producer2.send(message); @@ -268,7 +268,7 @@ message = createMessage(session, i); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer1.send(message); producer2.send(message); @@ -294,7 +294,7 @@ message = createMessage(session, i); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer1.send(message); producer2.send(message); @@ -316,7 +316,7 @@ message = createMessage(session, i); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer1.send(message); producer2.send(message); @@ -357,7 +357,7 @@ ClientMessage message = createMessage(session, 0); SimpleString dupID = new SimpleString("abcdefg"); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); session.close(); @@ -373,7 +373,7 @@ // Should be able to resend it and not get rejected since transaction didn't commit message = createMessage(session, 1); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); session.commit(); @@ -407,7 +407,7 @@ ClientMessage message = createMessage(session, 0); SimpleString dupID = new SimpleString("abcdefg"); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); session.rollback(); @@ -415,7 +415,7 @@ // Should be able to resend it and not get rejected since transaction didn't commit message = createMessage(session, 1); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); session.commit(); @@ -449,12 +449,12 @@ ClientMessage message = createMessage(session, 0); SimpleString dupID1 = new SimpleString("abcdefg"); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID1.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID1.getData()); producer.send(message); message = createMessage(session, 1); SimpleString dupID2 = new SimpleString("hijklmno"); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); producer.send(message); session.commit(); @@ -462,11 +462,11 @@ // These next two should get rejected message = createMessage(session, 2); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID1.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID1.getData()); producer.send(message); message = createMessage(session, 3); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); producer.send(message); session.commit(); @@ -505,7 +505,7 @@ ClientMessage message = createMessage(session, 0); SimpleString dupID = new SimpleString("abcdefg"); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); session.commit(); @@ -519,7 +519,7 @@ producer = session.createProducer(queueName); message = createMessage(session, 1); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); message = createMessage(session, 2); @@ -566,7 +566,7 @@ ClientMessage message = createMessage(session, 0); SimpleString dupID = new SimpleString("abcdefg"); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); session.end(xid, XAResource.TMSUCCESS); @@ -588,7 +588,7 @@ // Should be able to resend it and not get rejected since transaction didn't commit message = createMessage(session, 1); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); session.end(xid2, XAResource.TMSUCCESS); @@ -641,7 +641,7 @@ ClientMessage message = createMessage(session, 0); SimpleString dupID = new SimpleString("abcdefg"); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); session.end(xid, XAResource.TMSUCCESS); @@ -665,7 +665,7 @@ // Should be able to resend it and not get rejected since transaction didn't commit message = createMessage(session, 1); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); session.end(xid2, XAResource.TMSUCCESS); @@ -718,7 +718,7 @@ ClientMessage message = createMessage(session, 0); SimpleString dupID = new SimpleString("abcdefg"); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); session.end(xid, XAResource.TMSUCCESS); @@ -742,7 +742,7 @@ // Should NOT be able to resend it message = createMessage(session, 1); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); session.end(xid2, XAResource.TMSUCCESS); @@ -794,7 +794,7 @@ ClientMessage message = createMessage(session, 0); SimpleString dupID = new SimpleString("abcdefg"); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); session.end(xid, XAResource.TMSUCCESS); @@ -820,7 +820,7 @@ // Should NOT be able to resend it message = createMessage(session, 1); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); session.end(xid2, XAResource.TMSUCCESS); @@ -889,14 +889,14 @@ ClientMessage message = createMessage(session, 1); SimpleString dupID = new SimpleString("abcdefg"); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); ClientMessage message2 = consumer.receive(1000); Assert.assertEquals(1, message2.getObjectProperty(propKey)); message = createMessage(session, 2); SimpleString dupID2 = new SimpleString("hijklmnopqr"); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); producer.send(message); message2 = consumer.receive(1000); Assert.assertEquals(2, message2.getObjectProperty(propKey)); @@ -924,13 +924,13 @@ consumer = session.createConsumer(queueName); message = createMessage(session, 1); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); message2 = consumer.receiveImmediate(); Assert.assertNull(message2); message = createMessage(session, 2); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); producer.send(message); message2 = consumer.receiveImmediate(); Assert.assertNull(message2); @@ -974,7 +974,7 @@ { ClientMessage message = createMessage(session, i); SimpleString dupID = new SimpleString("abcdefg" + i); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); ClientMessage message2 = consumer.receive(1000); Assert.assertEquals(i, message2.getObjectProperty(propKey)); @@ -1006,7 +1006,7 @@ { ClientMessage message = createMessage(session, i); SimpleString dupID = new SimpleString("abcdefg" + i); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); ClientMessage message2 = consumer.receiveImmediate(); Assert.assertNull(message2); @@ -1052,7 +1052,7 @@ { ClientMessage message = createMessage(session, i); SimpleString dupID = new SimpleString("abcdefg" + i); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); ClientMessage message2 = consumer.receive(1000); Assert.assertEquals(i, message2.getObjectProperty(propKey)); @@ -1086,7 +1086,7 @@ { ClientMessage message = createMessage(session, i); SimpleString dupID = new SimpleString("abcdefg" + i); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); if (i >= subsequentCacheSize) { @@ -1141,7 +1141,7 @@ { ClientMessage message = createMessage(session, i); SimpleString dupID = new SimpleString("abcdefg" + i); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); ClientMessage message2 = consumer.receive(1000); Assert.assertEquals(i, message2.getObjectProperty(propKey)); @@ -1185,7 +1185,7 @@ { ClientMessage message = createMessage(session, i); SimpleString dupID = new SimpleString("abcdefg" + i); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); if (i >= subsequentCacheSize) { @@ -1237,14 +1237,14 @@ ClientMessage message = createMessage(session, 1); SimpleString dupID = new SimpleString("abcdefg"); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); ClientMessage message2 = consumer.receive(1000); Assert.assertEquals(1, message2.getObjectProperty(propKey)); message = createMessage(session, 2); SimpleString dupID2 = new SimpleString("hijklmnopqr"); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); producer.send(message); message2 = consumer.receive(1000); Assert.assertEquals(2, message2.getObjectProperty(propKey)); @@ -1272,13 +1272,13 @@ consumer = session.createConsumer(queueName); message = createMessage(session, 1); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); message2 = consumer.receive(200); Assert.assertEquals(1, message2.getObjectProperty(propKey)); message = createMessage(session, 2); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); producer.send(message); message2 = consumer.receive(200); Assert.assertEquals(2, message2.getObjectProperty(propKey)); @@ -1320,7 +1320,7 @@ ClientMessage message = createMessage(session, 1); SimpleString dupID = new SimpleString("abcdefg"); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); session.commit(); ClientMessage message2 = consumer.receive(1000); @@ -1328,7 +1328,7 @@ message = createMessage(session, 2); SimpleString dupID2 = new SimpleString("hijklmnopqr"); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); producer.send(message); session.commit(); message2 = consumer.receive(1000); @@ -1357,14 +1357,14 @@ consumer = session.createConsumer(queueName); message = createMessage(session, 1); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); session.commit(); message2 = consumer.receive(200); Assert.assertEquals(1, message2.getObjectProperty(propKey)); message = createMessage(session, 2); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); producer.send(message); session.commit(); message2 = consumer.receive(200); @@ -1405,7 +1405,7 @@ ClientMessage message = createMessage(session, 1); SimpleString dupID = new SimpleString("abcdefg"); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); session.commit(); ClientMessage message2 = consumer.receive(1000); @@ -1415,7 +1415,7 @@ message = createMessage(session, 2); SimpleString dupID2 = new SimpleString("hijklmnopqr"); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); producer.send(message); session.commit(); message2 = consumer.receive(1000); @@ -1446,14 +1446,14 @@ consumer = session.createConsumer(queueName); message = createMessage(session, 1); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); session.commit(); message2 = consumer.receiveImmediate(); Assert.assertNull(message2); message = createMessage(session, 2); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); producer.send(message); session.commit(); message2 = consumer.receiveImmediate(); @@ -1500,12 +1500,12 @@ ClientMessage message = createMessage(session, 1); SimpleString dupID = new SimpleString("abcdefg"); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); message = createMessage(session, 2); SimpleString dupID2 = new SimpleString("hijklmnopqr"); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); producer.send(message); session.end(xid, XAResource.TMSUCCESS); @@ -1539,11 +1539,11 @@ consumer = session.createConsumer(queueName); message = createMessage(session, 1); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); message = createMessage(session, 2); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); producer.send(message); session.end(xid2, XAResource.TMSUCCESS); @@ -1599,12 +1599,12 @@ ClientMessage message = createMessage(session, 1); SimpleString dupID = new SimpleString("abcdefg"); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); message = createMessage(session, 2); SimpleString dupID2 = new SimpleString("hijklmnopqr"); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); producer.send(message); session.end(xid, XAResource.TMSUCCESS); @@ -1636,11 +1636,11 @@ consumer = session.createConsumer(queueName); message = createMessage(session, 1); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); message = createMessage(session, 2); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); producer.send(message); session.end(xid2, XAResource.TMSUCCESS); @@ -1696,12 +1696,12 @@ ClientMessage message = createMessage(session, 1); SimpleString dupID = new SimpleString("abcdefg"); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); message = createMessage(session, 2); SimpleString dupID2 = new SimpleString("hijklmnopqr"); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); producer.send(message); session.end(xid, XAResource.TMSUCCESS); @@ -1735,11 +1735,11 @@ consumer = session.createConsumer(queueName); message = createMessage(session, 1); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); message = createMessage(session, 2); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); producer.send(message); session.end(xid2, XAResource.TMSUCCESS); @@ -1795,12 +1795,12 @@ ClientMessage message = createMessage(session, 1); SimpleString dupID = new SimpleString("abcdefg"); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); message = createMessage(session, 2); SimpleString dupID2 = new SimpleString("hijklmnopqr"); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); producer.send(message); session.end(xid, XAResource.TMSUCCESS); @@ -1833,11 +1833,11 @@ consumer = session.createConsumer(queueName); message = createMessage(session, 1); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID.getData()); producer.send(message); message = createMessage(session, 2); - message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); + message.putBytesProperty(Message.HDR_DUPLICATE_DETECTION_ID, dupID2.getData()); producer.send(message); session.end(xid2, XAResource.TMSUCCESS); Modified: trunk/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java 2010-01-05 17:11:47 UTC (rev 8719) +++ trunk/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java 2010-01-05 17:41:42 UTC (rev 8720) @@ -27,9 +27,9 @@ import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.message.Message; import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.logging.Logger; -import org.hornetq.core.message.impl.MessageImpl; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.Queue; import org.hornetq.core.settings.impl.AddressSettings; @@ -208,9 +208,9 @@ Assert.assertEquals("Message:" + i, text); // Check the headers - SimpleString origDest = (SimpleString)tm.getObjectProperty(MessageImpl.HDR_ORIGINAL_ADDRESS); + SimpleString origDest = (SimpleString)tm.getObjectProperty(Message.HDR_ORIGINAL_ADDRESS); - Long origMessageId = (Long)tm.getObjectProperty(MessageImpl.HDR_ORIG_MESSAGE_ID); + Long origMessageId = (Long)tm.getObjectProperty(Message.HDR_ORIG_MESSAGE_ID); Assert.assertEquals(qName, origDest); Modified: trunk/tests/src/org/hornetq/tests/integration/client/ExpiryAddressTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/ExpiryAddressTest.java 2010-01-05 17:11:47 UTC (rev 8719) +++ trunk/tests/src/org/hornetq/tests/integration/client/ExpiryAddressTest.java 2010-01-05 17:41:42 UTC (rev 8720) @@ -24,9 +24,9 @@ import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.message.Message; import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.logging.Logger; -import org.hornetq.core.message.impl.MessageImpl; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.settings.impl.AddressSettings; import org.hornetq.tests.util.RandomUtil; @@ -204,7 +204,7 @@ Assert.assertEquals("Message:" + i, text); // Check the headers - Long actualExpiryTime = (Long)tm.getObjectProperty(MessageImpl.HDR_ACTUAL_EXPIRY_TIME); + Long actualExpiryTime = (Long)tm.getObjectProperty(Message.HDR_ACTUAL_EXPIRY_TIME); Assert.assertTrue(actualExpiryTime >= expiration); } Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessageExpirationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/MessageExpirationTest.java 2010-01-05 17:11:47 UTC (rev 8719) +++ trunk/tests/src/org/hornetq/tests/integration/client/MessageExpirationTest.java 2010-01-05 17:41:42 UTC (rev 8720) @@ -21,7 +21,7 @@ import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.core.message.impl.MessageImpl; +import org.hornetq.api.core.message.Message; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.Queue; import org.hornetq.core.settings.impl.AddressSettings; @@ -171,8 +171,8 @@ ClientConsumer expiryConsumer = session.createConsumer(expiryQueue); ClientMessage expiredMessage = expiryConsumer.receive(500); Assert.assertNotNull(expiredMessage); - Assert.assertNotNull(expiredMessage.getObjectProperty(MessageImpl.HDR_ACTUAL_EXPIRY_TIME)); - Assert.assertEquals(address, expiredMessage.getObjectProperty(MessageImpl.HDR_ORIGINAL_ADDRESS)); + Assert.assertNotNull(expiredMessage.getObjectProperty(Message.HDR_ACTUAL_EXPIRY_TIME)); + Assert.assertEquals(address, expiredMessage.getObjectProperty(Message.HDR_ORIGINAL_ADDRESS)); consumer.close(); expiryConsumer.close(); session.deleteQueue(queue); Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingTest.java 2010-01-05 17:11:47 UTC (rev 8719) +++ trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingTest.java 2010-01-05 17:41:42 UTC (rev 8720) @@ -32,9 +32,9 @@ import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.message.Message; import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.logging.Logger; -import org.hornetq.core.message.impl.MessageImpl; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.transaction.impl.XidImpl; import org.hornetq.tests.util.UnitTestCase; @@ -136,7 +136,7 @@ for (int i = 0; i < numMessages; i++) { ClientMessage message = createTextMessage("m" + i, clientSession); - message.putStringProperty(MessageImpl.HDR_GROUP_ID, groupId); + message.putStringProperty(Message.HDR_GROUP_ID, groupId); clientProducer.send(message); } if (!directDelivery) @@ -169,11 +169,11 @@ ClientMessage message = createTextMessage("m" + i, clientSession); if (i % 2 == 0 || i == 0) { - message.putStringProperty(MessageImpl.HDR_GROUP_ID, groupId); + message.putStringProperty(Message.HDR_GROUP_ID, groupId); } else { - message.putStringProperty(MessageImpl.HDR_GROUP_ID, groupId2); + message.putStringProperty(Message.HDR_GROUP_ID, groupId2); } clientProducer.send(message); } @@ -231,11 +231,11 @@ ClientMessage message = createTextMessage("m" + i, clientSession); if (i % 2 == 0 || i == 0) { - message.putStringProperty(MessageImpl.HDR_GROUP_ID, groupId); + message.putStringProperty(Message.HDR_GROUP_ID, groupId); } else { - message.putStringProperty(MessageImpl.HDR_GROUP_ID, groupId2); + message.putStringProperty(Message.HDR_GROUP_ID, groupId2); } clientProducer.send(message); } @@ -277,11 +277,11 @@ ClientMessage message = createTextMessage("m" + i, clientSession); if (i % 2 == 0 || i == 0) { - message.putStringProperty(MessageImpl.HDR_GROUP_ID, groupId); + message.putStringProperty(Message.HDR_GROUP_ID, groupId); } else { - message.putStringProperty(MessageImpl.HDR_GROUP_ID, groupId2); + message.putStringProperty(Message.HDR_GROUP_ID, groupId2); } clientProducer.send(message); } @@ -337,11 +337,11 @@ ClientMessage message = createTextMessage("m" + i, clientSession); if (i % 2 == 0 || i == 0) { - message.putStringProperty(MessageImpl.HDR_GROUP_ID, groupId); + message.putStringProperty(Message.HDR_GROUP_ID, groupId); } else { - message.putStringProperty(MessageImpl.HDR_GROUP_ID, groupId2); + message.putStringProperty(Message.HDR_GROUP_ID, groupId2); } clientProducer.send(message); } @@ -415,11 +415,11 @@ ClientMessage message = createTextMessage("m" + i, clientSession); if (i % 2 == 0 || i == 0) { - message.putStringProperty(MessageImpl.HDR_GROUP_ID, groupId); + message.putStringProperty(Message.HDR_GROUP_ID, groupId); } else { - message.putStringProperty(MessageImpl.HDR_GROUP_ID, groupId2); + message.putStringProperty(Message.HDR_GROUP_ID, groupId2); } clientProducer.send(message); } @@ -480,11 +480,11 @@ ClientMessage message = createTextMessage("m" + i, clientSession); if (i % 2 == 0 || i == 0) { - message.putStringProperty(MessageImpl.HDR_GROUP_ID, groupId); + message.putStringProperty(Message.HDR_GROUP_ID, groupId); } else { - message.putStringProperty(MessageImpl.HDR_GROUP_ID, groupId2); + message.putStringProperty(Message.HDR_GROUP_ID, groupId2); } clientProducer.send(message); } @@ -558,11 +558,11 @@ ClientMessage message = createTextMessage("m" + i, clientSession); if (i % 2 == 0 || i == 0) { - message.putStringProperty(MessageImpl.HDR_GROUP_ID, groupId); + message.putStringProperty(Message.HDR_GROUP_ID, groupId); } else { - message.putStringProperty(MessageImpl.HDR_GROUP_ID, groupId2); + message.putStringProperty(Message.HDR_GROUP_ID, groupId2); } clientProducer.send(message); } Modified: trunk/tests/src/org/hornetq/tests/integration/client/PagingTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/PagingTest.java 2010-01-05 17:11:47 UTC (rev 8719) +++ trunk/tests/src/org/hornetq/tests/integration/client/PagingTest.java 2010-01-05 17:41:42 UTC (rev 8720) @@ -28,8 +28,8 @@ import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.config.Configuration; +import org.hornetq.api.core.message.Message; import org.hornetq.core.logging.Logger; -import org.hornetq.core.message.impl.MessageImpl; import org.hornetq.core.paging.impl.TestSupportPageStore; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.Queue; @@ -429,7 +429,7 @@ // Worse scenario possible... only schedule what's on pages if (store.getCurrentPage() != null) { - message.putLongProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME, scheduledTime); + message.putLongProperty(Message.HDR_SCHEDULED_DELIVERY_TIME, scheduledTime); } producer.send(message); @@ -468,7 +468,7 @@ Assert.assertNotNull(message2); - Long scheduled = (Long)message2.getObjectProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME); + Long scheduled = (Long)message2.getObjectProperty(Message.HDR_SCHEDULED_DELIVERY_TIME); if (scheduled != null) { Assert.assertTrue("Scheduling didn't work", System.currentTimeMillis() >= scheduledTime); Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2010-01-05 17:11:47 UTC (rev 8719) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2010-01-05 17:41:42 UTC (rev 8720) @@ -38,9 +38,9 @@ import org.hornetq.api.core.config.cluster.BroadcastGroupConfiguration; import org.hornetq.api.core.config.cluster.ClusterConnectionConfiguration; import org.hornetq.api.core.config.cluster.DiscoveryGroupConfiguration; +import org.hornetq.api.core.message.Message; import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.logging.Logger; -import org.hornetq.core.message.impl.MessageImpl; import org.hornetq.core.postoffice.Binding; import org.hornetq.core.postoffice.Bindings; import org.hornetq.core.postoffice.PostOffice; @@ -612,7 +612,7 @@ Assert.assertTrue("Message received too soon", System.currentTimeMillis() >= firstReceiveTime); } - SimpleString id = (SimpleString)message.getObjectProperty(MessageImpl.HDR_GROUP_ID); + SimpleString id = (SimpleString)message.getObjectProperty(Message.HDR_GROUP_ID); System.out.println("received " + id + " on consumer " + consumerIDs[i]); if (groupIdsReceived.get(id) == null) { Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusteredGroupingTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusteredGroupingTest.java 2010-01-05 17:11:47 UTC (rev 8719) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusteredGroupingTest.java 2010-01-05 17:41:42 UTC (rev 8720) @@ -20,7 +20,7 @@ import org.hornetq.api.SimpleString; import org.hornetq.api.core.management.NotificationType; import org.hornetq.api.core.management.client.ManagementHelper; -import org.hornetq.core.message.impl.MessageImpl; +import org.hornetq.api.core.message.Message; import org.hornetq.core.server.group.GroupingHandler; import org.hornetq.core.server.group.impl.GroupBinding; import org.hornetq.core.server.group.impl.GroupingHandlerConfiguration; @@ -76,7 +76,7 @@ waitForBindings(1, "queues.testaddress", 2, 2, false); waitForBindings(2, "queues.testaddress", 2, 2, false);*/ - sendWithProperty(0, "queues.testaddress", 10, false, MessageImpl.HDR_GROUP_ID, new SimpleString("id1")); + sendWithProperty(0, "queues.testaddress", 10, false, Message.HDR_GROUP_ID, new SimpleString("id1")); verifyReceiveAll(10, 0); @@ -177,7 +177,7 @@ try { - sendWithProperty(1, "queues.testaddress", 10, false, MessageImpl.HDR_GROUP_ID, new SimpleString("id1")); + sendWithProperty(1, "queues.testaddress", 10, false, Message.HDR_GROUP_ID, new SimpleString("id1")); Assert.fail("should timeout"); } catch (Exception e) @@ -237,10 +237,10 @@ waitForBindings(1, "queues.testaddress", 2, 2, false); waitForBindings(2, "queues.testaddress", 2, 2, false); - sendInRange(0, "queues.testaddress", 0, 10, false, MessageImpl.HDR_GROUP_ID, new SimpleString("id1")); + sendInRange(0, "queues.testaddress", 0, 10, false, Message.HDR_GROUP_ID, new SimpleString("id1")); verifyReceiveAllInRange(0, 10, 0); - sendInRange(1, "queues.testaddress", 10, 20, false, MessageImpl.HDR_GROUP_ID, new SimpleString("id1")); + sendInRange(1, "queues.testaddress", 10, 20, false, Message.HDR_GROUP_ID, new SimpleString("id1")); verifyReceiveAllInRange(10, 20, 0); @@ -296,13 +296,13 @@ waitForBindings(1, "queues.testaddress", 2, 2, false); waitForBindings(2, "queues.testaddress", 2, 2, false); - sendInRange(0, "queues.testaddress", 0, 10, false, MessageImpl.HDR_GROUP_ID, new SimpleString("id1")); + sendInRange(0, "queues.testaddress", 0, 10, false, Message.HDR_GROUP_ID, new SimpleString("id1")); verifyReceiveAllInRange(0, 10, 0); - sendInRange(1, "queues.testaddress", 10, 20, false, MessageImpl.HDR_GROUP_ID, new SimpleString("id1")); + sendInRange(1, "queues.testaddress", 10, 20, false, Message.HDR_GROUP_ID, new SimpleString("id1")); verifyReceiveAllInRange(10, 20, 0); - sendInRange(2, "queues.testaddress", 10, 20, false, MessageImpl.HDR_GROUP_ID, new SimpleString("id1")); + sendInRange(2, "queues.testaddress", 10, 20, false, Message.HDR_GROUP_ID, new SimpleString("id1")); verifyReceiveAllInRange(10, 20, 0); @@ -356,13 +356,13 @@ waitForBindings(1, "queues.testaddress", 2, 0, false); waitForBindings(2, "queues.testaddress", 2, 1, false); - sendInRange(1, "queues.testaddress", 0, 10, false, MessageImpl.HDR_GROUP_ID, new SimpleString("id1")); + sendInRange(1, "queues.testaddress", 0, 10, false, Message.HDR_GROUP_ID, new SimpleString("id1")); verifyReceiveAllInRange(0, 10, 1); - sendInRange(2, "queues.testaddress", 10, 20, false, MessageImpl.HDR_GROUP_ID, new SimpleString("id1")); + sendInRange(2, "queues.testaddress", 10, 20, false, Message.HDR_GROUP_ID, new SimpleString("id1")); verifyReceiveAllInRange(10, 20, 1); - sendInRange(0, "queues.testaddress", 20, 30, false, MessageImpl.HDR_GROUP_ID, new SimpleString("id1")); + sendInRange(0, "queues.testaddress", 20, 30, false, Message.HDR_GROUP_ID, new SimpleString("id1")); verifyReceiveAllInRange(20, 30, 1); @@ -418,13 +418,13 @@ waitForBindings(1, "queues.testaddress", 2, 2, false); waitForBindings(2, "queues.testaddress", 2, 1, false); - sendInRange(1, "queues.testaddress", 0, 10, false, MessageImpl.HDR_GROUP_ID, new SimpleString("id1")); + sendInRange(1, "queues.testaddress", 0, 10, false, Message.HDR_GROUP_ID, new SimpleString("id1")); verifyReceiveAllInRange(0, 10, 0); - sendInRange(2, "queues.testaddress", 10, 20, false, MessageImpl.HDR_GROUP_ID, new SimpleString("id1")); + sendInRange(2, "queues.testaddress", 10, 20, false, Message.HDR_GROUP_ID, new SimpleString("id1")); verifyReceiveAllInRange(10, 20, 0); - sendInRange(0, "queues.testaddress", 20, 30, false, MessageImpl.HDR_GROUP_ID, new SimpleString("id1")); + sendInRange(0, "queues.testaddress", 20, 30, false, Message.HDR_GROUP_ID, new SimpleString("id1")); verifyReceiveAllInRange(20, 30, 0); @@ -480,9 +480,9 @@ waitForBindings(1, "queues.testaddress", 2, 2, false); waitForBindings(2, "queues.testaddress", 2, 2, false); - sendInRange(0, "queues.testaddress", 0, 10, false, MessageImpl.HDR_GROUP_ID, new SimpleString("id1")); - sendInRange(0, "queues.testaddress", 10, 20, false, MessageImpl.HDR_GROUP_ID, new SimpleString("id2")); - sendInRange(0, "queues.testaddress", 20, 30, false, MessageImpl.HDR_GROUP_ID, new SimpleString("id3")); + sendInRange(0, "queues.testaddress", 0, 10, false, Message.HDR_GROUP_ID, new SimpleString("id1")); + sendInRange(0, "queues.testaddress", 10, 20, false, Message.HDR_GROUP_ID, new SimpleString("id2")); + sendInRange(0, "queues.testaddress", 20, 30, false, Message.HDR_GROUP_ID, new SimpleString("id3")); verifyReceiveAllWithGroupIDRoundRobin(0, 10, 0, 1, 2); System.out.println("*****************************************************************************"); @@ -537,13 +537,13 @@ waitForBindings(1, "queues.testaddress", 2, 2, false); waitForBindings(2, "queues.testaddress", 2, 2, false); - sendInRange(0, "queues.testaddress", 0, 10, false, MessageImpl.HDR_GROUP_ID, new SimpleString("id1")); + sendInRange(0, "queues.testaddress", 0, 10, false, Message.HDR_GROUP_ID, new SimpleString("id1")); verifyReceiveAllInRange(0, 10, 0); - sendInRange(1, "queues.testaddress", 10, 20, false, MessageImpl.HDR_GROUP_ID, new SimpleString("id1")); + sendInRange(1, "queues.testaddress", 10, 20, false, Message.HDR_GROUP_ID, new SimpleString("id1")); verifyReceiveAllInRange(10, 20, 0); - sendInRange(2, "queues.testaddress", 20, 30, false, MessageImpl.HDR_GROUP_ID, new SimpleString("id1")); + sendInRange(2, "queues.testaddress", 20, 30, false, Message.HDR_GROUP_ID, new SimpleString("id1")); verifyReceiveAllInRange(20, 30, 0); removeConsumer(0); @@ -559,11 +559,11 @@ waitForBindings(1, "queues.testaddress", 1, 1, false); waitForBindings(2, "queues.testaddress", 1, 1, false); - sendInRange(0, "queues.testaddress", 30, 40, false, MessageImpl.HDR_GROUP_ID, new SimpleString("id1")); + sendInRange(0, "queues.testaddress", 30, 40, false, Message.HDR_GROUP_ID, new SimpleString("id1")); verifyReceiveAllInRange(30, 40, 3); - sendInRange(1, "queues.testaddress", 40, 50, false, MessageImpl.HDR_GROUP_ID, new SimpleString("id1")); + sendInRange(1, "queues.testaddress", 40, 50, false, Message.HDR_GROUP_ID, new SimpleString("id1")); verifyReceiveAllInRange(40, 50, 3); - sendInRange(2, "queues.testaddress", 50, 60, false, MessageImpl.HDR_GROUP_ID, new SimpleString("id1")); + sendInRange(2, "queues.testaddress", 50, 60, false, Message.HDR_GROUP_ID, new SimpleString("id1")); verifyReceiveAllInRange(50, 60, 3); System.out.println("*****************************************************************************"); } @@ -616,7 +616,7 @@ waitForBindings(1, "queues.testaddress", 2, 0, false); waitForBindings(2, "queues.testaddress", 2, 1, false); - sendInRange(1, "queues.testaddress", 0, 10, true, MessageImpl.HDR_GROUP_ID, new SimpleString("id1")); + sendInRange(1, "queues.testaddress", 0, 10, true, Message.HDR_GROUP_ID, new SimpleString("id1")); verifyReceiveAllInRange(true, 0, 10, 0); @@ -664,7 +664,7 @@ waitForBindings(2, "queues.testaddress", 1, 1, true); waitForBindings(1, "queues.testaddress", 2, 1, false); waitForBindings(0, "queues.testaddress", 2, 1, false); - sendInRange(2, "queues.testaddress", 10, 20, true, MessageImpl.HDR_GROUP_ID, new SimpleString("id1")); + sendInRange(2, "queues.testaddress", 10, 20, true, Message.HDR_GROUP_ID, new SimpleString("id1")); verifyReceiveAllInRange(10, 20, 1); System.out.println("*****************************************************************************"); @@ -718,13 +718,13 @@ waitForBindings(1, "queues.testaddress", 2, 0, false); waitForBindings(2, "queues.testaddress", 2, 1, false); - sendInRange(1, "queues.testaddress", 0, 10, true, MessageImpl.HDR_GROUP_ID, new SimpleString("id1")); + sendInRange(1, "queues.testaddress", 0, 10, true, Message.HDR_GROUP_ID, new SimpleString("id1")); verifyReceiveAllInRange(true, 0, 10, 0); closeAllConsumers(); - sendInRange(2, "queues.testaddress", 10, 20, true, MessageImpl.HDR_GROUP_ID, new SimpleString("id1")); + sendInRange(2, "queues.testaddress", 10, 20, true, Message.HDR_GROUP_ID, new SimpleString("id1")); final CountDownLatch latch = new CountDownLatch(4); NotificationListener listener = new NotificationListener() { @@ -821,7 +821,7 @@ waitForBindings(1, "queues.testaddress", 2, 0, false); waitForBindings(2, "queues.testaddress", 2, 1, false); - sendInRange(1, "queues.testaddress", 0, 10, false, MessageImpl.HDR_GROUP_ID, new SimpleString("id1")); + sendInRange(1, "queues.testaddress", 0, 10, false, Message.HDR_GROUP_ID, new SimpleString("id1")); verifyReceiveAllInRange(0, 10, 0); final CountDownLatch latch = new CountDownLatch(4); @@ -864,11 +864,11 @@ waitForBindings(1, "queues.testaddress", 1, 1, true); waitForBindings(0, "queues.testaddress", 2, 1, false); waitForBindings(2, "queues.testaddress", 2, 1, false); - sendInRange(2, "queues.testaddress", 10, 20, false, MessageImpl.HDR_GROUP_ID, new SimpleString("id1")); + sendInRange(2, "queues.testaddress", 10, 20, false, Message.HDR_GROUP_ID, new SimpleString("id1")); verifyReceiveAllInRange(10, 20, 1); - sendInRange(0, "queues.testaddress", 20, 30, false, MessageImpl.HDR_GROUP_ID, new SimpleString("id1")); + sendInRange(0, "queues.testaddress", 20, 30, false, Message.HDR_GROUP_ID, new SimpleString("id1")); verifyReceiveAllInRange(20, 30, 1); System.out.println("*****************************************************************************"); @@ -931,7 +931,7 @@ waitForBindings(1, "queues.testaddress", 4, 4, false); waitForBindings(2, "queues.testaddress", 4, 4, false); - sendWithProperty(0, "queues.testaddress", 10, false, MessageImpl.HDR_GROUP_ID, new SimpleString("id1")); + sendWithProperty(0, "queues.testaddress", 10, false, Message.HDR_GROUP_ID, new SimpleString("id1")); verifyReceiveAll(10, 0); @@ -1066,7 +1066,7 @@ } try { - sendInRange(node, "queues.testaddress", msgStart, msgEnd, false, MessageImpl.HDR_GROUP_ID, id); + sendInRange(node, "queues.testaddress", msgStart, msgEnd, false, Message.HDR_GROUP_ID, id); } catch (Exception e) { Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java 2010-01-05 17:11:47 UTC (rev 8719) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java 2010-01-05 17:41:42 UTC (rev 8720) @@ -37,10 +37,10 @@ import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.api.core.interceptor.Interceptor; +import org.hornetq.api.core.message.Message; import org.hornetq.core.client.impl.ClientSessionFactoryInternal; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.logging.Logger; -import org.hornetq.core.message.impl.MessageImpl; import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.remoting.impl.invm.TransportConstants; import org.hornetq.core.transaction.impl.XidImpl; @@ -1961,7 +1961,7 @@ if (i == 0) { // Only need to add it on one message per tx - message.putStringProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, new SimpleString(txID)); + message.putStringProperty(Message.HDR_DUPLICATE_DETECTION_ID, new SimpleString(txID)); } setBody(i, message); @@ -2045,7 +2045,7 @@ if (i == 0) { // Only need to add it on one message per tx - message.putStringProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, new SimpleString(txID)); + message.putStringProperty(Message.HDR_DUPLICATE_DETECTION_ID, new SimpleString(txID)); } setBody(i, message); Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverTestBase.java 2010-01-05 17:11:47 UTC (rev 8719) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverTestBase.java 2010-01-05 17:41:42 UTC (rev 8720) @@ -20,7 +20,7 @@ import org.hornetq.api.SimpleString; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.core.message.impl.MessageImpl; +import org.hornetq.api.core.message.Message; import org.hornetq.core.remoting.FailureListener; import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.server.cluster.MessageFlowRecord; @@ -74,7 +74,7 @@ waitForBindings(0, "queues.testaddress", 1, 1, false); waitForBindings(1, "queues.testaddress", 1, 1, false); - sendWithProperty(0, "queues.testaddress", 10, false, MessageImpl.HDR_GROUP_ID, new SimpleString("id1")); + sendWithProperty(0, "queues.testaddress", 10, false, Message.HDR_GROUP_ID, new SimpleString("id1")); verifyReceiveAll(10, 0); @@ -110,7 +110,7 @@ waitForBindings(1, "queues.testaddress", 1, 1, false); - sendWithProperty(2, "queues.testaddress", 10, false, MessageImpl.HDR_GROUP_ID, new SimpleString("id1")); + sendWithProperty(2, "queues.testaddress", 10, false, Message.HDR_GROUP_ID, new SimpleString("id1")); verifyReceiveAll(10, 2); @@ -167,12 +167,12 @@ waitForBindings(0, "queues.testaddress", 1, 1, false); waitForBindings(1, "queues.testaddress", 1, 1, false); - sendWithProperty(0, "queues.testaddress", 10, false, MessageImpl.HDR_GROUP_ID, new SimpleString("id1")); - sendWithProperty(0, "queues.testaddress", 10, false, MessageImpl.HDR_GROUP_ID, new SimpleString("id2")); - sendWithProperty(0, "queues.testaddress", 10, false, MessageImpl.HDR_GROUP_ID, new SimpleString("id3")); - sendWithProperty(0, "queues.testaddress", 10, false, MessageImpl.HDR_GROUP_ID, new SimpleString("id4")); - sendWithProperty(0, "queues.testaddress", 10, false, MessageImpl.HDR_GROUP_ID, new SimpleString("id5")); - sendWithProperty(0, "queues.testaddress", 10, false, MessageImpl.HDR_GROUP_ID, new SimpleString("id6")); + sendWithProperty(0, "queues.testaddress", 10, false, Message.HDR_GROUP_ID, new SimpleString("id1")); + sendWithProperty(0, "queues.testaddress", 10, false, Message.HDR_GROUP_ID, new SimpleString("id2")); + sendWithProperty(0, "queues.testaddress", 10, false, Message.HDR_GROUP_ID, new SimpleString("id3")); + sendWithProperty(0, "queues.testaddress", 10, false, Message.HDR_GROUP_ID, new SimpleString("id4")); + sendWithProperty(0, "queues.testaddress", 10, false, Message.HDR_GROUP_ID, new SimpleString("id5")); + sendWithProperty(0, "queues.testaddress", 10, false, Message.HDR_GROUP_ID, new SimpleString("id6")); verifyReceiveAllWithGroupIDRoundRobin(0, 30, 0, 1); @@ -208,12 +208,12 @@ waitForBindings(1, "queues.testaddress", 1, 1, false); - sendWithProperty(2, "queues.testaddress", 10, false, MessageImpl.HDR_GROUP_ID, new SimpleString("id1")); - sendWithProperty(2, "queues.testaddress", 10, false, MessageImpl.HDR_GROUP_ID, new SimpleString("id2")); - sendWithProperty(2, "queues.testaddress", 10, false, MessageImpl.HDR_GROUP_ID, new SimpleString("id3")); - sendWithProperty(2, "queues.testaddress", 10, false, MessageImpl.HDR_GROUP_ID, new SimpleString("id4")); - sendWithProperty(2, "queues.testaddress", 10, false, MessageImpl.HDR_GROUP_ID, new SimpleString("id5")); - sendWithProperty(2, "queues.testaddress", 10, false, MessageImpl.HDR_GROUP_ID, new SimpleString("id6")); + sendWithProperty(2, "queues.testaddress", 10, false, Message.HDR_GROUP_ID, new SimpleString("id1")); + sendWithProperty(2, "queues.testaddress", 10, false, Message.HDR_GROUP_ID, new SimpleString("id2")); + sendWithProperty(2, "queues.testaddress", 10, false, Message.HDR_GROUP_ID, new SimpleString("id3")); + sendWithProperty(2, "queues.testaddress", 10, false, Message.HDR_GROUP_ID, new SimpleString("id4")); + sendWithProperty(2, "queues.testaddress", 10, false, Message.HDR_GROUP_ID, new SimpleString("id5")); + sendWithProperty(2, "queues.testaddress", 10, false, Message.HDR_GROUP_ID, new SimpleString("id6")); verifyReceiveAllWithGroupIDRoundRobin(0, 30, 1, 2); Modified: trunk/tests/src/org/hornetq/tests/integration/jms/bridge/JMSBridgeTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/bridge/JMSBridgeTest.java 2010-01-05 17:11:47 UTC (rev 8719) +++ trunk/tests/src/org/hornetq/tests/integration/jms/bridge/JMSBridgeTest.java 2010-01-05 17:41:42 UTC (rev 8720) @@ -31,10 +31,10 @@ import junit.framework.Assert; +import org.hornetq.api.jms.HornetQMessageConstants; import org.hornetq.api.jms.bridge.JMSBridgeImpl; import org.hornetq.api.jms.bridge.QualityOfServiceMode; import org.hornetq.core.logging.Logger; -import org.hornetq.jms.client.HornetQMessage; /** * A JMSBridgeTest @@ -959,7 +959,7 @@ if (on) { - String header = tm.getStringProperty(HornetQMessage.JBOSS_MESSAGING_BRIDGE_MESSAGE_ID_LIST); + String header = tm.getStringProperty(HornetQMessageConstants.JBOSS_MESSAGING_BRIDGE_MESSAGE_ID_LIST); Assert.assertNotNull(header); @@ -1002,7 +1002,7 @@ Assert.assertEquals("mygroup543", tm.getStringProperty("JMSXGroupID")); - String header = tm.getStringProperty(HornetQMessage.JBOSS_MESSAGING_BRIDGE_MESSAGE_ID_LIST); + String header = tm.getStringProperty(HornetQMessageConstants.JBOSS_MESSAGING_BRIDGE_MESSAGE_ID_LIST); Assert.assertNotNull(header); @@ -1299,7 +1299,7 @@ Assert.assertTrue(tm.getBooleanProperty("cheese")); Assert.assertEquals(23, tm.getIntProperty("Sausages")); - String header = tm.getStringProperty(HornetQMessage.JBOSS_MESSAGING_BRIDGE_MESSAGE_ID_LIST); + String header = tm.getStringProperty(HornetQMessageConstants.JBOSS_MESSAGING_BRIDGE_MESSAGE_ID_LIST); Assert.assertNull(header); } Modified: trunk/tests/src/org/hornetq/tests/integration/jms/client/ReSendLargeMessageTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/client/ReSendLargeMessageTest.java 2010-01-05 17:11:47 UTC (rev 8719) +++ trunk/tests/src/org/hornetq/tests/integration/jms/client/ReSendLargeMessageTest.java 2010-01-05 17:41:42 UTC (rev 8720) @@ -33,7 +33,7 @@ import org.hornetq.api.Pair; import org.hornetq.api.core.client.ClientSessionFactoryImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.jms.client.HornetQMessage; +import org.hornetq.api.jms.HornetQMessageConstants; import org.hornetq.tests.util.JMSTestBase; import org.hornetq.tests.util.UnitTestCase; @@ -72,7 +72,7 @@ for (int i = 0; i < 10; i++) { BytesMessage bm = sess.createBytesMessage(); - bm.setObjectProperty(HornetQMessage.JMS_HORNETQ_INPUT_STREAM, + bm.setObjectProperty(HornetQMessageConstants.JMS_HORNETQ_INPUT_STREAM, UnitTestCase.createFakeLargeStream(2 * ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE)); msgs.add(bm); Modified: trunk/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.java 2010-01-05 17:11:47 UTC (rev 8719) +++ trunk/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.java 2010-01-05 17:41:42 UTC (rev 8720) @@ -36,8 +36,8 @@ import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.MessageHandler; import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.message.Message; import org.hornetq.core.logging.Logger; -import org.hornetq.core.message.impl.MessageImpl; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.Queue; import org.hornetq.tests.util.ServiceTestBase; @@ -589,7 +589,7 @@ { long time = System.currentTimeMillis(); message.putLongProperty(new SimpleString("original-time"), time); - message.putLongProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME, time + delayDelivery); + message.putLongProperty(Message.HDR_SCHEDULED_DELIVERY_TIME, time + delayDelivery); producer.send(message); } Modified: trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java 2010-01-05 17:11:47 UTC (rev 8719) +++ trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java 2010-01-05 17:41:42 UTC (rev 8720) @@ -31,8 +31,8 @@ import org.hornetq.api.core.management.HornetQServerControl; import org.hornetq.api.core.management.MessageCounterInfo; import org.hornetq.api.core.management.QueueControl; +import org.hornetq.api.core.message.Message; import org.hornetq.api.core.server.HornetQServers; -import org.hornetq.core.message.impl.MessageImpl; import org.hornetq.core.messagecounter.impl.MessageCounterManagerImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; @@ -256,7 +256,7 @@ ClientProducer producer = session.createProducer(address); ClientMessage message = session.createMessage(false); - message.putLongProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME, System.currentTimeMillis() + delay); + message.putLongProperty(Message.HDR_SCHEDULED_DELIVERY_TIME, System.currentTimeMillis() + delay); producer.send(message); Assert.assertEquals(1, queueControl.getScheduledCount()); @@ -282,7 +282,7 @@ ClientProducer producer = session.createProducer(address); ClientMessage message = session.createMessage(false); - message.putLongProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME, System.currentTimeMillis() + delay); + message.putLongProperty(Message.HDR_SCHEDULED_DELIVERY_TIME, System.currentTimeMillis() + delay); message.putIntProperty(new SimpleString("key"), intValue); producer.send(message); // unscheduled message @@ -314,7 +314,7 @@ ClientProducer producer = session.createProducer(address); ClientMessage message = session.createMessage(false); - message.putLongProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME, System.currentTimeMillis() + delay); + message.putLongProperty(Message.HDR_SCHEDULED_DELIVERY_TIME, System.currentTimeMillis() + delay); message.putIntProperty(new SimpleString("key"), intValue); producer.send(message); // unscheduled message Modified: trunk/tests/src/org/hornetq/tests/integration/scheduling/ScheduledMessageTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/scheduling/ScheduledMessageTest.java 2010-01-05 17:11:47 UTC (rev 8719) +++ trunk/tests/src/org/hornetq/tests/integration/scheduling/ScheduledMessageTest.java 2010-01-05 17:41:42 UTC (rev 8720) @@ -24,8 +24,8 @@ import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.config.Configuration; +import org.hornetq.api.core.message.Message; import org.hornetq.core.logging.Logger; -import org.hornetq.core.message.impl.MessageImpl; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.settings.impl.AddressSettings; import org.hornetq.core.transaction.impl.XidImpl; @@ -139,7 +139,7 @@ ClientMessage message = createDurableMessage(session, "m1"); long time = System.currentTimeMillis(); time += 10000; - message.putLongProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME, time); + message.putLongProperty(Message.HDR_SCHEDULED_DELIVERY_TIME, time); producer.send(message); producer.close(); @@ -289,7 +289,7 @@ message.setDurable(true); long time = System.currentTimeMillis(); time += 10000; - message.putLongProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME, time); + message.putLongProperty(Message.HDR_SCHEDULED_DELIVERY_TIME, time); producer.send(message); ScheduledMessageTest.log.info("Recover is " + recover); @@ -336,19 +336,19 @@ ClientMessage m5 = createDurableMessage(session, "m5"); long time = System.currentTimeMillis(); time += 10000; - m1.putLongProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME, time); + m1.putLongProperty(Message.HDR_SCHEDULED_DELIVERY_TIME, time); producer.send(m1); time += 1000; - m2.putLongProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME, time); + m2.putLongProperty(Message.HDR_SCHEDULED_DELIVERY_TIME, time); producer.send(m2); time += 1000; - m3.putLongProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME, time); + m3.putLongProperty(Message.HDR_SCHEDULED_DELIVERY_TIME, time); producer.send(m3); time += 1000; - m4.putLongProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME, time); + m4.putLongProperty(Message.HDR_SCHEDULED_DELIVERY_TIME, time); producer.send(m4); time += 1000; - m5.putLongProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME, time); + m5.putLongProperty(Message.HDR_SCHEDULED_DELIVERY_TIME, time); producer.send(m5); time -= 4000; if (recover) @@ -416,19 +416,19 @@ ClientMessage m5 = createDurableMessage(session, "m5"); long time = System.currentTimeMillis(); time += 10000; - m1.putLongProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME, time); + m1.putLongProperty(Message.HDR_SCHEDULED_DELIVERY_TIME, time); producer.send(m1); time += 3000; - m2.putLongProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME, time); + m2.putLongProperty(Message.HDR_SCHEDULED_DELIVERY_TIME, time); producer.send(m2); time -= 2000; - m3.putLongProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME, time); + m3.putLongProperty(Message.HDR_SCHEDULED_DELIVERY_TIME, time); producer.send(m3); time += 3000; - m4.putLongProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME, time); + m4.putLongProperty(Message.HDR_SCHEDULED_DELIVERY_TIME, time); producer.send(m4); time -= 2000; - m5.putLongProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME, time); + m5.putLongProperty(Message.HDR_SCHEDULED_DELIVERY_TIME, time); producer.send(m5); time -= 2000; ClientConsumer consumer = null; @@ -497,15 +497,15 @@ ClientMessage m5 = createDurableMessage(session, "m5"); long time = System.currentTimeMillis(); time += 10000; - m1.putLongProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME, time); + m1.putLongProperty(Message.HDR_SCHEDULED_DELIVERY_TIME, time); producer.send(m1); producer.send(m2); time += 1000; - m3.putLongProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME, time); + m3.putLongProperty(Message.HDR_SCHEDULED_DELIVERY_TIME, time); producer.send(m3); producer.send(m4); time += 1000; - m5.putLongProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME, time); + m5.putLongProperty(Message.HDR_SCHEDULED_DELIVERY_TIME, time); producer.send(m5); time -= 2000; ClientConsumer consumer = null; @@ -567,7 +567,7 @@ ClientProducer producer = session.createProducer(atestq); ClientMessage message = createDurableMessage(session, "testINVMCoreClient"); long time = System.currentTimeMillis() + 1000; - message.putLongProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME, time); + message.putLongProperty(Message.HDR_SCHEDULED_DELIVERY_TIME, time); producer.send(message); session.end(xid, XAResource.TMSUCCESS); session.prepare(xid); @@ -641,7 +641,7 @@ long now = System.currentTimeMillis(); ClientMessage tm1 = createDurableMessage(session, "testScheduled1"); - tm1.putLongProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME, now + 7000); + tm1.putLongProperty(Message.HDR_SCHEDULED_DELIVERY_TIME, now + 7000); producer.send(tm1); // First send some non scheduled messages @@ -658,25 +658,25 @@ // Now send some more scheduled messages ClientMessage tm5 = createDurableMessage(session, "testScheduled5"); - tm5.putLongProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME, now + 5000); + tm5.putLongProperty(Message.HDR_SCHEDULED_DELIVERY_TIME, now + 5000); producer.send(tm5); ClientMessage tm6 = createDurableMessage(session, "testScheduled6"); - tm6.putLongProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME, now + 4000); + tm6.putLongProperty(Message.HDR_SCHEDULED_DELIVERY_TIME, now + 4000); producer.send(tm6); ClientMessage tm7 = createDurableMessage(session, "testScheduled7"); - tm7.putLongProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME, now + 3000); + tm7.putLongProperty(Message.HDR_SCHEDULED_DELIVERY_TIME, now + 3000); producer.send(tm7); ClientMessage tm8 = createDurableMessage(session, "testScheduled8"); - tm8.putLongProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME, now + 6000); + tm8.putLongProperty(Message.HDR_SCHEDULED_DELIVERY_TIME, now + 6000); producer.send(tm8); // And one scheduled with a -ve number ClientMessage tm9 = createDurableMessage(session, "testScheduled9"); - tm9.putLongProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME, -3); + tm9.putLongProperty(Message.HDR_SCHEDULED_DELIVERY_TIME, -3); producer.send(tm9); if (tx) Modified: trunk/tests/src/org/hornetq/tests/integration/server/LVQRecoveryTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/server/LVQRecoveryTest.java 2010-01-05 17:11:47 UTC (rev 8719) +++ trunk/tests/src/org/hornetq/tests/integration/server/LVQRecoveryTest.java 2010-01-05 17:41:42 UTC (rev 8720) @@ -27,7 +27,7 @@ import org.hornetq.api.core.config.Configuration; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.core.message.impl.MessageImpl; +import org.hornetq.api.core.message.Message; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.settings.impl.AddressSettings; import org.hornetq.core.transaction.impl.XidImpl; @@ -60,13 +60,13 @@ SimpleString messageId2 = new SimpleString("SMID2"); clientSessionXa.start(xid, XAResource.TMNOFLAGS); ClientMessage m1 = createTextMessage("m1", clientSession); - m1.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, messageId1); + m1.putStringProperty(Message.HDR_LAST_VALUE_NAME, messageId1); ClientMessage m2 = createTextMessage("m2", clientSession); - m2.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, messageId2); + m2.putStringProperty(Message.HDR_LAST_VALUE_NAME, messageId2); ClientMessage m3 = createTextMessage("m3", clientSession); - m3.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, messageId1); + m3.putStringProperty(Message.HDR_LAST_VALUE_NAME, messageId1); ClientMessage m4 = createTextMessage("m4", clientSession); - m4.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, messageId2); + m4.putStringProperty(Message.HDR_LAST_VALUE_NAME, messageId2); producer.send(m1); producer.send(m2); producer.send(m3); @@ -99,22 +99,22 @@ SimpleString rh = new SimpleString("SMID1"); ClientMessage m1 = createTextMessage("m1", clientSession); - m1.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m1.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); m1.setDurable(true); ClientMessage m2 = createTextMessage("m2", clientSession); - m2.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m2.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); m2.setDurable(true); ClientMessage m3 = createTextMessage("m3", clientSession); - m3.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m3.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); m3.setDurable(true); ClientMessage m4 = createTextMessage("m4", clientSession); - m4.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m4.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); m4.setDurable(true); ClientMessage m5 = createTextMessage("m5", clientSession); - m5.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m5.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); m5.setDurable(true); ClientMessage m6 = createTextMessage("m6", clientSession); - m6.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m6.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); m6.setDurable(true); clientSessionXa.start(xid, XAResource.TMNOFLAGS); clientSessionXa.start(); Modified: trunk/tests/src/org/hornetq/tests/integration/server/LVQTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/server/LVQTest.java 2010-01-05 17:11:47 UTC (rev 8719) +++ trunk/tests/src/org/hornetq/tests/integration/server/LVQTest.java 2010-01-05 17:41:42 UTC (rev 8720) @@ -24,9 +24,9 @@ import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.message.Message; import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.logging.Logger; -import org.hornetq.core.message.impl.MessageImpl; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.settings.impl.AddressSettings; import org.hornetq.tests.util.UnitTestCase; @@ -56,9 +56,9 @@ ClientConsumer consumer = clientSession.createConsumer(qName1); ClientMessage m1 = createTextMessage("m1", clientSession); SimpleString rh = new SimpleString("SMID1"); - m1.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m1.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); ClientMessage m2 = createTextMessage("m2", clientSession); - m2.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m2.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); producer.send(m1); producer.send(m2); clientSession.start(); @@ -75,13 +75,13 @@ SimpleString messageId1 = new SimpleString("SMID1"); SimpleString messageId2 = new SimpleString("SMID2"); ClientMessage m1 = createTextMessage("m1", clientSession); - m1.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, messageId1); + m1.putStringProperty(Message.HDR_LAST_VALUE_NAME, messageId1); ClientMessage m2 = createTextMessage("m2", clientSession); - m2.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, messageId2); + m2.putStringProperty(Message.HDR_LAST_VALUE_NAME, messageId2); ClientMessage m3 = createTextMessage("m3", clientSession); - m3.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, messageId1); + m3.putStringProperty(Message.HDR_LAST_VALUE_NAME, messageId1); ClientMessage m4 = createTextMessage("m4", clientSession); - m4.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, messageId2); + m4.putStringProperty(Message.HDR_LAST_VALUE_NAME, messageId2); producer.send(m1); producer.send(m2); producer.send(m3); @@ -103,9 +103,9 @@ ClientConsumer consumer = clientSession.createConsumer(qName1); ClientMessage m1 = createTextMessage("m1", clientSession); SimpleString rh = new SimpleString("SMID1"); - m1.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m1.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); ClientMessage m2 = createTextMessage("m2", clientSession); - m2.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m2.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); producer.send(m1); clientSession.start(); ClientMessage m = consumer.receive(1000); @@ -125,9 +125,9 @@ ClientConsumer consumer = clientSession.createConsumer(qName1); ClientMessage m1 = createTextMessage("m1", clientSession); SimpleString rh = new SimpleString("SMID1"); - m1.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m1.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); ClientMessage m2 = createTextMessage("m2", clientSession); - m2.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m2.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); producer.send(m1); clientSession.start(); ClientMessage m = consumer.receive(1000); @@ -151,17 +151,17 @@ SimpleString rh = new SimpleString("SMID1"); ClientMessage m1 = createTextMessage("m1", clientSession); - m1.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m1.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); ClientMessage m2 = createTextMessage("m2", clientSession); - m2.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m2.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); ClientMessage m3 = createTextMessage("m3", clientSession); - m3.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m3.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); ClientMessage m4 = createTextMessage("m4", clientSession); - m4.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m4.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); ClientMessage m5 = createTextMessage("m5", clientSession); - m5.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m5.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); ClientMessage m6 = createTextMessage("m6", clientSession); - m6.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m6.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); clientSession.start(); producer.send(m1); ClientMessage m = consumer.receive(1000); @@ -204,9 +204,9 @@ ClientConsumer consumer = clientSessionTxReceives.createConsumer(qName1); ClientMessage m1 = createTextMessage("m1", clientSession); SimpleString rh = new SimpleString("SMID1"); - m1.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m1.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); ClientMessage m2 = createTextMessage("m2", clientSession); - m2.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m2.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); producer.send(m1); producer.send(m2); clientSessionTxReceives.start(); @@ -223,13 +223,13 @@ SimpleString messageId1 = new SimpleString("SMID1"); SimpleString messageId2 = new SimpleString("SMID2"); ClientMessage m1 = createTextMessage("m1", clientSession); - m1.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, messageId1); + m1.putStringProperty(Message.HDR_LAST_VALUE_NAME, messageId1); ClientMessage m2 = createTextMessage("m2", clientSession); - m2.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, messageId2); + m2.putStringProperty(Message.HDR_LAST_VALUE_NAME, messageId2); ClientMessage m3 = createTextMessage("m3", clientSession); - m3.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, messageId1); + m3.putStringProperty(Message.HDR_LAST_VALUE_NAME, messageId1); ClientMessage m4 = createTextMessage("m4", clientSession); - m4.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, messageId2); + m4.putStringProperty(Message.HDR_LAST_VALUE_NAME, messageId2); producer.send(m1); producer.send(m2); producer.send(m3); @@ -255,13 +255,13 @@ SimpleString messageId1 = new SimpleString("SMID1"); SimpleString messageId2 = new SimpleString("SMID2"); ClientMessage m1 = createTextMessage("m1", clientSession); - m1.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, messageId1); + m1.putStringProperty(Message.HDR_LAST_VALUE_NAME, messageId1); ClientMessage m2 = createTextMessage("m2", clientSession); - m2.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, messageId2); + m2.putStringProperty(Message.HDR_LAST_VALUE_NAME, messageId2); ClientMessage m3 = createTextMessage("m3", clientSession); - m3.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, messageId1); + m3.putStringProperty(Message.HDR_LAST_VALUE_NAME, messageId1); ClientMessage m4 = createTextMessage("m4", clientSession); - m4.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, messageId2); + m4.putStringProperty(Message.HDR_LAST_VALUE_NAME, messageId2); producer.send(m1); producer.send(m2); clientSessionTxReceives.start(); @@ -300,17 +300,17 @@ ClientConsumer consumer = clientSessionTxSends.createConsumer(qName1); SimpleString rh = new SimpleString("SMID1"); ClientMessage m1 = createTextMessage("m1", clientSession); - m1.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m1.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); ClientMessage m2 = createTextMessage("m2", clientSession); - m2.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m2.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); ClientMessage m3 = createTextMessage("m3", clientSession); - m3.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m3.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); ClientMessage m4 = createTextMessage("m4", clientSession); - m4.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m4.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); ClientMessage m5 = createTextMessage("m5", clientSession); - m5.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m5.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); ClientMessage m6 = createTextMessage("m6", clientSession); - m6.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m6.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); producer.send(m1); producer.send(m2); producer.send(m3); @@ -331,22 +331,22 @@ ClientConsumer consumer = clientSession.createConsumer(qName1); SimpleString rh = new SimpleString("SMID1"); ClientMessage m1 = createTextMessage("m1", clientSession); - m1.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m1.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); m1.setDurable(true); ClientMessage m2 = createTextMessage("m2", clientSession); - m2.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m2.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); m2.setDurable(true); ClientMessage m3 = createTextMessage("m3", clientSession); - m3.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m3.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); m3.setDurable(true); ClientMessage m4 = createTextMessage("m4", clientSession); - m4.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m4.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); m4.setDurable(true); ClientMessage m5 = createTextMessage("m5", clientSession); - m5.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m5.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); m5.setDurable(true); ClientMessage m6 = createTextMessage("m6", clientSession); - m6.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m6.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); m6.setDurable(true); producer.send(m1); producer.send(m2); @@ -369,22 +369,22 @@ ClientConsumer consumer = clientSessionTxSends.createConsumer(qName1); SimpleString rh = new SimpleString("SMID1"); ClientMessage m1 = createTextMessage("m1", clientSession); - m1.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m1.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); m1.setDurable(true); ClientMessage m2 = createTextMessage("m2", clientSession); - m2.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m2.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); m2.setDurable(true); ClientMessage m3 = createTextMessage("m3", clientSession); - m3.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m3.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); m3.setDurable(true); ClientMessage m4 = createTextMessage("m4", clientSession); - m4.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m4.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); m4.setDurable(true); ClientMessage m5 = createTextMessage("m5", clientSession); - m5.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m5.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); m5.setDurable(true); ClientMessage m6 = createTextMessage("m6", clientSession); - m6.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m6.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); m6.setDurable(true); producer.send(m1); producer.send(m2); @@ -408,22 +408,22 @@ ClientConsumer consumer = clientSession.createConsumer(qName1); SimpleString rh = new SimpleString("SMID1"); ClientMessage m1 = createTextMessage("m1", clientSession); - m1.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m1.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); m1.setDurable(true); ClientMessage m2 = createTextMessage("m2", clientSession); - m2.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m2.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); m2.setDurable(true); ClientMessage m3 = createTextMessage("m3", clientSession); - m3.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m3.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); m3.setDurable(true); ClientMessage m4 = createTextMessage("m4", clientSession); - m4.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m4.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); m4.setDurable(true); ClientMessage m5 = createTextMessage("m5", clientSession); - m5.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m5.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); m5.setDurable(true); ClientMessage m6 = createTextMessage("m6", clientSession); - m6.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m6.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); m6.setDurable(true); clientSession.start(); producer.send(m1); @@ -464,22 +464,22 @@ ClientConsumer consumer = clientSessionTxReceives.createConsumer(qName1); SimpleString rh = new SimpleString("SMID1"); ClientMessage m1 = createTextMessage("m1", clientSession); - m1.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m1.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); m1.setDurable(true); ClientMessage m2 = createTextMessage("m2", clientSession); - m2.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m2.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); m2.setDurable(true); ClientMessage m3 = createTextMessage("m3", clientSession); - m3.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m3.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); m3.setDurable(true); ClientMessage m4 = createTextMessage("m4", clientSession); - m4.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m4.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); m4.setDurable(true); ClientMessage m5 = createTextMessage("m5", clientSession); - m5.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m5.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); m5.setDurable(true); ClientMessage m6 = createTextMessage("m6", clientSession); - m6.putStringProperty(MessageImpl.HDR_LAST_VALUE_NAME, rh); + m6.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh); m6.setDurable(true); clientSessionTxReceives.start(); producer.send(m1);