[jboss-cvs] JBoss Messaging SVN: r6319 - in trunk: examples/jms/clustered-queue/config and 19 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Apr 6 09:11:28 EDT 2009
Author: timfox
Date: 2009-04-06 09:11:27 -0400 (Mon, 06 Apr 2009)
New Revision: 6319
Modified:
trunk/examples/jms/browser/config/jbm-configuration.xml
trunk/examples/jms/clustered-queue/config/clustered-queue-example-configuration0.xml
trunk/examples/jms/clustered-queue/config/clustered-queue-example-configuration1.xml
trunk/examples/jms/dead-letter/config/jbm-configuration.xml
trunk/examples/jms/durable-subscription/config/jbm-configuration.xml
trunk/examples/jms/expiry/config/jbm-configuration.xml
trunk/examples/jms/large-message/config/jbm-configuration.xml
trunk/examples/jms/paging/config/jbm-configuration.xml
trunk/examples/jms/queue-requestor/config/jbm-configuration.xml
trunk/examples/jms/queue/config/jbm-configuration.xml
trunk/examples/jms/request-reply/config/jbm-configuration.xml
trunk/examples/jms/temp-queue/config/jbm-configuration.xml
trunk/examples/jms/topic-selector/config/jbm-configuration.xml
trunk/examples/jms/topic/config/jbm-configuration.xml
trunk/examples/jms/transactional/config/jbm-configuration.xml
trunk/src/config/jbm-configuration.xml
trunk/src/config/jbm-queues.xml
trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java
trunk/src/main/org/jboss/messaging/core/management/impl/QueueControl.java
trunk/src/main/org/jboss/messaging/core/postoffice/impl/PostOfficeImpl.java
trunk/src/main/org/jboss/messaging/core/server/Queue.java
trunk/src/main/org/jboss/messaging/core/server/impl/QueueImpl.java
trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSQueueControl.java
Log:
more tweaks
Modified: trunk/examples/jms/browser/config/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/browser/config/jbm-configuration.xml 2009-04-06 12:32:03 UTC (rev 6318)
+++ trunk/examples/jms/browser/config/jbm-configuration.xml 2009-04-06 13:11:27 UTC (rev 6319)
@@ -14,7 +14,7 @@
<wild-card-routing-enabled>true</wild-card-routing-enabled>
- <management-address>jbm.admin.management</management-address>
+ <management-address>jbm.management</management-address>
<management-notification-address>jbm.admin.notification</management-notification-address>
<!-- true to expose JBoss Messaging resources through JMX -->
Modified: trunk/examples/jms/clustered-queue/config/clustered-queue-example-configuration0.xml
===================================================================
--- trunk/examples/jms/clustered-queue/config/clustered-queue-example-configuration0.xml 2009-04-06 12:32:03 UTC (rev 6318)
+++ trunk/examples/jms/clustered-queue/config/clustered-queue-example-configuration0.xml 2009-04-06 13:11:27 UTC (rev 6319)
@@ -14,7 +14,7 @@
<wild-card-routing-enabled>true</wild-card-routing-enabled>
- <management-address>jbm.admin.management</management-address>
+ <management-address>jbm.management</management-address>
<management-notification-address>jbm.admin.notification</management-notification-address>
<!-- true to expose JBoss Messaging resources through JMX -->
Modified: trunk/examples/jms/clustered-queue/config/clustered-queue-example-configuration1.xml
===================================================================
--- trunk/examples/jms/clustered-queue/config/clustered-queue-example-configuration1.xml 2009-04-06 12:32:03 UTC (rev 6318)
+++ trunk/examples/jms/clustered-queue/config/clustered-queue-example-configuration1.xml 2009-04-06 13:11:27 UTC (rev 6319)
@@ -14,7 +14,7 @@
<wild-card-routing-enabled>true</wild-card-routing-enabled>
- <management-address>jbm.admin.management</management-address>
+ <management-address>jbm.management</management-address>
<management-notification-address>jbm.admin.notification</management-notification-address>
<!-- true to expose JBoss Messaging resources through JMX -->
Modified: trunk/examples/jms/dead-letter/config/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/dead-letter/config/jbm-configuration.xml 2009-04-06 12:32:03 UTC (rev 6318)
+++ trunk/examples/jms/dead-letter/config/jbm-configuration.xml 2009-04-06 13:11:27 UTC (rev 6319)
@@ -14,7 +14,7 @@
<wild-card-routing-enabled>true</wild-card-routing-enabled>
- <management-address>jbm.admin.management</management-address>
+ <management-address>jbm.management</management-address>
<management-notification-address>jbm.admin.notification</management-notification-address>
<!-- true to expose JBoss Messaging resources through JMX -->
Modified: trunk/examples/jms/durable-subscription/config/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/durable-subscription/config/jbm-configuration.xml 2009-04-06 12:32:03 UTC (rev 6318)
+++ trunk/examples/jms/durable-subscription/config/jbm-configuration.xml 2009-04-06 13:11:27 UTC (rev 6319)
@@ -14,7 +14,7 @@
<wild-card-routing-enabled>true</wild-card-routing-enabled>
- <management-address>jbm.admin.management</management-address>
+ <management-address>jbm.management</management-address>
<management-notification-address>jbm.admin.notification</management-notification-address>
<!-- true to expose JBoss Messaging resources through JMX -->
Modified: trunk/examples/jms/expiry/config/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/expiry/config/jbm-configuration.xml 2009-04-06 12:32:03 UTC (rev 6318)
+++ trunk/examples/jms/expiry/config/jbm-configuration.xml 2009-04-06 13:11:27 UTC (rev 6319)
@@ -14,7 +14,7 @@
<wild-card-routing-enabled>true</wild-card-routing-enabled>
- <management-address>jbm.admin.management</management-address>
+ <management-address>jbm.management</management-address>
<management-notification-address>jbm.admin.notification</management-notification-address>
<!-- true to expose JBoss Messaging resources through JMX -->
Modified: trunk/examples/jms/large-message/config/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/large-message/config/jbm-configuration.xml 2009-04-06 12:32:03 UTC (rev 6318)
+++ trunk/examples/jms/large-message/config/jbm-configuration.xml 2009-04-06 13:11:27 UTC (rev 6319)
@@ -14,7 +14,7 @@
<wild-card-routing-enabled>true</wild-card-routing-enabled>
- <management-address>jbm.admin.management</management-address>
+ <management-address>jbm.management</management-address>
<management-notification-address>jbm.admin.notification</management-notification-address>
<!-- true to expose JBoss Messaging resources through JMX -->
Modified: trunk/examples/jms/paging/config/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/paging/config/jbm-configuration.xml 2009-04-06 12:32:03 UTC (rev 6318)
+++ trunk/examples/jms/paging/config/jbm-configuration.xml 2009-04-06 13:11:27 UTC (rev 6319)
@@ -14,7 +14,7 @@
<wild-card-routing-enabled>true</wild-card-routing-enabled>
- <management-address>jbm.admin.management</management-address>
+ <management-address>jbm.management</management-address>
<management-notification-address>jbm.admin.notification</management-notification-address>
<!-- true to expose JBoss Messaging resources through JMX -->
Modified: trunk/examples/jms/queue/config/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/queue/config/jbm-configuration.xml 2009-04-06 12:32:03 UTC (rev 6318)
+++ trunk/examples/jms/queue/config/jbm-configuration.xml 2009-04-06 13:11:27 UTC (rev 6319)
@@ -14,7 +14,7 @@
<wild-card-routing-enabled>true</wild-card-routing-enabled>
- <management-address>jbm.admin.management</management-address>
+ <management-address>jbm.management</management-address>
<management-notification-address>jbm.admin.notification</management-notification-address>
<!-- true to expose JBoss Messaging resources through JMX -->
Modified: trunk/examples/jms/queue-requestor/config/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/queue-requestor/config/jbm-configuration.xml 2009-04-06 12:32:03 UTC (rev 6318)
+++ trunk/examples/jms/queue-requestor/config/jbm-configuration.xml 2009-04-06 13:11:27 UTC (rev 6319)
@@ -14,7 +14,7 @@
<wild-card-routing-enabled>true</wild-card-routing-enabled>
- <management-address>jbm.admin.management</management-address>
+ <management-address>jbm.management</management-address>
<management-notification-address>jbm.admin.notification</management-notification-address>
<!-- true to expose JBoss Messaging resources through JMX -->
Modified: trunk/examples/jms/request-reply/config/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/request-reply/config/jbm-configuration.xml 2009-04-06 12:32:03 UTC (rev 6318)
+++ trunk/examples/jms/request-reply/config/jbm-configuration.xml 2009-04-06 13:11:27 UTC (rev 6319)
@@ -14,7 +14,7 @@
<wild-card-routing-enabled>true</wild-card-routing-enabled>
- <management-address>jbm.admin.management</management-address>
+ <management-address>jbm.management</management-address>
<management-notification-address>jbm.admin.notification</management-notification-address>
<!-- true to expose JBoss Messaging resources through JMX -->
Modified: trunk/examples/jms/temp-queue/config/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/temp-queue/config/jbm-configuration.xml 2009-04-06 12:32:03 UTC (rev 6318)
+++ trunk/examples/jms/temp-queue/config/jbm-configuration.xml 2009-04-06 13:11:27 UTC (rev 6319)
@@ -14,7 +14,7 @@
<wild-card-routing-enabled>true</wild-card-routing-enabled>
- <management-address>jbm.admin.management</management-address>
+ <management-address>jbm.management</management-address>
<management-notification-address>jbm.admin.notification</management-notification-address>
<!-- true to expose JBoss Messaging resources through JMX -->
Modified: trunk/examples/jms/topic/config/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/topic/config/jbm-configuration.xml 2009-04-06 12:32:03 UTC (rev 6318)
+++ trunk/examples/jms/topic/config/jbm-configuration.xml 2009-04-06 13:11:27 UTC (rev 6319)
@@ -14,7 +14,7 @@
<wild-card-routing-enabled>true</wild-card-routing-enabled>
- <management-address>jbm.admin.management</management-address>
+ <management-address>jbm.management</management-address>
<management-notification-address>jbm.admin.notification</management-notification-address>
<!-- true to expose JBoss Messaging resources through JMX -->
Modified: trunk/examples/jms/topic-selector/config/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/topic-selector/config/jbm-configuration.xml 2009-04-06 12:32:03 UTC (rev 6318)
+++ trunk/examples/jms/topic-selector/config/jbm-configuration.xml 2009-04-06 13:11:27 UTC (rev 6319)
@@ -14,7 +14,7 @@
<wild-card-routing-enabled>true</wild-card-routing-enabled>
- <management-address>jbm.admin.management</management-address>
+ <management-address>jbm.management</management-address>
<management-notification-address>jbm.admin.notification</management-notification-address>
<!-- true to expose JBoss Messaging resources through JMX -->
Modified: trunk/examples/jms/transactional/config/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/transactional/config/jbm-configuration.xml 2009-04-06 12:32:03 UTC (rev 6318)
+++ trunk/examples/jms/transactional/config/jbm-configuration.xml 2009-04-06 13:11:27 UTC (rev 6319)
@@ -14,7 +14,7 @@
<wild-card-routing-enabled>true</wild-card-routing-enabled>
- <management-address>jbm.admin.management</management-address>
+ <management-address>jbm.management</management-address>
<management-notification-address>jbm.admin.notification</management-notification-address>
<!-- true to expose JBoss Messaging resources through JMX -->
Modified: trunk/src/config/jbm-configuration.xml
===================================================================
--- trunk/src/config/jbm-configuration.xml 2009-04-06 12:32:03 UTC (rev 6318)
+++ trunk/src/config/jbm-configuration.xml 2009-04-06 13:11:27 UTC (rev 6319)
@@ -14,7 +14,7 @@
<wild-card-routing-enabled>true</wild-card-routing-enabled>
- <management-address>jbm.admin.management</management-address>
+ <management-address>jbm.management</management-address>
<management-notification-address>jbm.admin.notification</management-notification-address>
<!-- true to expose JBoss Messaging resources through JMX -->
Modified: trunk/src/config/jbm-queues.xml
===================================================================
--- trunk/src/config/jbm-queues.xml 2009-04-06 12:32:03 UTC (rev 6318)
+++ trunk/src/config/jbm-queues.xml 2009-04-06 13:11:27 UTC (rev 6319)
@@ -3,7 +3,7 @@
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
<!-- manangement address -->
- <security match="jbm.admin.management">
+ <security match="jbm.management">
<!-- only the admin role can interact with the management address -->
<permission type="consume" roles="admin"/>
<permission type="send" roles="admin"/>
Modified: trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java 2009-04-06 12:32:03 UTC (rev 6318)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java 2009-04-06 13:11:27 UTC (rev 6319)
@@ -103,7 +103,7 @@
public static final long DEFAULT_TRANSACTION_TIMEOUT_SCAN_PERIOD = 1000;
- public static final SimpleString DEFAULT_MANAGEMENT_ADDRESS = new SimpleString("jbm.admin.management");
+ public static final SimpleString DEFAULT_MANAGEMENT_ADDRESS = new SimpleString("jbm.management");
public static final SimpleString DEFAULT_MANAGEMENT_NOTIFICATION_ADDRESS = new SimpleString("jbm.admin.notification");
Modified: trunk/src/main/org/jboss/messaging/core/management/impl/QueueControl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/impl/QueueControl.java 2009-04-06 12:32:03 UTC (rev 6318)
+++ trunk/src/main/org/jboss/messaging/core/management/impl/QueueControl.java 2009-04-06 13:11:27 UTC (rev 6319)
@@ -307,7 +307,7 @@
public boolean expireMessage(final long messageID) throws Exception
{
- return queue.expireMessage(messageID);
+ return queue.expireReference(messageID);
}
public int expireMessages(final String filterStr) throws Exception
@@ -316,7 +316,7 @@
{
Filter filter = FilterImpl.createFilter(filterStr);
- return queue.expireMessages(filter);
+ return queue.expireReferences(filter);
}
catch (MessagingException e)
{
@@ -333,7 +333,7 @@
throw new IllegalArgumentException("No queue found for " + otherQueueName);
}
- return queue.moveMessage(messageID, binding.getAddress());
+ return queue.moveReference(messageID, binding.getAddress());
}
public int moveMatchingMessages(final String filterStr, final String otherQueueName) throws Exception
@@ -347,7 +347,7 @@
throw new IllegalArgumentException("No queue found for " + otherQueueName);
}
- return queue.moveMessages(filter, binding.getAddress());
+ return queue.moveReferences(filter, binding.getAddress());
}
public int moveAllMessages(String otherQueueName) throws Exception
@@ -367,7 +367,7 @@
throw new IllegalArgumentException("invalid newPriority value: " + newPriority +
". It must be between 0 and 9 (both included)");
}
- return queue.changeMessagePriority(messageID, (byte)newPriority);
+ return queue.changeReferencePriority(messageID, (byte)newPriority);
}
public CompositeData listMessageCounter()
Modified: trunk/src/main/org/jboss/messaging/core/postoffice/impl/PostOfficeImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/postoffice/impl/PostOfficeImpl.java 2009-04-06 12:32:03 UTC (rev 6318)
+++ trunk/src/main/org/jboss/messaging/core/postoffice/impl/PostOfficeImpl.java 2009-04-06 13:11:27 UTC (rev 6319)
@@ -618,8 +618,6 @@
if (cache != null)
{
- cache.addToCache(duplicateID, tx);
-
if (tx == null)
{
// We need to store the duplicate id atomically with the message storage, so we need to create a tx for this
@@ -628,6 +626,8 @@
startedTx = true;
}
+
+ cache.addToCache(duplicateID, tx);
}
if (tx == null)
@@ -908,7 +908,7 @@
{
try
{
- queue.expireMessages();
+ queue.expireReferences();
}
catch (Exception e)
{
Modified: trunk/src/main/org/jboss/messaging/core/server/Queue.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/Queue.java 2009-04-06 12:32:03 UTC (rev 6318)
+++ trunk/src/main/org/jboss/messaging/core/server/Queue.java 2009-04-06 13:11:27 UTC (rev 6319)
@@ -110,24 +110,24 @@
int deleteMatchingReferences(Filter filter) throws Exception;
- boolean expireMessage(long messageID) throws Exception;
+ boolean expireReference(long messageID) throws Exception;
/**
- * Expire all the messages in the queue which matches the filter
+ * Expire all the references in the queue which matches the filter
*/
- int expireMessages(Filter filter) throws Exception;
+ int expireReferences(Filter filter) throws Exception;
- void expireMessages() throws Exception;
+ void expireReferences() throws Exception;
void expire(MessageReference ref) throws Exception;
boolean sendMessageToDeadLetterAddress(long messageID) throws Exception;
- boolean changeMessagePriority(long messageID, byte newPriority) throws Exception;
+ boolean changeReferencePriority(long messageID, byte newPriority) throws Exception;
- boolean moveMessage(long messageID, SimpleString toAddress) throws Exception;
+ boolean moveReference(long messageID, SimpleString toAddress) throws Exception;
- int moveMessages(Filter filter, SimpleString toAddress) throws Exception;
+ int moveReferences(Filter filter, SimpleString toAddress) throws Exception;
void setBackup();
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/QueueImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/QueueImpl.java 2009-04-06 12:32:03 UTC (rev 6318)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/QueueImpl.java 2009-04-06 13:11:27 UTC (rev 6319)
@@ -773,7 +773,7 @@
return deleted;
}
- public synchronized boolean expireMessage(final long messageID) throws Exception
+ public synchronized boolean expireReference(final long messageID) throws Exception
{
Iterator<MessageReference> iter = messageReferences.iterator();
@@ -791,7 +791,7 @@
return false;
}
- public synchronized int expireMessages(final Filter filter) throws Exception
+ public synchronized int expireReferences(final Filter filter) throws Exception
{
Transaction tx = new TransactionImpl(storageManager);
@@ -815,13 +815,13 @@
return count;
}
- public synchronized void expireMessages() throws Exception
+ public synchronized void expireReferences() throws Exception
{
for (MessageReference expiringMessageReference : expiringMessageReferences)
{
if (expiringMessageReference.getMessage().isExpired())
{
- expireMessage(expiringMessageReference.getMessage().getMessageID());
+ expireReference(expiringMessageReference.getMessage().getMessageID());
}
}
}
@@ -844,7 +844,7 @@
return false;
}
- public synchronized boolean moveMessage(final long messageID, final SimpleString toAddress) throws Exception
+ public synchronized boolean moveReference(final long messageID, final SimpleString toAddress) throws Exception
{
Iterator<MessageReference> iter = messageReferences.iterator();
@@ -862,7 +862,7 @@
return false;
}
- public synchronized int moveMessages(final Filter filter, final SimpleString toAddress) throws Exception
+ public synchronized int moveReferences(final Filter filter, final SimpleString toAddress) throws Exception
{
Transaction tx = new TransactionImpl(storageManager);
@@ -898,7 +898,7 @@
return count;
}
- public synchronized boolean changeMessagePriority(final long messageID, final byte newPriority) throws Exception
+ public synchronized boolean changeReferencePriority(final long messageID, final byte newPriority) throws Exception
{
List<MessageReference> refs = list(null);
for (MessageReference ref : refs)
@@ -1100,7 +1100,6 @@
and original message id
*/
- // FIXME - this won't work with replication!!!!!!!!!!!
long newMessageId = storageManager.generateUniqueID();
ServerMessage copy = message.copy(newMessageId);
@@ -1180,7 +1179,6 @@
{
Transaction tx = new TransactionImpl(storageManager);
- // FIXME: JBMESSAGING-1468
ServerMessage copyMessage = makeCopy(ref, expiry);
copyMessage.setDestination(address);
@@ -1425,7 +1423,6 @@
// the Address for the Queue
PagingStore store = null;
- // FIXME - this shouldn't be called when references are expired etc
if (pagingManager != null)
{
store = pagingManager.getPageStore(ref.getMessage().getDestination());
Modified: trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSQueueControl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSQueueControl.java 2009-04-06 12:32:03 UTC (rev 6318)
+++ trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSQueueControl.java 2009-04-06 13:11:27 UTC (rev 6319)
@@ -276,7 +276,7 @@
{
throw new IllegalArgumentException("No message found for JMSMessageID: " + messageID);
}
- return coreQueue.expireMessage(refs.get(0).getMessage().getMessageID());
+ return coreQueue.expireReference(refs.get(0).getMessage().getMessageID());
}
public int expireMessages(final String filterStr) throws Exception
@@ -284,7 +284,7 @@
try
{
Filter filter = createFilterFromJMSSelector(filterStr);
- return coreQueue.expireMessages(filter);
+ return coreQueue.expireReferences(filter);
}
catch (MessagingException e)
{
@@ -316,7 +316,7 @@
{
throw new IllegalArgumentException("No message found for JMSMessageID: " + messageID);
}
- return coreQueue.changeMessagePriority(refs.get(0).getMessage().getMessageID(), (byte)newPriority);
+ return coreQueue.changeReferencePriority(refs.get(0).getMessage().getMessageID(), (byte)newPriority);
}
public boolean moveMessage(String messageID, String otherQueueName) throws Exception
@@ -334,7 +334,7 @@
throw new IllegalArgumentException("No message found for JMSMessageID: " + messageID);
}
- return coreQueue.moveMessage(refs.get(0).getMessage().getMessageID(), binding.getAddress());
+ return coreQueue.moveReference(refs.get(0).getMessage().getMessageID(), binding.getAddress());
}
public int moveMatchingMessages(String filterStr, String otherQueueName) throws Exception
@@ -347,7 +347,7 @@
}
Filter filter = createFilterFromJMSSelector(filterStr);
- return coreQueue.moveMessages(filter, otherBinding.getAddress());
+ return coreQueue.moveReferences(filter, otherBinding.getAddress());
}
public int moveAllMessages(String otherQueueName) throws Exception
More information about the jboss-cvs-commits
mailing list