[hornetq-commits] JBoss hornetq SVN: r9084 - in trunk: examples/javaee/mdb-bmt/server and 102 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Fri Apr 9 10:04:06 EDT 2010
Author: jmesnil
Date: 2010-04-09 10:04:00 -0400 (Fri, 09 Apr 2010)
New Revision: 9084
Modified:
trunk/docs/user-manual/en/security.xml
trunk/examples/javaee/mdb-bmt/server/hornetq-configuration.xml
trunk/examples/javaee/mdb-cmt-setrollbackonly/server/hornetq-configuration.xml
trunk/examples/javaee/mdb-cmt-tx-local/server/hornetq-configuration.xml
trunk/examples/javaee/mdb-cmt-tx-not-supported/server/hornetq-configuration.xml
trunk/examples/javaee/mdb-cmt-tx-required/server/hornetq-configuration.xml
trunk/examples/javaee/mdb-message-selector/server/hornetq-configuration.xml
trunk/examples/javaee/mdb-tx-send/server/hornetq-configuration.xml
trunk/examples/jms/applet/server0/hornetq-configuration.xml
trunk/examples/jms/application-layer-failover/server0/hornetq-configuration.xml
trunk/examples/jms/application-layer-failover/server1/hornetq-configuration.xml
trunk/examples/jms/bridge/server0/hornetq-configuration.xml
trunk/examples/jms/bridge/server1/hornetq-configuration.xml
trunk/examples/jms/browser/server0/hornetq-configuration.xml
trunk/examples/jms/client-side-load-balancing/server0/hornetq-configuration.xml
trunk/examples/jms/client-side-load-balancing/server1/hornetq-configuration.xml
trunk/examples/jms/client-side-load-balancing/server2/hornetq-configuration.xml
trunk/examples/jms/clustered-durable-subscription/server0/hornetq-configuration.xml
trunk/examples/jms/clustered-durable-subscription/server1/hornetq-configuration.xml
trunk/examples/jms/clustered-grouping/server0/hornetq-configuration.xml
trunk/examples/jms/clustered-grouping/server1/hornetq-configuration.xml
trunk/examples/jms/clustered-grouping/server2/hornetq-configuration.xml
trunk/examples/jms/clustered-queue/server0/hornetq-configuration.xml
trunk/examples/jms/clustered-queue/server1/hornetq-configuration.xml
trunk/examples/jms/clustered-topic/server0/hornetq-configuration.xml
trunk/examples/jms/clustered-topic/server1/hornetq-configuration.xml
trunk/examples/jms/consumer-rate-limit/server0/hornetq-configuration.xml
trunk/examples/jms/dead-letter/server0/hornetq-configuration.xml
trunk/examples/jms/delayed-redelivery/server0/hornetq-configuration.xml
trunk/examples/jms/divert/server0/hornetq-configuration.xml
trunk/examples/jms/divert/server1/hornetq-configuration.xml
trunk/examples/jms/durable-subscription/server0/hornetq-configuration.xml
trunk/examples/jms/expiry/server0/hornetq-configuration.xml
trunk/examples/jms/http-transport/server0/hornetq-configuration.xml
trunk/examples/jms/instantiate-connection-factory/server0/hornetq-configuration.xml
trunk/examples/jms/interceptor/server0/hornetq-configuration.xml
trunk/examples/jms/jaas/server0/hornetq-configuration.xml
trunk/examples/jms/jms-bridge/server0/hornetq-configuration.xml
trunk/examples/jms/jms-bridge/server1/hornetq-configuration.xml
trunk/examples/jms/jmx/server0/hornetq-configuration.xml
trunk/examples/jms/large-message/server0/hornetq-configuration.xml
trunk/examples/jms/last-value-queue/server0/hornetq-configuration.xml
trunk/examples/jms/management-notifications/readme.html
trunk/examples/jms/management-notifications/server0/hornetq-configuration.xml
trunk/examples/jms/management/server0/hornetq-configuration.xml
trunk/examples/jms/message-counters/server0/hornetq-configuration.xml
trunk/examples/jms/message-group/server0/hornetq-configuration.xml
trunk/examples/jms/message-group2/server0/hornetq-configuration.xml
trunk/examples/jms/message-priority/server0/hornetq-configuration.xml
trunk/examples/jms/no-consumer-buffering/server0/hornetq-configuration.xml
trunk/examples/jms/non-transaction-failover/server0/hornetq-configuration.xml
trunk/examples/jms/non-transaction-failover/server1/hornetq-configuration.xml
trunk/examples/jms/paging/server0/hornetq-configuration.xml
trunk/examples/jms/pre-acknowledge/server0/hornetq-configuration.xml
trunk/examples/jms/producer-rate-limit/server0/hornetq-configuration.xml
trunk/examples/jms/queue-message-redistribution/server0/hornetq-configuration.xml
trunk/examples/jms/queue-message-redistribution/server1/hornetq-configuration.xml
trunk/examples/jms/queue-requestor/server0/hornetq-configuration.xml
trunk/examples/jms/queue-selector/server0/hornetq-configuration.xml
trunk/examples/jms/queue/server0/hornetq-configuration.xml
trunk/examples/jms/reattach-node/server0/hornetq-configuration.xml
trunk/examples/jms/request-reply/server0/hornetq-configuration.xml
trunk/examples/jms/scheduled-message/server0/hornetq-configuration.xml
trunk/examples/jms/security/readme.html
trunk/examples/jms/security/server0/hornetq-configuration.xml
trunk/examples/jms/send-acknowledgements/server0/hornetq-configuration.xml
trunk/examples/jms/ssl-enabled/server0/hornetq-configuration.xml
trunk/examples/jms/static-selector-jms/server0/hornetq-configuration.xml
trunk/examples/jms/static-selector/server0/hornetq-configuration.xml
trunk/examples/jms/stomp/server0/hornetq-configuration.xml
trunk/examples/jms/symmetric-cluster/server0/hornetq-configuration.xml
trunk/examples/jms/symmetric-cluster/server1/hornetq-configuration.xml
trunk/examples/jms/symmetric-cluster/server2/hornetq-configuration.xml
trunk/examples/jms/symmetric-cluster/server3/hornetq-configuration.xml
trunk/examples/jms/symmetric-cluster/server4/hornetq-configuration.xml
trunk/examples/jms/symmetric-cluster/server5/hornetq-configuration.xml
trunk/examples/jms/temp-queue/server0/hornetq-configuration.xml
trunk/examples/jms/topic-hierarchies/server0/hornetq-configuration.xml
trunk/examples/jms/topic-selector-example1/server0/hornetq-configuration.xml
trunk/examples/jms/topic-selector-example2/server0/hornetq-configuration.xml
trunk/examples/jms/topic/server0/hornetq-configuration.xml
trunk/examples/jms/transaction-failover/server0/hornetq-configuration.xml
trunk/examples/jms/transaction-failover/server1/hornetq-configuration.xml
trunk/examples/jms/transactional/server0/hornetq-configuration.xml
trunk/examples/jms/xa-heuristic/server0/hornetq-configuration.xml
trunk/examples/jms/xa-receive/server0/hornetq-configuration.xml
trunk/examples/jms/xa-send/server0/hornetq-configuration.xml
trunk/examples/jms/xa-with-jta/server0/hornetq-configuration.xml
trunk/src/config/jboss-as/clustered/hornetq-configuration.xml
trunk/src/config/jboss-as/non-clustered/hornetq-configuration.xml
trunk/src/config/stand-alone/clustered/hornetq-configuration.xml
trunk/src/config/stand-alone/non-clustered/hornetq-configuration.xml
trunk/src/config/trunk/clustered/hornetq-configuration.xml
trunk/src/config/trunk/non-clustered/hornetq-configuration.xml
trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java
trunk/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java
trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java
trunk/src/main/org/hornetq/core/persistence/config/PersistedRoles.java
trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
trunk/src/main/org/hornetq/utils/SecurityFormatter.java
trunk/tests/config/ConfigurationTest-full-config.xml
trunk/tests/jms-tests/config/hornetq-queues.xml
trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java
trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/SecurityDeployerTest.java
Log:
https://jira.jboss.org/jira/browse/HORNETQ-309: Consistent naming of non-durable queues permissions
* make sure we consistently use createNonDurableQueue/deleteNonDurableQueue permissions in the code, example, doc, etc.
* for compatibility sake, createTempQueue/deleteTempQueue is still supported by the XML configuration file but is not advertised by the doc
Modified: trunk/docs/user-manual/en/security.xml
===================================================================
--- trunk/docs/user-manual/en/security.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/docs/user-manual/en/security.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -47,12 +47,12 @@
delete a durable queue under matching addresses.</para>
</listitem>
<listitem>
- <para><literal>createTempQueue</literal>. This permission allows the user to create
- a temporary queue under matching addresses.</para>
+ <para><literal>createNonDurableQueue</literal>. This permission allows the user to create
+ a non-durable queue under matching addresses.</para>
</listitem>
<listitem>
- <para><literal>deleteTempQueue</literal>. This permission allows the user to delete
- a temporarry queue under matching addresses.</para>
+ <para><literal>deleteNonDurableQueue</literal>. This permission allows the user to delete
+ a non-durable queue under matching addresses.</para>
</listitem>
<listitem>
<para><literal>send</literal>. This permission allows the user to send a message to
@@ -78,8 +78,8 @@
<security-setting match="globalqueues.europe.#">
<permission type="createDurableQueue" roles="admin"/>
<permission type="deleteDurableQueue" roles="admin"/>
- <permission type="createTempQueue" roles="admin, guest, europe-users"/>
- <permission type="deleteTempQueue" roles="admin, guest, europe-users"/>
+ <permission type="createNonDurableQueue" roles="admin, guest, europe-users"/>
+ <permission type="deleteNonDurableQueue" roles="admin, guest, europe-users"/>
<permission type="send" roles="admin, europe-users"/>
<permission type="consume" roles="admin, europe-users"/>
</security-setting>
@@ -124,8 +124,8 @@
'globalqueues.europe.orders.plastics' the only permissions that exist are <literal
>send</literal> and <literal>consume</literal> for the role europe-users. The
permissions <literal>createDurableQueue</literal>, <literal
- >deleteDurableQueue</literal>, <literal>createTempQueue</literal>, <literal
- >deleteTempQueue</literal> are not inherited from the other security-setting
+ >deleteDurableQueue</literal>, <literal>createNonDurableQueue</literal>, <literal
+ >deleteNonDurableQueue</literal> are not inherited from the other security-setting
block.</para>
<para>By not inheriting permissions, it allows you to effectively deny permissions in more
specific security-setting blocks by simply not specifying them. Otherwise it would not
Modified: trunk/examples/javaee/mdb-bmt/server/hornetq-configuration.xml
===================================================================
--- trunk/examples/javaee/mdb-bmt/server/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/javaee/mdb-bmt/server/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -42,8 +42,8 @@
<security-settings>
<security-setting match="#">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/javaee/mdb-cmt-setrollbackonly/server/hornetq-configuration.xml
===================================================================
--- trunk/examples/javaee/mdb-cmt-setrollbackonly/server/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/javaee/mdb-cmt-setrollbackonly/server/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -42,8 +42,8 @@
<security-settings>
<security-setting match="#">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/javaee/mdb-cmt-tx-local/server/hornetq-configuration.xml
===================================================================
--- trunk/examples/javaee/mdb-cmt-tx-local/server/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/javaee/mdb-cmt-tx-local/server/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -42,8 +42,8 @@
<security-settings>
<security-setting match="#">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/javaee/mdb-cmt-tx-not-supported/server/hornetq-configuration.xml
===================================================================
--- trunk/examples/javaee/mdb-cmt-tx-not-supported/server/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/javaee/mdb-cmt-tx-not-supported/server/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -42,8 +42,8 @@
<security-settings>
<security-setting match="#">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/javaee/mdb-cmt-tx-required/server/hornetq-configuration.xml
===================================================================
--- trunk/examples/javaee/mdb-cmt-tx-required/server/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/javaee/mdb-cmt-tx-required/server/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -42,8 +42,8 @@
<security-settings>
<security-setting match="#">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/javaee/mdb-message-selector/server/hornetq-configuration.xml
===================================================================
--- trunk/examples/javaee/mdb-message-selector/server/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/javaee/mdb-message-selector/server/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -42,8 +42,8 @@
<security-settings>
<security-setting match="#">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/javaee/mdb-tx-send/server/hornetq-configuration.xml
===================================================================
--- trunk/examples/javaee/mdb-tx-send/server/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/javaee/mdb-tx-send/server/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -42,8 +42,8 @@
<security-settings>
<security-setting match="#">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/applet/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/applet/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/applet/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.topic.exampleTopic">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/application-layer-failover/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/application-layer-failover/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/application-layer-failover/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -26,8 +26,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/application-layer-failover/server1/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/application-layer-failover/server1/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/application-layer-failover/server1/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -26,8 +26,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/bridge/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/bridge/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/bridge/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -52,8 +52,8 @@
<security-setting match="jms.queue.#">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/bridge/server1/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/bridge/server1/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/bridge/server1/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -26,8 +26,8 @@
<security-setting match="jms.queue.#">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/browser/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/browser/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/browser/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/client-side-load-balancing/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/client-side-load-balancing/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/client-side-load-balancing/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -46,8 +46,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/client-side-load-balancing/server1/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/client-side-load-balancing/server1/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/client-side-load-balancing/server1/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -47,8 +47,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/client-side-load-balancing/server2/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/client-side-load-balancing/server2/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/client-side-load-balancing/server2/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -45,8 +45,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/clustered-durable-subscription/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/clustered-durable-subscription/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/clustered-durable-subscription/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -56,8 +56,8 @@
<security-setting match="jms.topic.exampleTopic">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/clustered-durable-subscription/server1/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/clustered-durable-subscription/server1/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/clustered-durable-subscription/server1/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -56,8 +56,8 @@
<security-setting match="jms.topic.exampleTopic">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/clustered-grouping/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/clustered-grouping/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/clustered-grouping/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -62,8 +62,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/clustered-grouping/server1/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/clustered-grouping/server1/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/clustered-grouping/server1/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -61,8 +61,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/clustered-grouping/server2/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/clustered-grouping/server2/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/clustered-grouping/server2/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -61,8 +61,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/clustered-queue/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/clustered-queue/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/clustered-queue/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -56,8 +56,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/clustered-queue/server1/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/clustered-queue/server1/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/clustered-queue/server1/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -55,8 +55,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/clustered-topic/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/clustered-topic/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/clustered-topic/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -57,8 +57,8 @@
<security-setting match="jms.topic.exampleTopic">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/clustered-topic/server1/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/clustered-topic/server1/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/clustered-topic/server1/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -55,8 +55,8 @@
<security-setting match="jms.topic.exampleTopic">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/consumer-rate-limit/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/consumer-rate-limit/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/consumer-rate-limit/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/dead-letter/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/dead-letter/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/dead-letter/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.#">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/delayed-redelivery/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/delayed-redelivery/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/delayed-redelivery/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.#">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/divert/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/divert/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/divert/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -74,8 +74,8 @@
<security-setting match="jms.#">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/divert/server1/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/divert/server1/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/divert/server1/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -26,8 +26,8 @@
<security-setting match="jms.#">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/durable-subscription/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/durable-subscription/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/durable-subscription/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -25,8 +25,8 @@
<security-setting match="jms.topic.exampleTopic">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/expiry/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/expiry/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/expiry/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -24,8 +24,8 @@
<security-setting match="jms.#">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/http-transport/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/http-transport/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/http-transport/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -28,8 +28,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/instantiate-connection-factory/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/instantiate-connection-factory/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/instantiate-connection-factory/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -26,8 +26,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/interceptor/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/interceptor/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/interceptor/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -28,8 +28,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/jaas/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/jaas/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/jaas/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -24,8 +24,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/jms-bridge/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/jms-bridge/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/jms-bridge/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -24,8 +24,8 @@
<security-setting match="jms.#">
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
</security-setting>
</security-settings>
</configuration>
Modified: trunk/examples/jms/jms-bridge/server1/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/jms-bridge/server1/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/jms-bridge/server1/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -24,8 +24,8 @@
<security-setting match="jms.#">
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
</security-setting>
</security-settings>
</configuration>
Modified: trunk/examples/jms/jmx/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/jmx/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/jmx/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -26,8 +26,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/large-message/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/large-message/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/large-message/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/last-value-queue/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/last-value-queue/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/last-value-queue/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -24,8 +24,8 @@
<security-setting match="jms.queue.lastValueQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/management/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/management/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/management/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
@@ -36,8 +36,8 @@
<!-- security settings for JMS temporary queue -->
<security-setting match="jms.queue.#">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/management-notifications/readme.html
===================================================================
--- trunk/examples/jms/management-notifications/readme.html 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/management-notifications/readme.html 2010-04-09 14:04:00 UTC (rev 9084)
@@ -36,8 +36,8 @@
<code><!--security for notification topic-->
<security-setting match="jms.topic.notificationsTopic">
<permission type="consume" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
</security-setting></code>
</pre>
Modified: trunk/examples/jms/management-notifications/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/management-notifications/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/management-notifications/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -24,8 +24,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
@@ -33,14 +33,14 @@
<!--security for notification queue-->
<security-setting match="jms.topic.notificationsTopic">
<permission type="consume" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
</security-setting>
<!-- security settings for JMS temporary queue -->
<security-setting match="queuetempjms.*">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/message-counters/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/message-counters/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/message-counters/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -28,8 +28,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
@@ -38,8 +38,8 @@
<security-setting match="jms.queue.expiryQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/message-group/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/message-group/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/message-group/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/message-group2/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/message-group2/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/message-group2/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/message-priority/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/message-priority/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/message-priority/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/no-consumer-buffering/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/no-consumer-buffering/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/no-consumer-buffering/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -24,8 +24,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/non-transaction-failover/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/non-transaction-failover/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/non-transaction-failover/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -27,8 +27,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/non-transaction-failover/server1/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/non-transaction-failover/server1/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/non-transaction-failover/server1/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -32,8 +32,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/paging/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/paging/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/paging/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -25,8 +25,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
@@ -34,8 +34,8 @@
<security-setting match="jms.queue.pagingQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/pre-acknowledge/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/pre-acknowledge/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/pre-acknowledge/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.#">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/producer-rate-limit/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/producer-rate-limit/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/producer-rate-limit/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -24,8 +24,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/queue/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/queue/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/queue/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -24,8 +24,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/queue-message-redistribution/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/queue-message-redistribution/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/queue-message-redistribution/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -56,8 +56,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/queue-message-redistribution/server1/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/queue-message-redistribution/server1/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/queue-message-redistribution/server1/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -57,8 +57,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/queue-requestor/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/queue-requestor/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/queue-requestor/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -24,8 +24,8 @@
<security-setting match="jms.queue.#">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/queue-selector/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/queue-selector/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/queue-selector/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -22,8 +22,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/reattach-node/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/reattach-node/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/reattach-node/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -41,8 +41,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/request-reply/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/request-reply/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/request-reply/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.queue.#">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/scheduled-message/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/scheduled-message/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/scheduled-message/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/security/readme.html
===================================================================
--- trunk/examples/jms/security/readme.html 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/security/readme.html 2010-04-09 14:04:00 UTC (rev 9084)
@@ -66,8 +66,8 @@
<security-setting match="jms.topic.#">
<permission type="createDurableQueue" roles="user"/>
<permission type="deleteDurableQueue" roles="user"/>
- <permission type="createTempQueue" roles="user"/>
- <permission type="deleteTempQueue" roles="user"/>
+ <permission type="createNonDurableQueue" roles="user"/>
+ <permission type="deleteNonDurableQueue" roles="user"/>
<permission type="send" roles="user"/>
<permission type="consume" roles="user"/>
</security-setting>
@@ -75,8 +75,8 @@
<security-setting match="jms.topic.news.europe.#">
<permission type="createDurableQueue" roles="user"/>
<permission type="deleteDurableQueue" roles="user"/>
- <permission type="createTempQueue" roles="user"/>
- <permission type="deleteTempQueue" roles="user"/>
+ <permission type="createNonDurableQueue" roles="user"/>
+ <permission type="deleteNonDurableQueue" roles="user"/>
<permission type="send" roles="europe-user"/>
<permission type="consume" roles="news-user"/>
</security-setting>
@@ -84,8 +84,8 @@
<security-setting match="jms.topic.news.us.#">
<permission type="createDurableQueue" roles="user"/>
<permission type="deleteDurableQueue" roles="user"/>
- <permission type="createTempQueue" roles="user"/>
- <permission type="deleteTempQueue" roles="user"/>
+ <permission type="createNonDurableQueue" roles="user"/>
+ <permission type="deleteNonDurableQueue" roles="user"/>
<permission type="send" roles="us-user"/>
<permission type="consume" roles="news-user"/>
</security-setting>
Modified: trunk/examples/jms/security/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/security/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/security/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.topic.#">
<permission type="createDurableQueue" roles="user"/>
<permission type="deleteDurableQueue" roles="user"/>
- <permission type="createTempQueue" roles="user"/>
- <permission type="deleteTempQueue" roles="user"/>
+ <permission type="createNonDurableQueue" roles="user"/>
+ <permission type="deleteNonDurableQueue" roles="user"/>
<permission type="send" roles="user"/>
<permission type="consume" roles="user"/>
</security-setting>
@@ -32,8 +32,8 @@
<security-setting match="jms.topic.news.europe.#">
<permission type="createDurableQueue" roles="user"/>
<permission type="deleteDurableQueue" roles="user"/>
- <permission type="createTempQueue" roles="user"/>
- <permission type="deleteTempQueue" roles="user"/>
+ <permission type="createNonDurableQueue" roles="user"/>
+ <permission type="deleteNonDurableQueue" roles="user"/>
<permission type="send" roles="europe-user"/>
<permission type="consume" roles="news-user"/>
</security-setting>
@@ -41,8 +41,8 @@
<security-setting match="jms.topic.news.us.#">
<permission type="createDurableQueue" roles="user"/>
<permission type="deleteDurableQueue" roles="user"/>
- <permission type="createTempQueue" roles="user"/>
- <permission type="deleteTempQueue" roles="user"/>
+ <permission type="createNonDurableQueue" roles="user"/>
+ <permission type="deleteNonDurableQueue" roles="user"/>
<permission type="send" roles="us-user"/>
<permission type="consume" roles="news-user"/>
</security-setting>
Modified: trunk/examples/jms/send-acknowledgements/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/send-acknowledgements/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/send-acknowledgements/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -24,8 +24,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/ssl-enabled/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/ssl-enabled/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/ssl-enabled/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -36,8 +36,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/static-selector/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/static-selector/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/static-selector/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -30,8 +30,8 @@
<security-setting match="jms.queue.selectorQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/static-selector-jms/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/static-selector-jms/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/static-selector-jms/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.queue.selectorQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/stomp/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/stomp/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/stomp/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -32,8 +32,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/symmetric-cluster/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/symmetric-cluster/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -59,8 +59,8 @@
<security-setting match="jms.#">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/symmetric-cluster/server1/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server1/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/symmetric-cluster/server1/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -57,8 +57,8 @@
<security-setting match="jms.#">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/symmetric-cluster/server2/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server2/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/symmetric-cluster/server2/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -57,8 +57,8 @@
<security-setting match="jms.#">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/symmetric-cluster/server3/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server3/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/symmetric-cluster/server3/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -57,8 +57,8 @@
<security-setting match="jms.#">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/symmetric-cluster/server4/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server4/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/symmetric-cluster/server4/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -56,8 +56,8 @@
<security-setting match="jms.#">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/symmetric-cluster/server5/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server5/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/symmetric-cluster/server5/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -56,8 +56,8 @@
<security-setting match="jms.#">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/temp-queue/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/temp-queue/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/temp-queue/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -24,8 +24,8 @@
<security-setting match="jms.queue.#">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/topic/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/topic/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/topic/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.topic.exampleTopic">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/topic-hierarchies/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/topic-hierarchies/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/topic-hierarchies/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -24,8 +24,8 @@
<security-setting match="jms.#">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/topic-selector-example1/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/topic-selector-example1/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/topic-selector-example1/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.topic.exampleTopic">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/topic-selector-example2/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/topic-selector-example2/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/topic-selector-example2/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.topic.exampleTopic">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/transaction-failover/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/transaction-failover/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/transaction-failover/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -27,8 +27,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/transaction-failover/server1/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/transaction-failover/server1/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/transaction-failover/server1/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -32,8 +32,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/transactional/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/transactional/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/transactional/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/xa-heuristic/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/xa-heuristic/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/xa-heuristic/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/xa-receive/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/xa-receive/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/xa-receive/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/xa-send/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/xa-send/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/xa-send/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/examples/jms/xa-with-jta/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/xa-with-jta/server0/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/examples/jms/xa-with-jta/server0/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -23,8 +23,8 @@
<security-setting match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/src/config/jboss-as/clustered/hornetq-configuration.xml
===================================================================
--- trunk/src/config/jboss-as/clustered/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/src/config/jboss-as/clustered/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -83,8 +83,8 @@
<security-settings>
<security-setting match="#">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/src/config/jboss-as/non-clustered/hornetq-configuration.xml
===================================================================
--- trunk/src/config/jboss-as/non-clustered/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/src/config/jboss-as/non-clustered/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -57,8 +57,8 @@
<security-settings>
<security-setting match="#">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/src/config/stand-alone/clustered/hornetq-configuration.xml
===================================================================
--- trunk/src/config/stand-alone/clustered/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/src/config/stand-alone/clustered/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -70,8 +70,8 @@
<security-settings>
<security-setting match="#">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/src/config/stand-alone/non-clustered/hornetq-configuration.xml
===================================================================
--- trunk/src/config/stand-alone/non-clustered/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/src/config/stand-alone/non-clustered/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -44,8 +44,8 @@
<security-settings>
<security-setting match="#">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/src/config/trunk/clustered/hornetq-configuration.xml
===================================================================
--- trunk/src/config/trunk/clustered/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/src/config/trunk/clustered/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -62,8 +62,8 @@
<security-settings>
<security-setting match="#">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/src/config/trunk/non-clustered/hornetq-configuration.xml
===================================================================
--- trunk/src/config/trunk/non-clustered/hornetq-configuration.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/src/config/trunk/non-clustered/hornetq-configuration.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -36,8 +36,8 @@
<security-settings>
<security-setting match="#">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
<permission type="consume" roles="guest"/>
<permission type="send" roles="guest"/>
</security-setting>
Modified: trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java
===================================================================
--- trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java 2010-04-09 14:04:00 UTC (rev 9084)
@@ -487,8 +487,8 @@
@Parameter(desc="a comma-separated list of roles allowed to consume messages", name="consume") String consumeRoles,
@Parameter(desc="a comma-separated list of roles allowed to create durable queues", name="createDurableQueueRoles") String createDurableQueueRoles,
@Parameter(desc="a comma-separated list of roles allowed to delete durable queues", name="deleteDurableQueueRoles") String deleteDurableQueueRoles,
- @Parameter(desc="a comma-separated list of roles allowed to create temporary queues", name="createTempQueueRoles") String createTempQueueRoles,
- @Parameter(desc="a comma-separated list of roles allowed to delete temporary queues", name="deleteTempQueueRoles") String deleteTempQueueRoles,
+ @Parameter(desc="a comma-separated list of roles allowed to create non durable queues", name="createNonDurableQueueRoles") String createNonDurableQueueRoles,
+ @Parameter(desc="a comma-separated list of roles allowed to delete non durable queues", name="deleteNonDurableQueueRoles") String deleteNonDurableQueueRoles,
@Parameter(desc="a comma-separated list of roles allowed to send management messages messages", name="manage") String manageRoles) throws Exception;
@Operation(desc = "Remove security settings for an address", impact = MBeanOperationInfo.ACTION)
Modified: trunk/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java
===================================================================
--- trunk/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java 2010-04-09 14:04:00 UTC (rev 9084)
@@ -79,6 +79,11 @@
private static final String DELETEDURABLEQUEUE_NAME = "deleteDurableQueue";
+ private static final String CREATE_NON_DURABLE_QUEUE_NAME = "createNonDurableQueue";
+
+ private static final String DELETE_NON_DURABLE_QUEUE_NAME = "deleteNonDurableQueue";
+
+ // HORNETQ-309 we keep supporting these attribute names for compatibility
private static final String CREATETEMPQUEUE_NAME = "createTempQueue";
private static final String DELETETEMPQUEUE_NAME = "deleteTempQueue";
@@ -603,8 +608,8 @@
ArrayList<String> consume = new ArrayList<String>();
ArrayList<String> createDurableQueue = new ArrayList<String>();
ArrayList<String> deleteDurableQueue = new ArrayList<String>();
- ArrayList<String> createTempQueue = new ArrayList<String>();
- ArrayList<String> deleteTempQueue = new ArrayList<String>();
+ ArrayList<String> createNonDurableQueue = new ArrayList<String>();
+ ArrayList<String> deleteNonDurableQueue = new ArrayList<String>();
ArrayList<String> manageRoles = new ArrayList<String>();
ArrayList<String> allRoles = new ArrayList<String>();
NodeList children = node.getChildNodes();
@@ -637,13 +642,21 @@
{
deleteDurableQueue.add(role);
}
+ else if (FileConfigurationParser.CREATE_NON_DURABLE_QUEUE_NAME.equals(type))
+ {
+ createNonDurableQueue.add(role);
+ }
+ else if (FileConfigurationParser.DELETE_NON_DURABLE_QUEUE_NAME.equals(type))
+ {
+ deleteNonDurableQueue.add(role);
+ }
else if (FileConfigurationParser.CREATETEMPQUEUE_NAME.equals(type))
{
- createTempQueue.add(role);
+ createNonDurableQueue.add(role);
}
else if (FileConfigurationParser.DELETETEMPQUEUE_NAME.equals(type))
{
- deleteTempQueue.add(role);
+ deleteNonDurableQueue.add(role);
}
else if (FileConfigurationParser.MANAGE_NAME.equals(type))
{
@@ -665,8 +678,8 @@
consume.contains(role),
createDurableQueue.contains(role),
deleteDurableQueue.contains(role),
- createTempQueue.contains(role),
- deleteTempQueue.contains(role),
+ createNonDurableQueue.contains(role),
+ deleteNonDurableQueue.contains(role),
manageRoles.contains(role)));
}
Modified: trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java 2010-04-09 14:04:00 UTC (rev 9084)
@@ -1175,8 +1175,8 @@
String consumeRoles,
String createDurableQueueRoles,
String deleteDurableQueueRoles,
- String createTempQueueRoles,
- String deleteTempQueueRoles,
+ String createNonDurableQueueRoles,
+ String deleteNonDurableQueueRoles,
String manageRoles) throws Exception
{
checkStarted();
@@ -1188,8 +1188,8 @@
consumeRoles,
createDurableQueueRoles,
deleteDurableQueueRoles,
- createTempQueueRoles,
- deleteTempQueueRoles,
+ createNonDurableQueueRoles,
+ deleteNonDurableQueueRoles,
manageRoles);
server.getSecurityRepository().addMatch(addressMatch, roles);
@@ -1199,8 +1199,8 @@
consumeRoles,
createDurableQueueRoles,
deleteDurableQueueRoles,
- createTempQueueRoles,
- deleteTempQueueRoles,
+ createNonDurableQueueRoles,
+ deleteNonDurableQueueRoles,
manageRoles);
storageManager.storeSecurityRoles(persistedRoles);
Modified: trunk/src/main/org/hornetq/core/persistence/config/PersistedRoles.java
===================================================================
--- trunk/src/main/org/hornetq/core/persistence/config/PersistedRoles.java 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/src/main/org/hornetq/core/persistence/config/PersistedRoles.java 2010-04-09 14:04:00 UTC (rev 9084)
@@ -43,9 +43,9 @@
private SimpleString deleteDurableQueueRoles;
- private SimpleString createTempQueueRoles;
+ private SimpleString createNonDurableQueueRoles;
- private SimpleString deleteTempQueueRoles;
+ private SimpleString deleteNonDurableQueueRoles;
private SimpleString manageRoles;
@@ -64,8 +64,8 @@
* @param consumeRoles
* @param createDurableQueueRoles
* @param deleteDurableQueueRoles
- * @param createTempQueueRoles
- * @param deleteTempQueueRoles
+ * @param createNonDurableQueueRoles
+ * @param deleteNonDurableQueueRoles
* @param manageRoles
*/
public PersistedRoles(final String addressMatch,
@@ -73,8 +73,8 @@
final String consumeRoles,
final String createDurableQueueRoles,
final String deleteDurableQueueRoles,
- final String createTempQueueRoles,
- final String deleteTempQueueRoles,
+ final String createNonDurableQueueRoles,
+ final String deleteNonDurableQueueRoles,
final String manageRoles)
{
super();
@@ -83,8 +83,8 @@
this.consumeRoles = SimpleString.toSimpleString(consumeRoles);
this.createDurableQueueRoles = SimpleString.toSimpleString(createDurableQueueRoles);
this.deleteDurableQueueRoles = SimpleString.toSimpleString(deleteDurableQueueRoles);
- this.createTempQueueRoles = SimpleString.toSimpleString(createTempQueueRoles);
- this.deleteTempQueueRoles = SimpleString.toSimpleString(deleteTempQueueRoles);
+ this.createNonDurableQueueRoles = SimpleString.toSimpleString(createNonDurableQueueRoles);
+ this.deleteNonDurableQueueRoles = SimpleString.toSimpleString(deleteNonDurableQueueRoles);
this.manageRoles = SimpleString.toSimpleString(manageRoles);
}
@@ -141,19 +141,19 @@
}
/**
- * @return the createTempQueueRoles
+ * @return the createNonDurableQueueRoles
*/
- public String getCreateTempQueueRoles()
+ public String getCreateNonDurableQueueRoles()
{
- return createTempQueueRoles.toString();
+ return createNonDurableQueueRoles.toString();
}
/**
- * @return the deleteTempQueueRoles
+ * @return the deleteNonDurableQueueRoles
*/
- public String getDeleteTempQueueRoles()
+ public String getDeleteNonDurableQueueRoles()
{
- return deleteTempQueueRoles.toString();
+ return deleteNonDurableQueueRoles.toString();
}
/**
@@ -174,8 +174,8 @@
buffer.writeNullableSimpleString(consumeRoles);
buffer.writeNullableSimpleString(createDurableQueueRoles);
buffer.writeNullableSimpleString(deleteDurableQueueRoles);
- buffer.writeNullableSimpleString(createTempQueueRoles);
- buffer.writeNullableSimpleString(deleteTempQueueRoles);
+ buffer.writeNullableSimpleString(createNonDurableQueueRoles);
+ buffer.writeNullableSimpleString(deleteNonDurableQueueRoles);
buffer.writeNullableSimpleString(manageRoles);
}
@@ -188,8 +188,8 @@
SimpleString.sizeofNullableString(consumeRoles) +
SimpleString.sizeofNullableString(createDurableQueueRoles) +
SimpleString.sizeofNullableString(deleteDurableQueueRoles) +
- SimpleString.sizeofNullableString(createTempQueueRoles) +
- SimpleString.sizeofNullableString(deleteTempQueueRoles) +
+ SimpleString.sizeofNullableString(createNonDurableQueueRoles) +
+ SimpleString.sizeofNullableString(deleteNonDurableQueueRoles) +
SimpleString.sizeofNullableString(manageRoles);
}
@@ -204,8 +204,8 @@
consumeRoles = buffer.readNullableSimpleString();
createDurableQueueRoles = buffer.readNullableSimpleString();
deleteDurableQueueRoles = buffer.readNullableSimpleString();
- createTempQueueRoles = buffer.readNullableSimpleString();
- deleteTempQueueRoles = buffer.readNullableSimpleString();
+ createNonDurableQueueRoles = buffer.readNullableSimpleString();
+ deleteNonDurableQueueRoles = buffer.readNullableSimpleString();
manageRoles = buffer.readNullableSimpleString();
}
@@ -220,9 +220,9 @@
result = prime * result + ((addressMatch == null) ? 0 : addressMatch.hashCode());
result = prime * result + ((consumeRoles == null) ? 0 : consumeRoles.hashCode());
result = prime * result + ((createDurableQueueRoles == null) ? 0 : createDurableQueueRoles.hashCode());
- result = prime * result + ((createTempQueueRoles == null) ? 0 : createTempQueueRoles.hashCode());
+ result = prime * result + ((createNonDurableQueueRoles == null) ? 0 : createNonDurableQueueRoles.hashCode());
result = prime * result + ((deleteDurableQueueRoles == null) ? 0 : deleteDurableQueueRoles.hashCode());
- result = prime * result + ((deleteTempQueueRoles == null) ? 0 : deleteTempQueueRoles.hashCode());
+ result = prime * result + ((deleteNonDurableQueueRoles == null) ? 0 : deleteNonDurableQueueRoles.hashCode());
result = prime * result + ((manageRoles == null) ? 0 : manageRoles.hashCode());
result = prime * result + ((sendRoles == null) ? 0 : sendRoles.hashCode());
result = prime * result + (int)(storeId ^ (storeId >>> 32));
@@ -263,12 +263,12 @@
}
else if (!createDurableQueueRoles.equals(other.createDurableQueueRoles))
return false;
- if (createTempQueueRoles == null)
+ if (createNonDurableQueueRoles == null)
{
- if (other.createTempQueueRoles != null)
+ if (other.createNonDurableQueueRoles != null)
return false;
}
- else if (!createTempQueueRoles.equals(other.createTempQueueRoles))
+ else if (!createNonDurableQueueRoles.equals(other.createNonDurableQueueRoles))
return false;
if (deleteDurableQueueRoles == null)
{
@@ -277,12 +277,12 @@
}
else if (!deleteDurableQueueRoles.equals(other.deleteDurableQueueRoles))
return false;
- if (deleteTempQueueRoles == null)
+ if (deleteNonDurableQueueRoles == null)
{
- if (other.deleteTempQueueRoles != null)
+ if (other.deleteNonDurableQueueRoles != null)
return false;
}
- else if (!deleteTempQueueRoles.equals(other.deleteTempQueueRoles))
+ else if (!deleteNonDurableQueueRoles.equals(other.deleteNonDurableQueueRoles))
return false;
if (manageRoles == null)
{
Modified: trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-04-09 14:04:00 UTC (rev 9084)
@@ -1228,8 +1228,8 @@
roleItem.getConsumeRoles(),
roleItem.getCreateDurableQueueRoles(),
roleItem.getDeleteDurableQueueRoles(),
- roleItem.getCreateTempQueueRoles(),
- roleItem.getDeleteTempQueueRoles(),
+ roleItem.getCreateNonDurableQueueRoles(),
+ roleItem.getDeleteNonDurableQueueRoles(),
roleItem.getManageRoles());
securityRepository.addMatch(roleItem.getAddressMatch().toString(), setRoles);
Modified: trunk/src/main/org/hornetq/utils/SecurityFormatter.java
===================================================================
--- trunk/src/main/org/hornetq/utils/SecurityFormatter.java 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/src/main/org/hornetq/utils/SecurityFormatter.java 2010-04-09 14:04:00 UTC (rev 9084)
@@ -22,12 +22,12 @@
public class SecurityFormatter
{
- public static Set<Role> createSecurity(String sendRoles, String consumeRoles, String createDurableQueueRoles, String deleteDurableQueueRoles, String createTempQueueRoles, String deleteTempQueueRoles, String manageRoles)
+ public static Set<Role> createSecurity(String sendRoles, String consumeRoles, String createDurableQueueRoles, String deleteDurableQueueRoles, String createNonDurableQueueRoles, String deleteNonDurableQueueRoles, String manageRoles)
{
List<String> createDurableQueue = toList(createDurableQueueRoles);
List<String> deleteDurableQueue = toList(deleteDurableQueueRoles);
- List<String> createTempQueue = toList(createTempQueueRoles);
- List<String> deleteTempQueue = toList(deleteTempQueueRoles);
+ List<String> createNonDurableQueue = toList(createNonDurableQueueRoles);
+ List<String> deleteNonDurableQueue = toList(deleteNonDurableQueueRoles);
List<String> send = toList(sendRoles);
List<String> consume = toList(consumeRoles);
List<String> manage = toList(manageRoles);
@@ -35,8 +35,8 @@
Set<String> allRoles = new HashSet<String>();
allRoles.addAll(createDurableQueue);
allRoles.addAll(deleteDurableQueue);
- allRoles.addAll(createTempQueue);
- allRoles.addAll(deleteTempQueue);
+ allRoles.addAll(createNonDurableQueue);
+ allRoles.addAll(deleteNonDurableQueue);
allRoles.addAll(send);
allRoles.addAll(consume);
allRoles.addAll(manage);
@@ -49,8 +49,8 @@
consume.contains(role),
createDurableQueue.contains(role),
deleteDurableQueue.contains(role),
- createTempQueue.contains(role),
- deleteTempQueue.contains(role),
+ createNonDurableQueue.contains(role),
+ deleteNonDurableQueue.contains(role),
manageRoles.contains(role)));
}
return roles;
Modified: trunk/tests/config/ConfigurationTest-full-config.xml
===================================================================
--- trunk/tests/config/ConfigurationTest-full-config.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/tests/config/ConfigurationTest-full-config.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -185,10 +185,10 @@
<security-settings>
<security-setting match="a1">
- <permission type="createTempQueue" roles="a1.1"/>
+ <permission type="createNonDurableQueue" roles="a1.1"/>
</security-setting>
<security-setting match="a2">
- <permission type="deleteTempQueue" roles="a2.1"/>
+ <permission type="deleteNonDurableQueue" roles="a2.1"/>
</security-setting>
</security-settings>
Modified: trunk/tests/jms-tests/config/hornetq-queues.xml
===================================================================
--- trunk/tests/jms-tests/config/hornetq-queues.xml 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/tests/jms-tests/config/hornetq-queues.xml 2010-04-09 14:04:00 UTC (rev 9084)
@@ -6,8 +6,8 @@
<security-setting match="#">
<permission type="createDurableQueue" roles="guest,def"/>
<permission type="deleteDurableQueue" roles="guest,def"/>
- <permission type="createTempQueue" roles="guest,def"/>
- <permission type="deleteTempQueue" roles="guest,def"/>
+ <permission type="createNonDurableQueue" roles="guest,def"/>
+ <permission type="deleteNonDurableQueue" roles="guest,def"/>
<permission type="consume" roles="guest,def"/>
<permission type="send" roles="guest,def"/>
</security-setting>
Modified: trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java 2010-04-09 14:04:00 UTC (rev 9084)
@@ -472,14 +472,14 @@
String consumeRoles,
String createDurableQueueRoles,
String deleteDurableQueueRoles,
- String createTempQueueRoles,
- String deleteTempQueueRoles,
+ String createNonDurableQueueRoles,
+ String deleteNonDurableQueueRoles,
String manageRoles) throws Exception
{
proxy.invokeOperation("addSecuritySettings", addressMatch,
sendRoles, consumeRoles,
createDurableQueueRoles, deleteDurableQueueRoles,
- createTempQueueRoles, deleteTempQueueRoles,
+ createNonDurableQueueRoles, deleteNonDurableQueueRoles,
manageRoles);
}
Modified: trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/SecurityDeployerTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/SecurityDeployerTest.java 2010-04-09 12:06:23 UTC (rev 9083)
+++ trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/SecurityDeployerTest.java 2010-04-09 14:04:00 UTC (rev 9084)
@@ -41,8 +41,8 @@
+ " <permission type=\"manage\" roles=\"guest,publisher,durpublisher\"/>\n"
+ " </security-setting>";
- private final String conf2 = "<security-setting match=\"jms.topic.testQueue\">\n" + " <permission type=\"createTempQueue\" roles=\"durpublisher\"/>\n"
- + " <permission type=\"deleteTempQueue\" roles=\"durpublisher\"/>\n"
+ private final String conf2 = "<security-setting match=\"jms.topic.testQueue\">\n" + " <permission type=\"createNonDurableQueue\" roles=\"durpublisher\"/>\n"
+ + " <permission type=\"deleteNonDurableQueue\" roles=\"durpublisher\"/>\n"
+ " <permission type=\"consume\" roles=\"guest,publisher,durpublisher\"/>\n"
+ " <permission type=\"send\" roles=\"guest,publisher,durpublisher\"/>\n"
+ " </security-setting>";
More information about the hornetq-commits
mailing list