[jboss-cvs] JBoss Messaging SVN: r6742 - in trunk: examples/javaee/hajndi/config and 83 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue May 12 10:44:10 EDT 2009
Author: jmesnil
Date: 2009-05-12 10:44:10 -0400 (Tue, 12 May 2009)
New Revision: 6742
Removed:
trunk/src/schemas/jbm-queues.xsd
Modified:
trunk/examples/javaee/ejb-jms-transaction/config/jbm-queues.xml
trunk/examples/javaee/hajndi/config/jbm-queues.xml
trunk/examples/javaee/jca-config/server-config/jbm-queues.xml
trunk/examples/javaee/jms-bridge/config/jbm-queues.xml
trunk/examples/javaee/mdb/config/jbm-queues.xml
trunk/examples/javaee/servlet-transport/config/jbm-queues.xml
trunk/examples/javaee/xarecovery/config/jbm-queues.xml
trunk/examples/jms/application-layer-failover/server0/jbm-configuration.xml
trunk/examples/jms/application-layer-failover/server0/jbm-queues.xml
trunk/examples/jms/application-layer-failover/server1/jbm-configuration.xml
trunk/examples/jms/application-layer-failover/server1/jbm-queues.xml
trunk/examples/jms/automatic-failover/server0/jbm-configuration.xml
trunk/examples/jms/automatic-failover/server0/jbm-queues.xml
trunk/examples/jms/automatic-failover/server1/jbm-configuration.xml
trunk/examples/jms/automatic-failover/server1/jbm-queues.xml
trunk/examples/jms/bridge/server0/jbm-configuration.xml
trunk/examples/jms/bridge/server0/jbm-queues.xml
trunk/examples/jms/bridge/server1/jbm-configuration.xml
trunk/examples/jms/bridge/server1/jbm-queues.xml
trunk/examples/jms/browser/server0/jbm-configuration.xml
trunk/examples/jms/browser/server0/jbm-queues.xml
trunk/examples/jms/client-kickoff/server0/jbm-configuration.xml
trunk/examples/jms/client-kickoff/server0/jbm-queues.xml
trunk/examples/jms/client-side-load-balancing/server0/jbm-configuration.xml
trunk/examples/jms/client-side-load-balancing/server0/jbm-queues.xml
trunk/examples/jms/client-side-load-balancing/server1/jbm-configuration.xml
trunk/examples/jms/client-side-load-balancing/server1/jbm-queues.xml
trunk/examples/jms/client-side-load-balancing/server2/jbm-configuration.xml
trunk/examples/jms/client-side-load-balancing/server2/jbm-queues.xml
trunk/examples/jms/clustered-durable-subscription/server0/jbm-configuration.xml
trunk/examples/jms/clustered-durable-subscription/server0/jbm-queues.xml
trunk/examples/jms/clustered-durable-subscription/server1/jbm-configuration.xml
trunk/examples/jms/clustered-durable-subscription/server1/jbm-queues.xml
trunk/examples/jms/clustered-queue/server0/jbm-configuration.xml
trunk/examples/jms/clustered-queue/server0/jbm-queues.xml
trunk/examples/jms/clustered-queue/server1/jbm-configuration.xml
trunk/examples/jms/clustered-queue/server1/jbm-queues.xml
trunk/examples/jms/clustered-topic/server0/jbm-configuration.xml
trunk/examples/jms/clustered-topic/server0/jbm-queues.xml
trunk/examples/jms/clustered-topic/server1/jbm-configuration.xml
trunk/examples/jms/clustered-topic/server1/jbm-queues.xml
trunk/examples/jms/consumer-rate-limit/server0/jbm-configuration.xml
trunk/examples/jms/consumer-rate-limit/server0/jbm-queues.xml
trunk/examples/jms/dead-letter/server0/jbm-configuration.xml
trunk/examples/jms/dead-letter/server0/jbm-queues.xml
trunk/examples/jms/delayed-redelivery/server0/jbm-configuration.xml
trunk/examples/jms/delayed-redelivery/server0/jbm-queues.xml
trunk/examples/jms/divert/server0/jbm-configuration.xml
trunk/examples/jms/divert/server0/jbm-queues.xml
trunk/examples/jms/divert/server1/jbm-configuration.xml
trunk/examples/jms/divert/server1/jbm-queues.xml
trunk/examples/jms/durable-subscription/server0/jbm-configuration.xml
trunk/examples/jms/durable-subscription/server0/jbm-queues.xml
trunk/examples/jms/expiry/server0/jbm-configuration.xml
trunk/examples/jms/expiry/server0/jbm-queues.xml
trunk/examples/jms/http-transport/server0/jbm-configuration.xml
trunk/examples/jms/http-transport/server0/jbm-queues.xml
trunk/examples/jms/instantiate-connection-factory/server0/jbm-configuration.xml
trunk/examples/jms/instantiate-connection-factory/server0/jbm-queues.xml
trunk/examples/jms/interceptor/server0/jbm-configuration.xml
trunk/examples/jms/interceptor/server0/jbm-queues.xml
trunk/examples/jms/jmx/server0/jbm-configuration.xml
trunk/examples/jms/jmx/server0/jbm-queues.xml
trunk/examples/jms/large-message/server0/jbm-configuration.xml
trunk/examples/jms/large-message/server0/jbm-queues.xml
trunk/examples/jms/last-value-queue/server0/jbm-configuration.xml
trunk/examples/jms/last-value-queue/server0/jbm-queues.xml
trunk/examples/jms/management-notifications/server0/jbm-configuration.xml
trunk/examples/jms/management-notifications/server0/jbm-queues.xml
trunk/examples/jms/management/server0/jbm-configuration.xml
trunk/examples/jms/management/server0/jbm-queues.xml
trunk/examples/jms/message-counters/server0/jbm-configuration.xml
trunk/examples/jms/message-counters/server0/jbm-queues.xml
trunk/examples/jms/message-group/server0/jbm-configuration.xml
trunk/examples/jms/message-group/server0/jbm-queues.xml
trunk/examples/jms/message-priority/server0/jbm-configuration.xml
trunk/examples/jms/message-priority/server0/jbm-queues.xml
trunk/examples/jms/no-consumer-buffering/server0/jbm-configuration.xml
trunk/examples/jms/no-consumer-buffering/server0/jbm-queues.xml
trunk/examples/jms/paging/server0/jbm-configuration.xml
trunk/examples/jms/paging/server0/jbm-queues.xml
trunk/examples/jms/pre-acknowledge/server0/jbm-configuration.xml
trunk/examples/jms/pre-acknowledge/server0/jbm-queues.xml
trunk/examples/jms/pre-acknowledge/src/org/jboss/jms/example/PreacknowledgeExample.java
trunk/examples/jms/producer-rate-limit/server0/jbm-configuration.xml
trunk/examples/jms/producer-rate-limit/server0/jbm-queues.xml
trunk/examples/jms/queue-message-redistribution/server0/jbm-configuration.xml
trunk/examples/jms/queue-message-redistribution/server0/jbm-queues.xml
trunk/examples/jms/queue-message-redistribution/server1/jbm-configuration.xml
trunk/examples/jms/queue-message-redistribution/server1/jbm-queues.xml
trunk/examples/jms/queue-requestor/server0/jbm-configuration.xml
trunk/examples/jms/queue-requestor/server0/jbm-queues.xml
trunk/examples/jms/queue-selector/server0/jbm-configuration.xml
trunk/examples/jms/queue-selector/server0/jbm-queues.xml
trunk/examples/jms/queue/server0/jbm-configuration.xml
trunk/examples/jms/queue/server0/jbm-queues.xml
trunk/examples/jms/reconnect-same-node/server0/jbm-configuration.xml
trunk/examples/jms/reconnect-same-node/server0/jbm-queues.xml
trunk/examples/jms/request-reply/server0/jbm-configuration.xml
trunk/examples/jms/request-reply/server0/jbm-queues.xml
trunk/examples/jms/scheduled-message/server0/jbm-configuration.xml
trunk/examples/jms/scheduled-message/server0/jbm-queues.xml
trunk/examples/jms/security/server0/jbm-configuration.xml
trunk/examples/jms/security/server0/jbm-queues.xml
trunk/examples/jms/ssl-enabled/server0/jbm-configuration.xml
trunk/examples/jms/ssl-enabled/server0/jbm-queues.xml
trunk/examples/jms/static-selector/server0/jbm-configuration.xml
trunk/examples/jms/static-selector/server0/jbm-queues.xml
trunk/examples/jms/symmetric-cluster/server0/jbm-configuration.xml
trunk/examples/jms/symmetric-cluster/server0/jbm-queues.xml
trunk/examples/jms/symmetric-cluster/server1/jbm-configuration.xml
trunk/examples/jms/symmetric-cluster/server1/jbm-queues.xml
trunk/examples/jms/symmetric-cluster/server2/jbm-configuration.xml
trunk/examples/jms/symmetric-cluster/server2/jbm-queues.xml
trunk/examples/jms/symmetric-cluster/server3/jbm-configuration.xml
trunk/examples/jms/symmetric-cluster/server3/jbm-queues.xml
trunk/examples/jms/symmetric-cluster/server4/jbm-configuration.xml
trunk/examples/jms/symmetric-cluster/server4/jbm-queues.xml
trunk/examples/jms/symmetric-cluster/server5/jbm-configuration.xml
trunk/examples/jms/symmetric-cluster/server5/jbm-queues.xml
trunk/examples/jms/temp-queue/server0/jbm-configuration.xml
trunk/examples/jms/temp-queue/server0/jbm-queues.xml
trunk/examples/jms/topic-hierarchies/server0/jbm-configuration.xml
trunk/examples/jms/topic-hierarchies/server0/jbm-queues.xml
trunk/examples/jms/topic-selector-example1/server0/jbm-configuration.xml
trunk/examples/jms/topic-selector-example1/server0/jbm-queues.xml
trunk/examples/jms/topic-selector-example2/server0/jbm-configuration.xml
trunk/examples/jms/topic-selector-example2/server0/jbm-queues.xml
trunk/examples/jms/topic/server0/jbm-configuration.xml
trunk/examples/jms/topic/server0/jbm-queues.xml
trunk/examples/jms/transactional/server0/jbm-configuration.xml
trunk/examples/jms/transactional/server0/jbm-queues.xml
trunk/examples/jms/xa-heuristic/server0/jbm-configuration.xml
trunk/examples/jms/xa-heuristic/server0/jbm-queues.xml
trunk/examples/jms/xa-receive/server0/jbm-configuration.xml
trunk/examples/jms/xa-receive/server0/jbm-queues.xml
trunk/examples/jms/xa-send/server0/jbm-configuration.xml
trunk/examples/jms/xa-send/server0/jbm-queues.xml
trunk/examples/jms/xa-with-jta/
trunk/examples/jms/xa-with-jta/server0/
trunk/examples/jms/xa-with-jta/server0/jbm-configuration.xml
trunk/examples/jms/xa-with-jta/server0/jbm-queues.xml
trunk/src/config/jboss-as/clustered/jbm-configuration.xml
trunk/src/config/jboss-as/non-clustered/jbm-configuration.xml
trunk/src/config/stand-alone/clustered/jbm-configuration.xml
trunk/src/config/stand-alone/clustered/jbm-queues.xml
trunk/src/config/stand-alone/non-clustered/jbm-configuration.xml
trunk/src/config/stand-alone/non-clustered/jbm-queues.xml
trunk/src/main/org/jboss/messaging/core/deployers/impl/AddressSettingsDeployer.java
trunk/src/main/org/jboss/messaging/core/deployers/impl/QueueDeployer.java
trunk/src/main/org/jboss/messaging/core/deployers/impl/SecurityDeployer.java
trunk/src/schemas/jbm-configuration.xsd
trunk/tests/config/ConfigurationTest-config.xml
trunk/tests/config/ConfigurationTest-defaults.xml
trunk/tests/config/ConfigurationTest-full-config.xml
trunk/tests/jms-tests/config/jbm-configuration.xml
trunk/tests/jms-tests/config/jbm-queues.xml
trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationValidationTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/DefaultsFileConfigurationTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/AddressSettingsDeployerTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/QueueDeployerTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/SecurityDeployerTest.java
Log:
configuration refactoring
* removed jbm-queues.xsd
* both jbm-configuration.xml and jbm-queues.xml follow the same XML schema jbm-configuration.xsd
* root element is now <configuration>
* address settings & security settings are now in bag elements (<address-settings>, <security-settings>) to be consistent with other configuration elements
* updated tests + examples configuration file
Modified: trunk/examples/javaee/ejb-jms-transaction/config/jbm-queues.xml
===================================================================
--- trunk/examples/javaee/ejb-jms-transaction/config/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/javaee/ejb-jms-transaction/config/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,21 +1,25 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../../../../src/schemas/jbm-configuration.xsd ">
- <security match="jms.queue.testQueue">
- <permission type="consume" roles="guest,publisher"/>
- <permission type="send" roles="guest,publisher"/>
- </security>
+ <security-settings>
+ <security-setting match="jms.queue.testQueue">
+ <permission type="consume" roles="guest,publisher"/>
+ <permission type="send" roles="guest,publisher"/>
+ </security-setting>
+ </security-settings>
- <!--default for catch all-->
- <address-settings match="#">
- <clustered>false</clustered>
- <dead-letter-address>jms.queue.DLQ</dead-letter-address>
- <expiry-address>jms.queue.ExpiryQueue</expiry-address>
- <redelivery-delay>0</redelivery-delay>
- <max-size-bytes>-1</max-size-bytes>
- <page-size-bytes>10485760</page-size-bytes>
- <distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributor</distribution-policy-class>
- <message-counter-history-day-limit>10</message-counter-history-day-limit>
+ <address-settings>
+ <!--default for catch all-->
+ <address-setting match="#">
+ <clustered>false</clustered>
+ <dead-letter-address>jms.queue.DLQ</dead-letter-address>
+ <expiry-address>jms.queue.ExpiryQueue</expiry-address>
+ <redelivery-delay>0</redelivery-delay>
+ <max-size-bytes>-1</max-size-bytes>
+ <page-size-bytes>10485760</page-size-bytes>
+ <distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributor</distribution-policy-class>
+ <message-counter-history-day-limit>10</message-counter-history-day-limit>
+ </address-setting>
</address-settings>
-</settings>
+</configuration>
Modified: trunk/examples/javaee/hajndi/config/jbm-queues.xml
===================================================================
--- trunk/examples/javaee/hajndi/config/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/javaee/hajndi/config/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,21 +1,26 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../../../../src/schemas/jbm-configuration.xsd ">
- <security match="jms.queue.testQueue">
- <permission type="consume" roles="guest,publisher"/>
- <permission type="send" roles="guest,publisher"/>
- </security>
+ <security-settings>
+ <security-setting match="jms.queue.testQueue">
+ <permission type="consume" roles="guest,publisher"/>
+ <permission type="send" roles="guest,publisher"/>
+ </security-setting>
+ </security-settings>
- <!--default for catch all-->
- <address-settings match="#">
- <clustered>false</clustered>
- <dead-letter-address>jms.queue.DLQ</dead-letter-address>
- <expiry-address>jms.queue.ExpiryQueue</expiry-address>
- <redelivery-delay>0</redelivery-delay>
- <max-size-bytes>-1</max-size-bytes>
- <page-size-bytes>10485760</page-size-bytes>
- <distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributor</distribution-policy-class>
- <message-counter-history-day-limit>10</message-counter-history-day-limit>
+ <address-settings>
+ <!--default for catch all-->
+ <address-setting match="#">
+ <clustered>false</clustered>
+ <dead-letter-address>jms.queue.DLQ</dead-letter-address>
+ <expiry-address>jms.queue.ExpiryQueue</expiry-address>
+ <redelivery-delay>0</redelivery-delay>
+ <max-size-bytes>-1</max-size-bytes>
+ <page-size-bytes>10485760</page-size-bytes>
+ <distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributor</distribution-policy-class>
+ <message-counter-history-day-limit>10</message-counter-history-day-limit>
+ </address-setting>
</address-settings>
-</settings>
+
+</configuration>
Modified: trunk/examples/javaee/jca-config/server-config/jbm-queues.xml
===================================================================
--- trunk/examples/javaee/jca-config/server-config/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/javaee/jca-config/server-config/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,10 +1,12 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../../../../src/schemas/jbm-configuration.xsd ">
- <security match="jms.queue.#">
- <permission type="consume" roles="guest,publisher"/>
- <permission type="send" roles="guest,publisher"/>
- </security>
+ <security-settings>
+ <security-setting match="jms.queue.#">
+ <permission type="consume" roles="guest,publisher"/>
+ <permission type="send" roles="guest,publisher"/>
+ </security-setting>
+ </security-settings>
-</settings>
+</configuration>
Modified: trunk/examples/javaee/jms-bridge/config/jbm-queues.xml
===================================================================
--- trunk/examples/javaee/jms-bridge/config/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/javaee/jms-bridge/config/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,10 +1,12 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../../../../src/schemas/jbm-configuration.xsd ">
- <security match="jms.queue.#">
- <permission type="consume" roles="guest,publisher"/>
- <permission type="send" roles="guest,publisher"/>
- </security>
+ <security-settings>
+ <security-setting match="jms.queue.#">
+ <permission type="consume" roles="guest,publisher"/>
+ <permission type="send" roles="guest,publisher"/>
+ </security-setting>
+ </security-settings>
-</settings>
+</configuration>
Modified: trunk/examples/javaee/mdb/config/jbm-queues.xml
===================================================================
--- trunk/examples/javaee/mdb/config/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/javaee/mdb/config/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,21 +1,26 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../../../../src/schemas/jbm-configuration.xsd ">
- <security match="jms.queue.testQueue">
- <permission type="consume" roles="guest,publisher"/>
- <permission type="send" roles="guest,publisher"/>
- </security>
+ <security-settings>
+ <security-setting match="jms.queue.testQueue">
+ <permission type="consume" roles="guest,publisher"/>
+ <permission type="send" roles="guest,publisher"/>
+ </security-setting>
+ </security-settings>
- <!--default for catch all-->
- <address-settings match="#">
- <clustered>false</clustered>
- <dead-letter-address>jms.queue.DLQ</dead-letter-address>
- <expiry-address>jms.queue.ExpiryQueue</expiry-address>
- <redelivery-delay>0</redelivery-delay>
- <max-size-bytes>-1</max-size-bytes>
- <page-size-bytes>10485760</page-size-bytes>
- <distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributor</distribution-policy-class>
- <message-counter-history-day-limit>10</message-counter-history-day-limit>
+ <address-settings>
+ <!--default for catch all-->
+ <address-setting match="#">
+ <clustered>false</clustered>
+ <dead-letter-address>jms.queue.DLQ</dead-letter-address>
+ <expiry-address>jms.queue.ExpiryQueue</expiry-address>
+ <redelivery-delay>0</redelivery-delay>
+ <max-size-bytes>-1</max-size-bytes>
+ <page-size-bytes>10485760</page-size-bytes>
+ <distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributor</distribution-policy-class>
+ <message-counter-history-day-limit>10</message-counter-history-day-limit>
+ </address-setting>
</address-settings>
-</settings>
+
+</configuration>
Modified: trunk/examples/javaee/servlet-transport/config/jbm-queues.xml
===================================================================
--- trunk/examples/javaee/servlet-transport/config/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/javaee/servlet-transport/config/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,21 +1,26 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../../../../src/schemas/jbm-configuration.xsd ">
- <security match="jms.queue.testQueue">
- <permission type="consume" roles="guest,publisher"/>
- <permission type="send" roles="guest,publisher"/>
- </security>
+ <security-settings>
+ <security-setting match="jms.queue.testQueue">
+ <permission type="consume" roles="guest,publisher"/>
+ <permission type="send" roles="guest,publisher"/>
+ </security-setting>
+ </security-settings>
- <!--default for catch all-->
- <address-settings match="#">
- <clustered>false</clustered>
- <dead-letter-address>jms.queue.DLQ</dead-letter-address>
- <expiry-address>jms.queue.ExpiryQueue</expiry-address>
- <redelivery-delay>0</redelivery-delay>
- <max-size-bytes>-1</max-size-bytes>
- <page-size-bytes>10485760</page-size-bytes>
- <distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributor</distribution-policy-class>
- <message-counter-history-day-limit>10</message-counter-history-day-limit>
+ <address-settings>
+ <!--default for catch all-->
+ <address-setting match="#">
+ <clustered>false</clustered>
+ <dead-letter-address>jms.queue.DLQ</dead-letter-address>
+ <expiry-address>jms.queue.ExpiryQueue</expiry-address>
+ <redelivery-delay>0</redelivery-delay>
+ <max-size-bytes>-1</max-size-bytes>
+ <page-size-bytes>10485760</page-size-bytes>
+ <distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributor</distribution-policy-class>
+ <message-counter-history-day-limit>10</message-counter-history-day-limit>
+ </address-setting>
</address-settings>
-</settings>
+
+</configuration>
Modified: trunk/examples/javaee/xarecovery/config/jbm-queues.xml
===================================================================
--- trunk/examples/javaee/xarecovery/config/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/javaee/xarecovery/config/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,21 +1,26 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../../../../src/schemas/jbm-configuration.xsd ">
- <security match="jms.queue.testQueue">
- <permission type="consume" roles="guest,publisher"/>
- <permission type="send" roles="guest,publisher"/>
- </security>
+ <security-settings>
+ <security-setting match="jms.queue.testQueue">
+ <permission type="consume" roles="guest,publisher"/>
+ <permission type="send" roles="guest,publisher"/>
+ </security-setting>
+ </security-settings>
- <!--default for catch all-->
- <address-settings match="#">
- <clustered>false</clustered>
- <dead-letter-address>jms.queue.DLQ</dead-letter-address>
- <expiry-address>jms.queue.ExpiryQueue</expiry-address>
- <redelivery-delay>0</redelivery-delay>
- <max-size-bytes>-1</max-size-bytes>
- <page-size-bytes>10485760</page-size-bytes>
- <distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributor</distribution-policy-class>
- <message-counter-history-day-limit>10</message-counter-history-day-limit>
+ <address-settings>
+ <!--default for catch all-->
+ <address-setting match="#">
+ <clustered>false</clustered>
+ <dead-letter-address>jms.queue.DLQ</dead-letter-address>
+ <expiry-address>jms.queue.ExpiryQueue</expiry-address>
+ <redelivery-delay>0</redelivery-delay>
+ <max-size-bytes>-1</max-size-bytes>
+ <page-size-bytes>10485760</page-size-bytes>
+ <distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributor</distribution-policy-class>
+ <message-counter-history-day-limit>10</message-counter-history-day-limit>
+ </address-setting>
</address-settings>
-</settings>
+
+</configuration>
Modified: trunk/examples/jms/application-layer-failover/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/application-layer-failover/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/application-layer-failover/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,7 +1,6 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
+ xsi:schemaLocation="urn:jboss:messaging ../../../../src/schemas/jbm-configuration.xsd">
<clustered>true</clustered>
@@ -26,6 +25,4 @@
<journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/application-layer-failover/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/application-layer-failover/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/application-layer-failover/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,17 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../../../../src/schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
-
-</settings>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
+
+</configuration>
Modified: trunk/examples/jms/application-layer-failover/server1/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/application-layer-failover/server1/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/application-layer-failover/server1/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,7 +1,6 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
+ xsi:schemaLocation="urn:jboss:messaging ../../../../src/schemas/jbm-configuration.xsd">
<clustered>true</clustered>
@@ -26,6 +25,4 @@
<journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/application-layer-failover/server1/jbm-queues.xml
===================================================================
--- trunk/examples/jms/application-layer-failover/server1/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/application-layer-failover/server1/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,17 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../../../../src/schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
-
-</settings>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
+
+</configuration>
Modified: trunk/examples/jms/automatic-failover/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/automatic-failover/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/automatic-failover/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,33 +1,29 @@
-<deployment xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
+<configuration xmlns="urn:jboss:messaging"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ <clustered>true</clustered>
+
+ <backup>true</backup>
+
+ <!-- Connectors -->
- <clustered>true</clustered>
-
- <backup>true</backup>
-
- <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </connector>
+ </connectors>
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </connector>
- </connectors>
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </acceptor>
+ </acceptors>
+
+ <!-- Other config -->
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </acceptor>
- </acceptors>
-
- <!-- Other config -->
+ <journal-min-files>2</journal-min-files>
- <journal-min-files>2</journal-min-files>
-
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/automatic-failover/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/automatic-failover/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/automatic-failover/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,16 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
-
-</settings>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
+</configuration>
Modified: trunk/examples/jms/automatic-failover/server1/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/automatic-failover/server1/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/automatic-failover/server1/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,38 +1,34 @@
-<deployment xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
+<configuration xmlns="urn:jboss:messaging"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../../../src/schemas/jbm-configuration.xsd">
+ <clustered>true</clustered>
+
+ <backup-connector-ref connector-name="backup-connector"/>
+
+ <!-- Connectors -->
- <clustered>true</clustered>
-
- <backup-connector-ref connector-name="backup-connector"/>
-
- <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
+ </connector>
+
+ <connector name="backup-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
+ </acceptor>
+ </acceptors>
+
+ <!-- Other config -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
- </connector>
-
- <connector name="backup-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
- </acceptor>
- </acceptors>
-
- <!-- Other config -->
+ <journal-min-files>2</journal-min-files>
- <journal-min-files>2</journal-min-files>
-
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/automatic-failover/server1/jbm-queues.xml
===================================================================
--- trunk/examples/jms/automatic-failover/server1/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/automatic-failover/server1/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,16 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
-
-</settings>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
+</configuration>
Modified: trunk/examples/jms/bridge/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/bridge/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/bridge/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,57 +1,53 @@
-<deployment xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
+<configuration xmlns="urn:jboss:messaging"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
+ <clustered>true</clustered>
- <clustered>true</clustered>
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </connector>
+
+ <!-- Connector to the other node -->
+ <connector name="remote-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </acceptor>
+ </acceptors>
+
+ <!-- We need to create a core queue for the JMS queue explicitly because the bridge will be deployed
+ before the JMS queue is deployed, so the first time, it otherwise won't find the queue -->
+ <queues>
+ <queue name="jms.queue.sausage-factory">
+ <address>jms.queue.sausage-factory</address>
+ </queue>
+ </queues>
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </connector>
-
- <!-- Connector to the other node -->
- <connector name="remote-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </acceptor>
- </acceptors>
-
- <!-- We need to create a core queue for the JMS queue explicitly because the bridge will be deployed
- before the JMS queue is deployed, so the first time, it otherwise won't find the queue -->
- <queues>
- <queue name="jms.queue.sausage-factory">
- <address>jms.queue.sausage-factory</address>
- </queue>
- </queues>
+ <!-- We set-up a bridge that forwards from a queue on this node to an address on another node.
+ We specify a filter with the bridge, and a transformer too. The filter and transformer are optional -->
+ <bridges>
+ <bridge name="my-bridge">
+ <queue-name>jms.queue.sausage-factory</queue-name>
+ <forwarding-address>jms.queue.mincing-machine</forwarding-address>
+ <filter string="name='aardvark'"/>
+ <transformer-class-name>org.jboss.jms.example.HatColourChangeTransformer</transformer-class-name>
+ <reconnect-attempts>-1</reconnect-attempts>
+ <connector-ref connector-name="remote-connector"/>
+ </bridge>
+ </bridges>
+
+ <!-- Other config -->
- <!-- We set-up a bridge that forwards from a queue on this node to an address on another node.
- We specify a filter with the bridge, and a transformer too. The filter and transformer are optional -->
- <bridges>
- <bridge name="my-bridge">
- <queue-name>jms.queue.sausage-factory</queue-name>
- <forwarding-address>jms.queue.mincing-machine</forwarding-address>
- <filter string="name='aardvark'"/>
- <transformer-class-name>org.jboss.jms.example.HatColourChangeTransformer</transformer-class-name>
- <reconnect-attempts>-1</reconnect-attempts>
- <connector-ref connector-name="remote-connector"/>
- </bridge>
- </bridges>
-
- <!-- Other config -->
+ <journal-min-files>2</journal-min-files>
- <journal-min-files>2</journal-min-files>
-
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/bridge/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/bridge/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/bridge/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,16 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
-
-</settings>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
+</configuration>
Modified: trunk/examples/jms/bridge/server1/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/bridge/server1/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/bridge/server1/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,31 +1,28 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <clustered>true</clustered>
+ <clustered>true</clustered>
- <!-- Connectors -->
+ <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
- </acceptor>
- </acceptors>
-
- <!-- Other config -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
+ </acceptor>
+ </acceptors>
+
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
\ No newline at end of file
Modified: trunk/examples/jms/bridge/server1/jbm-queues.xml
===================================================================
--- trunk/examples/jms/bridge/server1/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/bridge/server1/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,16 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
-
-</settings>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
+</configuration>
Modified: trunk/examples/jms/browser/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/browser/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/browser/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,29 +1,25 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
+ <!-- Connectors -->
+
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </connector>
+ </connectors>
- <!-- Connectors -->
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </acceptor>
+ </acceptors>
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </acceptor>
- </acceptors>
+ <!-- Other config -->
- <!-- Other config -->
-
- <journal-min-files>2</journal-min-files>
-
- </configuration>
-
-</deployment>
+ <journal-min-files>2</journal-min-files>
+
+</configuration>
\ No newline at end of file
Modified: trunk/examples/jms/browser/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/browser/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/browser/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,16 +1,16 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
-
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
-
-</settings>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
+</configuration>
\ No newline at end of file
Modified: trunk/examples/jms/client-kickoff/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/client-kickoff/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/client-kickoff/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,31 +1,27 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
+ <!-- true to expose JBoss Messaging resources through JMX -->
+ <jmx-management-enabled>true</jmx-management-enabled>
- <!-- true to expose JBoss Messaging resources through JMX -->
- <jmx-management-enabled>true</jmx-management-enabled>
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </acceptor>
+ </acceptors>
- <!-- Connectors -->
- <connectors>
- <connector name="netty">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </acceptor>
- </acceptors>
+ <!-- Other config -->
- <!-- Other config -->
+ <journal-min-files>2</journal-min-files>
- <journal-min-files>2</journal-min-files>
-
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/client-kickoff/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/client-kickoff/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/client-kickoff/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,7 +1,7 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
<!-- the example does not require any queue settings -->
-</settings>
+</configuration>
Modified: trunk/examples/jms/client-side-load-balancing/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/client-side-load-balancing/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/client-side-load-balancing/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,50 +1,46 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
+ <clustered>true</clustered>
- <clustered>true</clustered>
+ <!-- Connectors -->
- <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </acceptor>
+ </acceptors>
+
+ <!-- Clustering configuration -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </acceptor>
- </acceptors>
-
- <!-- Clustering configuration -->
+ <broadcast-groups>
+ <broadcast-group name="my-broadcast-group">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>100</broadcast-period>
+ <connector-ref connector-name="netty-connector"/>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="my-discovery-group">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>10000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <!-- Other config -->
- <broadcast-groups>
- <broadcast-group name="my-broadcast-group">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <broadcast-period>100</broadcast-period>
- <connector-ref connector-name="netty-connector"/>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="my-discovery-group">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>10000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <!-- Other config -->
+ <journal-min-files>2</journal-min-files>
- <journal-min-files>2</journal-min-files>
-
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/client-side-load-balancing/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/client-side-load-balancing/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/client-side-load-balancing/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,16 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
-
-</settings>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
+</configuration>
Modified: trunk/examples/jms/client-side-load-balancing/server1/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/client-side-load-balancing/server1/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/client-side-load-balancing/server1/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,50 +1,47 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <clustered>true</clustered>
+ <clustered>true</clustered>
- <!-- Connectors -->
+ <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
- </acceptor>
- </acceptors>
-
- <!-- Clustering configuration -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
+ </acceptor>
+ </acceptors>
+
+ <!-- Clustering configuration -->
- <broadcast-groups>
- <broadcast-group name="my-broadcast-group">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <broadcast-period>100</broadcast-period>
- <connector-ref connector-name="netty-connector"/>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="my-discovery-group">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>10000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <!-- Other config -->
+ <broadcast-groups>
+ <broadcast-group name="my-broadcast-group">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>100</broadcast-period>
+ <connector-ref connector-name="netty-connector"/>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="my-discovery-group">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>10000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
\ No newline at end of file
Modified: trunk/examples/jms/client-side-load-balancing/server1/jbm-queues.xml
===================================================================
--- trunk/examples/jms/client-side-load-balancing/server1/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/client-side-load-balancing/server1/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,17 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
-</settings>
+</configuration>
Modified: trunk/examples/jms/client-side-load-balancing/server2/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/client-side-load-balancing/server2/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/client-side-load-balancing/server2/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,48 +1,45 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <clustered>true</clustered>
+ <clustered>true</clustered>
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5447" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5447" type="Integer"/>
- </acceptor>
- </acceptors>
-
- <!-- Clustering configuration -->
- <broadcast-groups>
- <broadcast-group name="my-broadcast-group">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <broadcast-period>100</broadcast-period>
- <connector-ref connector-name="netty-connector"/>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="my-discovery-group">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>10000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5447" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5447" type="Integer"/>
+ </acceptor>
+ </acceptors>
+
+ <!-- Clustering configuration -->
+ <broadcast-groups>
+ <broadcast-group name="my-broadcast-group">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>100</broadcast-period>
+ <connector-ref connector-name="netty-connector"/>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="my-discovery-group">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>10000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
- <!-- Other config -->
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/client-side-load-balancing/server2/jbm-queues.xml
===================================================================
--- trunk/examples/jms/client-side-load-balancing/server2/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/client-side-load-balancing/server2/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,17 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
-</settings>
+</configuration>
Modified: trunk/examples/jms/clustered-durable-subscription/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/clustered-durable-subscription/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/clustered-durable-subscription/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,59 +1,56 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <clustered>true</clustered>
+ <clustered>true</clustered>
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </acceptor>
- </acceptors>
-
- <!-- Clustering configuration -->
- <broadcast-groups>
- <broadcast-group name="my-broadcast-group">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <broadcast-period>100</broadcast-period>
- <connector-ref connector-name="netty-connector"/>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="my-discovery-group">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>10000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </acceptor>
+ </acceptors>
+
+ <!-- Clustering configuration -->
+ <broadcast-groups>
+ <broadcast-group name="my-broadcast-group">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>100</broadcast-period>
+ <connector-ref connector-name="netty-connector"/>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="my-discovery-group">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>10000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <retry-interval>500</retry-interval>
- <use-duplicate-detection>true</use-duplicate-detection>
- <forward-when-no-consumers>true</forward-when-no-consumers>
- <max-hops>1</max-hops>
- <discovery-group-ref discovery-group-name="my-discovery-group"/>
- </cluster-connection>
- </cluster-connections>
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <retry-interval>500</retry-interval>
+ <use-duplicate-detection>true</use-duplicate-detection>
+ <forward-when-no-consumers>true</forward-when-no-consumers>
+ <max-hops>1</max-hops>
+ <discovery-group-ref discovery-group-name="my-discovery-group"/>
+ </cluster-connection>
+ </cluster-connections>
- <!-- other configuration -->
+ <!-- other configuration -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/clustered-durable-subscription/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/clustered-durable-subscription/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/clustered-durable-subscription/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,17 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
-</settings>
+</configuration>
Modified: trunk/examples/jms/clustered-durable-subscription/server1/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/clustered-durable-subscription/server1/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/clustered-durable-subscription/server1/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,60 +1,57 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <clustered>true</clustered>
+ <clustered>true</clustered>
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
- </acceptor>
- </acceptors>
-
- <!-- Clustering configuration -->
- <broadcast-groups>
- <broadcast-group name="my-broacast-group">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <broadcast-period>100</broadcast-period>
- <connector-ref connector-name="netty-connector"/>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="my-discovery-group">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>10000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <retry-interval>500</retry-interval>
- <use-duplicate-detection>true</use-duplicate-detection>
- <forward-when-no-consumers>true</forward-when-no-consumers>
- <max-hops>1</max-hops>
- <discovery-group-ref discovery-group-name="my-discovery-group"/>
- </cluster-connection>
- </cluster-connections>
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
+ </acceptor>
+ </acceptors>
+
+ <!-- Clustering configuration -->
+ <broadcast-groups>
+ <broadcast-group name="my-broacast-group">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>100</broadcast-period>
+ <connector-ref connector-name="netty-connector"/>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="my-discovery-group">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>10000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <retry-interval>500</retry-interval>
+ <use-duplicate-detection>true</use-duplicate-detection>
+ <forward-when-no-consumers>true</forward-when-no-consumers>
+ <max-hops>1</max-hops>
+ <discovery-group-ref discovery-group-name="my-discovery-group"/>
+ </cluster-connection>
+ </cluster-connections>
- <!-- other configuration -->
+ <!-- other configuration -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/clustered-durable-subscription/server1/jbm-queues.xml
===================================================================
--- trunk/examples/jms/clustered-durable-subscription/server1/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/clustered-durable-subscription/server1/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,17 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
-</settings>
+</configuration>
Modified: trunk/examples/jms/clustered-queue/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/clustered-queue/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/clustered-queue/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,60 +1,56 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
+ <clustered>true</clustered>
- <clustered>true</clustered>
+ <!-- Connectors -->
- <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </acceptor>
+ </acceptors>
+
+ <!-- Clustering configuration -->
+ <broadcast-groups>
+ <broadcast-group name="my-broadcast-group">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>100</broadcast-period>
+ <connector-ref connector-name="netty-connector"/>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="my-discovery-group">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>10000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <retry-interval>500</retry-interval>
+ <use-duplicate-detection>true</use-duplicate-detection>
+ <forward-when-no-consumers>true</forward-when-no-consumers>
+ <max-hops>1</max-hops>
+ <discovery-group-ref discovery-group-name="my-discovery-group"/>
+ </cluster-connection>
+ </cluster-connections>
+
+ <!-- Other config -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </acceptor>
- </acceptors>
-
- <!-- Clustering configuration -->
- <broadcast-groups>
- <broadcast-group name="my-broadcast-group">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <broadcast-period>100</broadcast-period>
- <connector-ref connector-name="netty-connector"/>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="my-discovery-group">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>10000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <retry-interval>500</retry-interval>
- <use-duplicate-detection>true</use-duplicate-detection>
- <forward-when-no-consumers>true</forward-when-no-consumers>
- <max-hops>1</max-hops>
- <discovery-group-ref discovery-group-name="my-discovery-group"/>
- </cluster-connection>
- </cluster-connections>
-
- <!-- Other config -->
+ <journal-min-files>2</journal-min-files>
- <journal-min-files>2</journal-min-files>
-
- </configuration>
-
-</deployment>
+</configuration>
\ No newline at end of file
Modified: trunk/examples/jms/clustered-queue/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/clustered-queue/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/clustered-queue/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,17 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
-</settings>
+</configuration>
Modified: trunk/examples/jms/clustered-queue/server1/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/clustered-queue/server1/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/clustered-queue/server1/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,59 +1,55 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
+ <clustered>true</clustered>
- <clustered>true</clustered>
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
+ </acceptor>
+ </acceptors>
+
+ <!-- Clustering configuration -->
+ <broadcast-groups>
+ <broadcast-group name="my-broadcast-group">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>100</broadcast-period>
+ <connector-ref connector-name="netty-connector"/>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="my-discovery-group">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>10000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <retry-interval>500</retry-interval>
+ <use-duplicate-detection>true</use-duplicate-detection>
+ <forward-when-no-consumers>true</forward-when-no-consumers>
+ <max-hops>1</max-hops>
+ <discovery-group-ref discovery-group-name="my-discovery-group"/>
+ </cluster-connection>
+ </cluster-connections>
+
+ <!-- Other config -->
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
- </acceptor>
- </acceptors>
-
- <!-- Clustering configuration -->
- <broadcast-groups>
- <broadcast-group name="my-broadcast-group">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <broadcast-period>100</broadcast-period>
- <connector-ref connector-name="netty-connector"/>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="my-discovery-group">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>10000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <retry-interval>500</retry-interval>
- <use-duplicate-detection>true</use-duplicate-detection>
- <forward-when-no-consumers>true</forward-when-no-consumers>
- <max-hops>1</max-hops>
- <discovery-group-ref discovery-group-name="my-discovery-group"/>
- </cluster-connection>
- </cluster-connections>
-
- <!-- Other config -->
+ <journal-min-files>2</journal-min-files>
- <journal-min-files>2</journal-min-files>
-
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/clustered-queue/server1/jbm-queues.xml
===================================================================
--- trunk/examples/jms/clustered-queue/server1/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/clustered-queue/server1/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,16 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
-
-</settings>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
+</configuration>
Modified: trunk/examples/jms/clustered-topic/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/clustered-topic/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/clustered-topic/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,61 +1,57 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
+ <clustered>true</clustered>
- <clustered>true</clustered>
+ <!-- Connectors -->
- <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </acceptor>
+ </acceptors>
+
+ <!-- Clustering configuration -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </acceptor>
- </acceptors>
-
- <!-- Clustering configuration -->
+ <broadcast-groups>
+ <broadcast-group name="my-broadcast-group">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>100</broadcast-period>
+ <connector-ref connector-name="netty-connector"/>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="my-discovery-group">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>10000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <retry-interval>500</retry-interval>
+ <use-duplicate-detection>true</use-duplicate-detection>
+ <forward-when-no-consumers>true</forward-when-no-consumers>
+ <max-hops>1</max-hops>
+ <discovery-group-ref discovery-group-name="my-discovery-group"/>
+ </cluster-connection>
+ </cluster-connections>
+
+ <!-- other configuration -->
- <broadcast-groups>
- <broadcast-group name="my-broadcast-group">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <broadcast-period>100</broadcast-period>
- <connector-ref connector-name="netty-connector"/>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="my-discovery-group">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>10000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <retry-interval>500</retry-interval>
- <use-duplicate-detection>true</use-duplicate-detection>
- <forward-when-no-consumers>true</forward-when-no-consumers>
- <max-hops>1</max-hops>
- <discovery-group-ref discovery-group-name="my-discovery-group"/>
- </cluster-connection>
- </cluster-connections>
-
- <!-- other configuration -->
+ <journal-min-files>2</journal-min-files>
- <journal-min-files>2</journal-min-files>
-
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/clustered-topic/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/clustered-topic/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/clustered-topic/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,17 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
-</settings>
+</configuration>
Modified: trunk/examples/jms/clustered-topic/server1/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/clustered-topic/server1/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/clustered-topic/server1/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,60 +1,56 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
+ <clustered>true</clustered>
- <clustered>true</clustered>
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
+ </acceptor>
+ </acceptors>
+
+ <!-- Clustering configuration -->
+ <broadcast-groups>
+ <broadcast-group name="my-broadcast-group">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>100</broadcast-period>
+ <connector-ref connector-name="netty-connector"/>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="my-discovery-group">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>10000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <retry-interval>500</retry-interval>
+ <use-duplicate-detection>true</use-duplicate-detection>
+ <forward-when-no-consumers>true</forward-when-no-consumers>
+ <max-hops>1</max-hops>
+ <discovery-group-ref discovery-group-name="my-discovery-group"/>
+ </cluster-connection>
+ </cluster-connections>
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
- </acceptor>
- </acceptors>
-
- <!-- Clustering configuration -->
- <broadcast-groups>
- <broadcast-group name="my-broadcast-group">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <broadcast-period>100</broadcast-period>
- <connector-ref connector-name="netty-connector"/>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="my-discovery-group">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>10000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <retry-interval>500</retry-interval>
- <use-duplicate-detection>true</use-duplicate-detection>
- <forward-when-no-consumers>true</forward-when-no-consumers>
- <max-hops>1</max-hops>
- <discovery-group-ref discovery-group-name="my-discovery-group"/>
- </cluster-connection>
- </cluster-connections>
+ <!-- other configuration -->
- <!-- other configuration -->
+ <journal-min-files>2</journal-min-files>
- <journal-min-files>2</journal-min-files>
-
- </configuration>
-
-</deployment>
+</configuration>
\ No newline at end of file
Modified: trunk/examples/jms/clustered-topic/server1/jbm-queues.xml
===================================================================
--- trunk/examples/jms/clustered-topic/server1/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/clustered-topic/server1/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,17 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
-</settings>
+</configuration>
Modified: trunk/examples/jms/consumer-rate-limit/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/consumer-rate-limit/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/consumer-rate-limit/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,29 +1,25 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
+ <!-- Connectors -->
- <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
+ </acceptor>
+ </acceptors>
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
- </acceptor>
- </acceptors>
+ <!-- Other config -->
- <!-- Other config -->
+ <journal-min-files>2</journal-min-files>
- <journal-min-files>2</journal-min-files>
-
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/consumer-rate-limit/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/consumer-rate-limit/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/consumer-rate-limit/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,17 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
-
-</settings>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
+
+</configuration>
Modified: trunk/examples/jms/dead-letter/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/dead-letter/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/dead-letter/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,29 +1,25 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
+ <!-- Connectors -->
- <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </acceptor>
+ </acceptors>
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </acceptor>
- </acceptors>
+ <!-- Other config -->
- <!-- Other config -->
+ <journal-min-files>2</journal-min-files>
- <journal-min-files>2</journal-min-files>
-
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/dead-letter/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/dead-letter/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/dead-letter/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,21 +1,25 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security match="jms.#">
- <permission type="createDurableQueue" roles="guest"/>
- <permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
- <!--override the max-delivery-attempts and dead letter address for the example queue-->
- <address-settings match="jms.queue.exampleQueue">
- <dead-letter-address>jms.queue.deadLetterQueue</dead-letter-address>
- <max-delivery-attempts>3</max-delivery-attempts>
+ <address-settings>
+ <!--override the max-delivery-attempts and dead letter address for the example queue-->
+ <address-setting match="jms.queue.exampleQueue">
+ <dead-letter-address>jms.queue.deadLetterQueue</dead-letter-address>
+ <max-delivery-attempts>3</max-delivery-attempts>
+ </address-setting>
</address-settings>
-</settings>
+</configuration>
Modified: trunk/examples/jms/delayed-redelivery/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/delayed-redelivery/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/delayed-redelivery/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,29 +1,25 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
+ <!-- Connectors -->
- <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </acceptor>
+ </acceptors>
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </acceptor>
- </acceptors>
+ <!-- Other config -->
- <!-- Other config -->
+ <journal-min-files>2</journal-min-files>
- <journal-min-files>2</journal-min-files>
-
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/delayed-redelivery/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/delayed-redelivery/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/delayed-redelivery/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,22 +1,24 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security match="jms.#">
- <permission type="createDurableQueue" roles="guest"/>
- <permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
- <!--override the redelivery-delay for the example queue-->
- <address-settings match="jms.queue.exampleQueue">
-
- <redelivery-delay>5000</redelivery-delay>
-
+ <address-settings>
+ <!--override the redelivery-delay for the example queue-->
+ <address-setting match="jms.queue.exampleQueue">
+ <redelivery-delay>5000</redelivery-delay>
+ </address-setting>
</address-settings>
-</settings>
+</configuration>
Modified: trunk/examples/jms/divert/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/divert/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/divert/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,77 +1,74 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
-
- <!-- We need to make it clustered otherwise the bridge won't deploy -->
- <clustered>true</clustered>
- <!-- Connectors -->
+ <!-- We need to make it clustered otherwise the bridge won't deploy -->
+ <clustered>true</clustered>
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </connector>
+ <!-- Connectors -->
+
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </connector>
+
+ <!-- This connector corresponds to the New York server -->
- <!-- This connector corresponds to the New York server -->
-
- <connector name="newyork-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
- </connector>
- </connectors>
+ <connector name="newyork-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
+ </connector>
+ </connectors>
- <!-- Acceptors -->
+ <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </acceptor>
- </acceptors>
-
- <!-- Divert configuration -->
-
- <!-- We need to create a core queue for the JMS queue explicitly because the bridge will be deployed
- before the JMS queue is deployed, so the first time, it otherwise won't find the queue -->
- <queues>
- <queue name="jms.queue.priceForwarding">
- <address>jms.queue.priceForwarding</address>
- </queue>
- </queues>
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </acceptor>
+ </acceptors>
+
+ <!-- Divert configuration -->
+
+ <!-- We need to create a core queue for the JMS queue explicitly because the bridge will be deployed
+ before the JMS queue is deployed, so the first time, it otherwise won't find the queue -->
+ <queues>
+ <queue name="jms.queue.priceForwarding">
+ <address>jms.queue.priceForwarding</address>
+ </queue>
+ </queues>
- <diverts>
- <divert name="order-divert">
- <address>jms.queue.orders</address>
- <forwarding-address>jms.topic.spyTopic</forwarding-address>
- <exclusive>false</exclusive>
- </divert>
-
- <divert name="prices-divert">
- <address>jms.topic.priceUpdates</address>
- <forwarding-address>jms.queue.priceForwarding</forwarding-address>
- <filter string="office='New York'"/>
- <transformer-class-name>org.jboss.jms.example.AddForwardingTimeTransformer</transformer-class-name>
- <exclusive>true</exclusive>
- </divert>
- </diverts>
+ <diverts>
+ <divert name="order-divert">
+ <address>jms.queue.orders</address>
+ <forwarding-address>jms.topic.spyTopic</forwarding-address>
+ <exclusive>false</exclusive>
+ </divert>
- <!-- Bridge configuration -->
-
- <bridges>
- <bridge name="price-forward-bridge">
- <queue-name>jms.queue.priceForwarding</queue-name>
- <forwarding-address>jms.topic.newYorkPriceUpdates</forwarding-address>
- <reconnect-attempts>-1</reconnect-attempts>
- <connector-ref connector-name="newyork-connector"/>
- </bridge>
- </bridges>
+ <divert name="prices-divert">
+ <address>jms.topic.priceUpdates</address>
+ <forwarding-address>jms.queue.priceForwarding</forwarding-address>
+ <filter string="office='New York'"/>
+ <transformer-class-name>org.jboss.jms.example.AddForwardingTimeTransformer</transformer-class-name>
+ <exclusive>true</exclusive>
+ </divert>
+ </diverts>
+
+ <!-- Bridge configuration -->
+
+ <bridges>
+ <bridge name="price-forward-bridge">
+ <queue-name>jms.queue.priceForwarding</queue-name>
+ <forwarding-address>jms.topic.newYorkPriceUpdates</forwarding-address>
+ <reconnect-attempts>-1</reconnect-attempts>
+ <connector-ref connector-name="newyork-connector"/>
+ </bridge>
+ </bridges>
- <!-- Other config -->
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/divert/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/divert/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/divert/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,17 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example -->
- <security match="jms.#">
- <permission type="createDurableQueue" roles="guest"/>
- <permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example -->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
-</settings>
+</configuration>
Modified: trunk/examples/jms/divert/server1/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/divert/server1/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/divert/server1/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,30 +1,26 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
+ <!-- Connectors -->
- <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
+ </connector>
+ </connectors>
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
- </connector>
- </connectors>
+ <!-- Acceptors -->
- <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
+ </acceptor>
+ </acceptors>
+
+ <!-- Other config -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
- </acceptor>
- </acceptors>
-
- <!-- Other config -->
+ <journal-min-files>2</journal-min-files>
- <journal-min-files>2</journal-min-files>
-
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/divert/server1/jbm-queues.xml
===================================================================
--- trunk/examples/jms/divert/server1/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/divert/server1/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,17 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security match="jms.#">
- <permission type="createDurableQueue" roles="guest"/>
- <permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
-</settings>
+</configuration>
Modified: trunk/examples/jms/durable-subscription/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/durable-subscription/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/durable-subscription/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,29 +1,26 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </acceptor>
- </acceptors>
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </acceptor>
+ </acceptors>
- <!-- Other config -->
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/durable-subscription/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/durable-subscription/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/durable-subscription/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,17 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example topic-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example topic-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
-</settings>
+</configuration>
Modified: trunk/examples/jms/expiry/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/expiry/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/expiry/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,29 +1,26 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <!-- Connectors -->
+ <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </acceptor>
- </acceptors>
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </acceptor>
+ </acceptors>
- <!-- Other config -->
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/expiry/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/expiry/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/expiry/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,20 +1,24 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security match="jms.#">
- <permission type="createDurableQueue" roles="guest"/>
- <permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
- <!--override the expiry address for the example-->
- <address-settings match="jms.queue.exampleQueue">
- <expiry-address>jms.queue.expiryQueue</expiry-address>
+ <address-settings>
+ <!--override the expiry address for the example-->
+ <address-setting match="jms.queue.exampleQueue">
+ <expiry-address>jms.queue.expiryQueue</expiry-address>
+ </address-setting>
</address-settings>
-</settings>
+</configuration>
Modified: trunk/examples/jms/http-transport/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/http-transport/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/http-transport/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,32 +1,28 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
+ <!-- Connectors -->
- <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.httpenabled" value="true" type="Boolean"/>
+ <param key="jbm.remoting.netty.port" value="8080" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.httpenabled" value="true" type="Boolean"/>
- <param key="jbm.remoting.netty.port" value="8080" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.httpenabled" value="true" type="Boolean"/>
+ <param key="jbm.remoting.netty.port" value="8080" type="Integer"/>
+ </acceptor>
+ </acceptors>
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.httpenabled" value="true" type="Boolean"/>
- <param key="jbm.remoting.netty.port" value="8080" type="Integer"/>
- </acceptor>
- </acceptors>
+ <!-- Other config -->
- <!-- Other config -->
+ <journal-min-files>2</journal-min-files>
- <journal-min-files>2</journal-min-files>
-
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/http-transport/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/http-transport/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/http-transport/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,17 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
-</settings>
+</configuration>
Modified: trunk/examples/jms/instantiate-connection-factory/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/instantiate-connection-factory/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/instantiate-connection-factory/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,29 +1,26 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <!-- Connectors -->
+ <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
- </acceptor>
- </acceptors>
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
+ </acceptor>
+ </acceptors>
- <!-- Other config -->
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/instantiate-connection-factory/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/instantiate-connection-factory/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/instantiate-connection-factory/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,17 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
-</settings>
+</configuration>
Modified: trunk/examples/jms/interceptor/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/interceptor/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/interceptor/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,33 +1,30 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <remoting-interceptors>
- <class-name>org.jboss.jms.example.SimpleInterceptor</class-name>
- </remoting-interceptors>
+ <remoting-interceptors>
+ <class-name>org.jboss.jms.example.SimpleInterceptor</class-name>
+ </remoting-interceptors>
- <!-- Connectors -->
+ <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
- </acceptor>
- </acceptors>
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
+ </acceptor>
+ </acceptors>
- <!-- Other config -->
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/interceptor/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/interceptor/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/interceptor/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,17 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
-</settings>
+</configuration>
Modified: trunk/examples/jms/jmx/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/jmx/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/jmx/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,31 +1,28 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <!-- true to expose JBoss Messaging resources through JMX -->
- <jmx-management-enabled>true</jmx-management-enabled>
+ <!-- true to expose JBoss Messaging resources through JMX -->
+ <jmx-management-enabled>true</jmx-management-enabled>
- <!-- Connectors -->
- <connectors>
- <connector name="netty">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </acceptor>
- </acceptors>
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </acceptor>
+ </acceptors>
- <!-- Other config -->
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/jmx/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/jmx/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/jmx/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,17 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
-</settings>
+</configuration>
Modified: trunk/examples/jms/large-message/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/large-message/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/large-message/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,28 +1,25 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </acceptor>
- </acceptors>
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </acceptor>
+ </acceptors>
- <!-- Other config -->
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/large-message/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/large-message/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/large-message/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,17 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
-</settings>
+</configuration>
Modified: trunk/examples/jms/last-value-queue/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/last-value-queue/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/last-value-queue/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,29 +1,26 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <!-- Connectors -->
+ <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </acceptor>
- </acceptors>
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </acceptor>
+ </acceptors>
- <!-- Other config -->
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/last-value-queue/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/last-value-queue/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/last-value-queue/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,20 +1,24 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
- <!--override the expiry address for the example-->
- <address-settings match="jms.queue.lastValueQueue">
- <last-value-queue>true</last-value-queue>
+ <address-settings>
+ <!--override the expiry address for the example-->
+ <address-setting match="jms.queue.lastValueQueue">
+ <last-value-queue>true</last-value-queue>
+ </address-setting>
</address-settings>
-</settings>
+</configuration>
Modified: trunk/examples/jms/management/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/management/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/management/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,23 +1,20 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <management-address>jbm.management</management-address>
+ <management-address>jbm.management</management-address>
- <connectors>
- <connector name="netty">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- </connector>
- </connectors>
-
- <!-- Netty standard TCP acceptor -->
- <acceptors>
- <acceptor name="netty">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
- </acceptors>
-
- </configuration>
-
-</deployment>
+ <connectors>
+ <connector name="netty">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ </connector>
+ </connectors>
+
+ <!-- Netty standard TCP acceptor -->
+ <acceptors>
+ <acceptor name="netty">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ </acceptor>
+ </acceptors>
+
+</configuration>
Modified: trunk/examples/jms/management/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/management/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/management/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,27 +1,32 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
-
- <!--security for management queue-->
- <security match="jbm.management">
- <permission type="manage" roles="guest" />
- </security>
+ <security-settings>
+
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+
+ <!--security for management queue-->
+ <security-setting match="jbm.management">
+ <permission type="manage" roles="guest" />
+ </security-setting>
+
+ <!-- security settings for JMS temporary queue -->
+ <security-setting match="jms.tempqueue.#">
+ <permission type="createTempQueue" roles="guest"/>
+ <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+
+ </security-settings>
- <!-- security settings for JMS temporary queue -->
- <security match="jms.tempqueue.#">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
-</settings>
+</configuration>
Modified: trunk/examples/jms/management-notifications/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/management-notifications/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/management-notifications/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,32 +1,30 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../../../../src/schemas/jbm-configuration.xsd">
- <configuration>
- <management-notification-address>example.notifications</management-notification-address>
-
- <!-- create a default queue for the notification -->
- <queues>
- <queue name="example.notifications">
- <address>example.notifications</address>
- </queue>
- </queues>
+ <management-notification-address>example.notifications</management-notification-address>
- <connectors>
- <connector name="netty">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- </connector>
- </connectors>
-
- <!-- Netty standard TCP acceptor -->
- <acceptors>
- <acceptor name="netty">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
- </acceptors>
+ <!-- create a default queue for the notification -->
+ <queues>
+ <queue name="example.notifications">
+ <address>example.notifications</address>
+ </queue>
+ </queues>
- <!-- Other configs -->
- <journal-min-files>2</journal-min-files>
- </configuration>
+ <connectors>
+ <connector name="netty">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ </connector>
+ </connectors>
+
+ <!-- Netty standard TCP acceptor -->
+ <acceptors>
+ <acceptor name="netty">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ </acceptor>
+ </acceptors>
-</deployment>
+ <!-- Other configs -->
+ <journal-min-files>2</journal-min-files>
+
+</configuration>
Modified: trunk/examples/jms/management-notifications/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/management-notifications/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/management-notifications/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,29 +1,32 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
-
- <!--security for notification queue-->
- <security match="example.notifications">
- <permission type="consume" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+
+ <!--security for notification queue-->
+ <security-setting match="example.notifications">
+ <permission type="consume" roles="guest"/>
+ <permission type="createTempQueue" roles="guest"/>
+ <permission type="deleteTempQueue" 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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
- <!-- security settings for JMS temporary queue -->
- <security match="queuetempjms.*">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
-</settings>
+</configuration>
Modified: trunk/examples/jms/message-counters/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/message-counters/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/message-counters/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,33 +1,30 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../../../../src/schemas/jbm-configuration.xsd">
- <configuration>
- <jmx-management-enabled>true</jmx-management-enabled>
- <message-counter-enabled>true</message-counter-enabled>
- <message-counter-sample-period>2000</message-counter-sample-period>
- <message-counter-max-day-history>2</message-counter-max-day-history>
+ <jmx-management-enabled>true</jmx-management-enabled>
+ <message-counter-enabled>true</message-counter-enabled>
+ <message-counter-sample-period>2000</message-counter-sample-period>
+ <message-counter-max-day-history>2</message-counter-max-day-history>
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </acceptor>
- </acceptors>
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </acceptor>
+ </acceptors>
- <!-- Other config -->
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/message-counters/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/message-counters/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/message-counters/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,30 +1,34 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+
+ <!--security for dead letter queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
- <!--security for dead letter queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
-
- <!--override the expiry address for the example-->
- <address-settings match="jms.queue.exampleQueue">
- <expiry-address>jms.queue.expiryQueue</expiry-address>
+ <address-settings>
+ <!--override the expiry address for the example-->
+ <address-setting match="jms.queue.exampleQueue">
+ <expiry-address>jms.queue.expiryQueue</expiry-address>
+ </address-setting>
</address-settings>
-</settings>
+</configuration>
Modified: trunk/examples/jms/message-group/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/message-group/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/message-group/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,28 +1,25 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </acceptor>
- </acceptors>
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </acceptor>
+ </acceptors>
- <!-- Other config -->
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/message-group/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/message-group/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/message-group/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,19 +1,23 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
- <address-settings match="jms.queue.exampleQueue">
- <distribution-policy-class>org.jboss.messaging.core.server.impl.GroupingRoundRobinDistributor</distribution-policy-class>
+ <address-settings>
+ <address-setting match="jms.queue.exampleQueue">
+ <distribution-policy-class>org.jboss.messaging.core.server.impl.GroupingRoundRobinDistributor</distribution-policy-class>
+ </address-setting>
</address-settings>
-</settings>
+</configuration>
Modified: trunk/examples/jms/message-priority/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/message-priority/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/message-priority/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,28 +1,25 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </acceptor>
- </acceptors>
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </acceptor>
+ </acceptors>
- <!-- Other config -->
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/message-priority/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/message-priority/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/message-priority/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,17 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
-</settings>
+</configuration>
Modified: trunk/examples/jms/no-consumer-buffering/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/no-consumer-buffering/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/no-consumer-buffering/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,29 +1,26 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <!-- Connectors -->
+ <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
- </acceptor>
- </acceptors>
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
+ </acceptor>
+ </acceptors>
- <!-- Other config -->
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/no-consumer-buffering/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/no-consumer-buffering/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/no-consumer-buffering/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,17 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
-</settings>
+</configuration>
Modified: trunk/examples/jms/paging/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/paging/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/paging/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,33 +1,29 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </connector>
- </connectors>
-
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </acceptor>
- </acceptors>
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </connector>
+ </connectors>
+
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </acceptor>
+ </acceptors>
- <!-- Other config -->
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
-
- <paging-max-global-size-bytes>20485760</paging-max-global-size-bytes>
- <paging-global-watermark-size>1048576</paging-global-watermark-size>
-
-
- </configuration>
-
-</deployment>
+ <journal-min-files>2</journal-min-files>
+
+ <paging-max-global-size-bytes>20485760</paging-max-global-size-bytes>
+ <paging-global-watermark-size>1048576</paging-global-watermark-size>
+
+</configuration>
Modified: trunk/examples/jms/paging/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/paging/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/paging/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,33 +1,37 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <address-settings>
+ <address-setting match="jms.queue.pagingQueue">
+ <max-size-bytes>100000</max-size-bytes>
+ <page-size-bytes>20000</page-size-bytes>
+ </address-setting>
- <address-settings match="jms.queue.pagingQueue">
- <max-size-bytes>100000</max-size-bytes>
- <page-size-bytes>20000</page-size-bytes>
+ <address-setting match="jms.queue.exampleQueue">
+ <page-size-bytes>1048576</page-size-bytes>
+ </address-setting>
</address-settings>
- <address-settings match="jms.queue.exampleQueue">
- <page-size-bytes>1048576</page-size-bytes>
- </address-settings>
-
-</settings>
+</configuration>
Modified: trunk/examples/jms/pre-acknowledge/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/pre-acknowledge/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/pre-acknowledge/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,29 +1,26 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <!-- Connectors -->
+ <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
- </acceptor>
- </acceptors>
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
+ </acceptor>
+ </acceptors>
- <!-- Other config -->
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/pre-acknowledge/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/pre-acknowledge/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/pre-acknowledge/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,18 +1,20 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <security match="jms.#">
- <permission type="createDurableQueue" roles="guest"/>
- <permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
-
- <security match="jbm.management">
- <permission type="manage" roles="guest" />
- </security>
+ <security-settings>
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+
+ <security-setting match="jbm.management">
+ <permission type="manage" roles="guest" />
+ </security-setting>
+ </security-settings>
-</settings>
+</configuration>
Modified: trunk/examples/jms/pre-acknowledge/src/org/jboss/jms/example/PreacknowledgeExample.java
===================================================================
--- trunk/examples/jms/pre-acknowledge/src/org/jboss/jms/example/PreacknowledgeExample.java 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/pre-acknowledge/src/org/jboss/jms/example/PreacknowledgeExample.java 2009-05-12 14:44:10 UTC (rev 6742)
@@ -146,9 +146,9 @@
JMSManagementHelper.putAttribute(m, "jms.queue.exampleQueue", "MessageCount");
- ObjectMessage response = (ObjectMessage)requestor.request(m);
+ Message response = requestor.request(m);
- int messageCount = (Integer)response.getObject();
+ int messageCount = (Integer)JMSManagementHelper.getResult(response);
return messageCount;
}
Modified: trunk/examples/jms/producer-rate-limit/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/producer-rate-limit/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/producer-rate-limit/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,29 +1,26 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <!-- Connectors -->
+ <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
- </acceptor>
- </acceptors>
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
+ </acceptor>
+ </acceptors>
- <!-- Other config -->
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/producer-rate-limit/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/producer-rate-limit/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/producer-rate-limit/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,17 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
-</settings>
+</configuration>
Modified: trunk/examples/jms/queue/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/queue/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/queue/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,29 +1,26 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <!-- Connectors -->
+ <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
- </acceptor>
- </acceptors>
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
+ </acceptor>
+ </acceptors>
- <!-- Other config -->
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/queue/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/queue/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/queue/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,17 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
-</settings>
+</configuration>
Modified: trunk/examples/jms/queue-message-redistribution/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/queue-message-redistribution/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/queue-message-redistribution/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,59 +1,56 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <clustered>true</clustered>
+ <clustered>true</clustered>
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </acceptor>
- </acceptors>
-
- <!-- Clustering configuration -->
- <broadcast-groups>
- <broadcast-group name="my-broadcast-group">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <broadcast-period>100</broadcast-period>
- <connector-ref connector-name="netty-connector"/>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="my-discovery-group">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>10000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </acceptor>
+ </acceptors>
+
+ <!-- Clustering configuration -->
+ <broadcast-groups>
+ <broadcast-group name="my-broadcast-group">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>100</broadcast-period>
+ <connector-ref connector-name="netty-connector"/>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="my-discovery-group">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>10000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <retry-interval>500</retry-interval>
- <use-duplicate-detection>true</use-duplicate-detection>
- <forward-when-no-consumers>false</forward-when-no-consumers>
- <max-hops>1</max-hops>
- <discovery-group-ref discovery-group-name="my-discovery-group"/>
- </cluster-connection>
- </cluster-connections>
-
- <!-- Other config -->
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <retry-interval>500</retry-interval>
+ <use-duplicate-detection>true</use-duplicate-detection>
+ <forward-when-no-consumers>false</forward-when-no-consumers>
+ <max-hops>1</max-hops>
+ <discovery-group-ref discovery-group-name="my-discovery-group"/>
+ </cluster-connection>
+ </cluster-connections>
+
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/queue-message-redistribution/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/queue-message-redistribution/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/queue-message-redistribution/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,24 +1,28 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
- <!-- We set a redistribution delay of zero on all jms queues and topic subscriptions
- Default redistribution delay as -1 which means "disable redistribution"
- Setting it to a value > 0 means how long to wait before redistributing, if a consumer is closed
- then another one quickly recreated you might want to set it thus, to avoid unnecessary
- redistribution -->
- <address-settings match="jms.#">
- <redistribution-delay>0</redistribution-delay>
+ <address-settings>
+ <!-- We set a redistribution delay of zero on all jms queues and topic subscriptions
+ Default redistribution delay as -1 which means "disable redistribution"
+ Setting it to a value > 0 means how long to wait before redistributing, if a consumer is closed
+ then another one quickly recreated you might want to set it thus, to avoid unnecessary
+ redistribution -->
+ <address-setting match="jms.#">
+ <redistribution-delay>0</redistribution-delay>
+ </address-setting>
</address-settings>
-</settings>
+</configuration>
Modified: trunk/examples/jms/queue-message-redistribution/server1/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/queue-message-redistribution/server1/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/queue-message-redistribution/server1/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,60 +1,57 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <clustered>true</clustered>
+ <clustered>true</clustered>
- <!-- Connectors -->
+ <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
- </acceptor>
- </acceptors>
-
- <!-- Clustering configuration -->
- <broadcast-groups>
- <broadcast-group name="my-broadcast-group">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <broadcast-period>100</broadcast-period>
- <connector-ref connector-name="netty-connector"/>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="my-discovery-group">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>10000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <retry-interval>500</retry-interval>
- <use-duplicate-detection>true</use-duplicate-detection>
- <forward-when-no-consumers>false</forward-when-no-consumers>
- <max-hops>1</max-hops>
- <discovery-group-ref discovery-group-name="my-discovery-group"/>
- </cluster-connection>
- </cluster-connections>
-
- <!-- Other config -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
+ </acceptor>
+ </acceptors>
+
+ <!-- Clustering configuration -->
+ <broadcast-groups>
+ <broadcast-group name="my-broadcast-group">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>100</broadcast-period>
+ <connector-ref connector-name="netty-connector"/>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="my-discovery-group">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>10000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <retry-interval>500</retry-interval>
+ <use-duplicate-detection>true</use-duplicate-detection>
+ <forward-when-no-consumers>false</forward-when-no-consumers>
+ <max-hops>1</max-hops>
+ <discovery-group-ref discovery-group-name="my-discovery-group"/>
+ </cluster-connection>
+ </cluster-connections>
+
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/queue-message-redistribution/server1/jbm-queues.xml
===================================================================
--- trunk/examples/jms/queue-message-redistribution/server1/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/queue-message-redistribution/server1/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,24 +1,28 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
- <!-- We set a redistribution delay of zero on all jms queues and topic subscriptions
- Default redistribution delay as -1 which means "disable redistribution"
- Setting it to a value > 0 means how long to wait before redistributing, if a consumer is closed
- then another one quickly recreated you might want to set it thus, to avoid unnecessary
- redistribution -->
- <address-settings match="jms.#">
- <redistribution-delay>0</redistribution-delay>
+ <address-settings>
+ <!-- We set a redistribution delay of zero on all jms queues and topic subscriptions
+ Default redistribution delay as -1 which means "disable redistribution"
+ Setting it to a value > 0 means how long to wait before redistributing, if a consumer is closed
+ then another one quickly recreated you might want to set it thus, to avoid unnecessary
+ redistribution -->
+ <address-setting match="jms.#">
+ <redistribution-delay>0</redistribution-delay>
+ </address-setting>
</address-settings>
-</settings>
+</configuration>
Modified: trunk/examples/jms/queue-requestor/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/queue-requestor/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/queue-requestor/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,29 +1,26 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <!-- Connectors -->
+ <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </acceptor>
- </acceptors>
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </acceptor>
+ </acceptors>
- <!-- Other config -->
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/queue-requestor/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/queue-requestor/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/queue-requestor/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,25 +1,27 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
- <!-- needed so
- the queue requester can create a temporary queue-->
- <security match="jms.tempqueue.#">
- <permission type="createDurableQueue" roles="guest"/>
- <permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ <!-- needed so
+ the queue requester can create a temporary queue-->
+ <security-setting match="jms.tempqueue.#">
+ <permission type="createDurableQueue" roles="guest"/>
+ <permission type="deleteDurableQueue" roles="guest"/>
+ <permission type="createTempQueue" roles="guest"/>
+ <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
-</settings>
+</configuration>
Modified: trunk/examples/jms/queue-selector/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/queue-selector/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/queue-selector/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,28 +1,25 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </acceptor>
- </acceptors>
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </acceptor>
+ </acceptors>
- <!-- Other config -->
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/queue-selector/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/queue-selector/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/queue-selector/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,17 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
-</settings>
+</configuration>
Modified: trunk/examples/jms/reconnect-same-node/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/reconnect-same-node/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/reconnect-same-node/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,43 +1,40 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <!-- Connectors -->
+ <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </connector>
-
- <!-- We just use this connector so we can send management operations while the other acceptor
- is stopped -->
- <connector name="netty-connector2">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
- </connector>
- </connectors>
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </connector>
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </acceptor>
+ <!-- We just use this connector so we can send management operations while the other acceptor
+ is stopped -->
+ <connector name="netty-connector2">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </acceptor>
- <!-- We just use this acceptor so we can send management operations while the other acceptor
- is stopped -->
- <acceptor name="netty-acceptor2">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
- </acceptor>
- </acceptors>
-
- <!-- Other config -->
+ <!-- We just use this acceptor so we can send management operations while the other acceptor
+ is stopped -->
+ <acceptor name="netty-acceptor2">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
+ </acceptor>
+ </acceptors>
+
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/reconnect-same-node/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/reconnect-same-node/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/reconnect-same-node/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,22 +1,25 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
-
- <security match="jbm.management">
- <!-- only the admin role can interact with the management address -->
- <permission type="consume" roles="admin"/>
- <permission type="send" roles="admin"/>
- <permission type="manage" roles="admin"/>
- </security>
+ <security-settings>
+
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+
+ <security-setting match="jbm.management">
+ <!-- only the admin role can interact with the management address -->
+ <permission type="consume" roles="admin"/>
+ <permission type="send" roles="admin"/>
+ <permission type="manage" roles="admin"/>
+ </security-setting>
+ </security-settings>
-</settings>
+</configuration>
Modified: trunk/examples/jms/request-reply/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/request-reply/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/request-reply/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,28 +1,25 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </acceptor>
- </acceptors>
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </acceptor>
+ </acceptors>
- <!-- Other config -->
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/request-reply/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/request-reply/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/request-reply/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,24 +1,26 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
-
- <!-- needed so the session can create a temporary queue-->
- <security match="jms.tempqueue.#">
- <permission type="createDurableQueue" roles="guest"/>
- <permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
-</settings>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+
+ <!-- needed so the session can create a temporary queue-->
+ <security-setting match="jms.tempqueue.#">
+ <permission type="createDurableQueue" roles="guest"/>
+ <permission type="deleteDurableQueue" roles="guest"/>
+ <permission type="createTempQueue" roles="guest"/>
+ <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
+</configuration>
Modified: trunk/examples/jms/scheduled-message/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/scheduled-message/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/scheduled-message/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,28 +1,25 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </acceptor>
- </acceptors>
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </acceptor>
+ </acceptors>
- <!-- Other config -->
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/scheduled-message/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/scheduled-message/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/scheduled-message/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,17 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
-</settings>
+</configuration>
Modified: trunk/examples/jms/security/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/security/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/security/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,28 +1,25 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </acceptor>
- </acceptors>
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </acceptor>
+ </acceptors>
- <!-- Other config -->
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/security/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/security/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/security/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,33 +1,35 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!-- any user can have full control of generic topics -->
- <security 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="send" roles="user"/>
- <permission type="consume" roles="user"/>
- </security>
+ <security-settings>
+ <!-- any user can have full control of generic topics -->
+ <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="send" roles="user"/>
+ <permission type="consume" roles="user"/>
+ </security-setting>
+
+ <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="send" roles="europe-user"/>
+ <permission type="consume" roles="news-user"/>
+ </security-setting>
+
+ <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="send" roles="us-user"/>
+ <permission type="consume" roles="news-user"/>
+ </security-setting>
+ </security-settings>
- <security 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="send" roles="europe-user"/>
- <permission type="consume" roles="news-user"/>
- </security>
-
- <security 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="send" roles="us-user"/>
- <permission type="consume" roles="news-user"/>
- </security>
-
-</settings>
+</configuration>
Modified: trunk/examples/jms/ssl-enabled/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/ssl-enabled/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/ssl-enabled/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,39 +1,36 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <!-- Connectors -->
+ <!-- Connectors -->
- <connectors>
- <connector name="netty-ssl-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
- <param key="jbm.remoting.netty.port" value="5500" type="Integer"/>
- <param key="jbm.remoting.netty.sslenabled" value="true" type="Boolean"/>
- <param key="jbm.remoting.netty.keystorepath" value="server0/jbm.example.keystore" type="String"/>
- <param key="jbm.remoting.netty.keystorepassword" value="jbmexample" type="String"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-ssl-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
- <param key="jbm.remoting.netty.port" value="5500" type="Integer"/>
- <param key="jbm.remoting.netty.sslenabled" value="true" type="Boolean"/>
- <param key="jbm.remoting.netty.keystorepath" value="jbm.example.keystore" type="String"/>
- <param key="jbm.remoting.netty.keystorepassword" value="jbmexample" type="String"/>
- <param key="jbm.remoting.netty.truststorepath" value="jbm.example.truststore" type="String"/>
- <param key="jbm.remoting.netty.truststorepassword" value="jbmexample" type="String"/>
- </acceptor>
- </acceptors>
+ <connectors>
+ <connector name="netty-ssl-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
+ <param key="jbm.remoting.netty.port" value="5500" type="Integer"/>
+ <param key="jbm.remoting.netty.sslenabled" value="true" type="Boolean"/>
+ <param key="jbm.remoting.netty.keystorepath" value="server0/jbm.example.keystore" type="String"/>
+ <param key="jbm.remoting.netty.keystorepassword" value="jbmexample" type="String"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-ssl-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
+ <param key="jbm.remoting.netty.port" value="5500" type="Integer"/>
+ <param key="jbm.remoting.netty.sslenabled" value="true" type="Boolean"/>
+ <param key="jbm.remoting.netty.keystorepath" value="jbm.example.keystore" type="String"/>
+ <param key="jbm.remoting.netty.keystorepassword" value="jbmexample" type="String"/>
+ <param key="jbm.remoting.netty.truststorepath" value="jbm.example.truststore" type="String"/>
+ <param key="jbm.remoting.netty.truststorepassword" value="jbmexample" type="String"/>
+ </acceptor>
+ </acceptors>
- <!-- Other config -->
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/ssl-enabled/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/ssl-enabled/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/ssl-enabled/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,17 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
-</settings>
+</configuration>
Modified: trunk/examples/jms/static-selector/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/static-selector/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/static-selector/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,35 +1,32 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </acceptor>
- </acceptors>
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </acceptor>
+ </acceptors>
- <queues>
- <queue name="jms.queue.selectorQueue">
- <address>jms.queue.selectorQueue</address>
- <filter string="color='red'"/>
- </queue>
- </queues>
+ <queues>
+ <queue name="jms.queue.selectorQueue">
+ <address>jms.queue.selectorQueue</address>
+ <filter string="color='red'"/>
+ </queue>
+ </queues>
- <!-- Other config -->
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/static-selector/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/static-selector/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/static-selector/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,17 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
-</settings>
+</configuration>
Modified: trunk/examples/jms/symmetric-cluster/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/symmetric-cluster/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,67 +1,64 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <clustered>true</clustered>
-
- <backup-connector-ref connector-name="backup-connector"/>
+ <clustered>true</clustered>
+
+ <backup-connector-ref connector-name="backup-connector"/>
- <!-- Connectors -->
+ <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </connector>
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </connector>
- <connector name="backup-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5448" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </acceptor>
- </acceptors>
-
- <!-- Clustering configuration -->
- <broadcast-groups>
- <broadcast-group name="my-broadcast-group">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <broadcast-period>100</broadcast-period>
- <connector-ref connector-name="netty-connector" backup-connector-name="backup-connector"/>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="my-discovery-group">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>10000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <retry-interval>500</retry-interval>
- <use-duplicate-detection>true</use-duplicate-detection>
- <forward-when-no-consumers>false</forward-when-no-consumers>
- <max-hops>1</max-hops>
- <discovery-group-ref discovery-group-name="my-discovery-group"/>
- </cluster-connection>
- </cluster-connections>
-
- <!-- Other config -->
+ <connector name="backup-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5448" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </acceptor>
+ </acceptors>
+
+ <!-- Clustering configuration -->
+ <broadcast-groups>
+ <broadcast-group name="my-broadcast-group">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>100</broadcast-period>
+ <connector-ref connector-name="netty-connector" backup-connector-name="backup-connector"/>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="my-discovery-group">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>10000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <retry-interval>500</retry-interval>
+ <use-duplicate-detection>true</use-duplicate-detection>
+ <forward-when-no-consumers>false</forward-when-no-consumers>
+ <max-hops>1</max-hops>
+ <discovery-group-ref discovery-group-name="my-discovery-group"/>
+ </cluster-connection>
+ </cluster-connections>
+
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/symmetric-cluster/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/symmetric-cluster/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,17 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!-- Default JMS security -->
- <security match="jms.#">
- <permission type="createDurableQueue" roles="guest"/>
- <permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!-- Default JMS security -->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
-</settings>
+</configuration>
Modified: trunk/examples/jms/symmetric-cluster/server1/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server1/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/symmetric-cluster/server1/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,67 +1,64 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <clustered>true</clustered>
-
- <backup-connector-ref connector-name="backup-connector"/>
+ <clustered>true</clustered>
+
+ <backup-connector-ref connector-name="backup-connector"/>
- <!-- Connectors -->
-
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
- </connector>
+ <!-- Connectors -->
+
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
+ </connector>
- <connector name="backup-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5449" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
- </acceptor>
- </acceptors>
-
- <!-- Clustering configuration -->
- <broadcast-groups>
- <broadcast-group name="my-broadcast-group">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <broadcast-period>100</broadcast-period>
- <connector-ref connector-name="netty-connector" backup-connector-name="backup-connector"/>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="my-discovery-group">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>10000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <retry-interval>500</retry-interval>
- <use-duplicate-detection>true</use-duplicate-detection>
- <forward-when-no-consumers>false</forward-when-no-consumers>
- <max-hops>1</max-hops>
- <discovery-group-ref discovery-group-name="my-discovery-group"/>
- </cluster-connection>
- </cluster-connections>
-
- <!-- Other config -->
+ <connector name="backup-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5449" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
+ </acceptor>
+ </acceptors>
+
+ <!-- Clustering configuration -->
+ <broadcast-groups>
+ <broadcast-group name="my-broadcast-group">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>100</broadcast-period>
+ <connector-ref connector-name="netty-connector" backup-connector-name="backup-connector"/>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="my-discovery-group">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>10000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <retry-interval>500</retry-interval>
+ <use-duplicate-detection>true</use-duplicate-detection>
+ <forward-when-no-consumers>false</forward-when-no-consumers>
+ <max-hops>1</max-hops>
+ <discovery-group-ref discovery-group-name="my-discovery-group"/>
+ </cluster-connection>
+ </cluster-connections>
+
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/symmetric-cluster/server1/jbm-queues.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server1/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/symmetric-cluster/server1/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,17 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!-- Default JMS security -->
- <security match="jms.#">
- <permission type="createDurableQueue" roles="guest"/>
- <permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
-
-</settings>
+ <security-settings>
+ <!-- Default JMS security -->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
+
+</configuration>
Modified: trunk/examples/jms/symmetric-cluster/server2/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server2/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/symmetric-cluster/server2/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,67 +1,64 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <clustered>true</clustered>
-
- <backup-connector-ref connector-name="backup-connector"/>
+ <clustered>true</clustered>
+
+ <backup-connector-ref connector-name="backup-connector"/>
- <!-- Connectors -->
-
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5447" type="Integer"/>
- </connector>
+ <!-- Connectors -->
+
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5447" type="Integer"/>
+ </connector>
- <connector name="backup-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5450" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5447" type="Integer"/>
- </acceptor>
- </acceptors>
-
- <!-- Clustering configuration -->
- <broadcast-groups>
- <broadcast-group name="my-broadcast-group">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <broadcast-period>100</broadcast-period>
- <connector-ref connector-name="netty-connector" backup-connector-name="backup-connector"/>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="my-discovery-group">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>10000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <retry-interval>500</retry-interval>
- <use-duplicate-detection>true</use-duplicate-detection>
- <forward-when-no-consumers>false</forward-when-no-consumers>
- <max-hops>1</max-hops>
- <discovery-group-ref discovery-group-name="my-discovery-group"/>
- </cluster-connection>
- </cluster-connections>
-
- <!-- Other config -->
+ <connector name="backup-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5450" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5447" type="Integer"/>
+ </acceptor>
+ </acceptors>
+
+ <!-- Clustering configuration -->
+ <broadcast-groups>
+ <broadcast-group name="my-broadcast-group">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>100</broadcast-period>
+ <connector-ref connector-name="netty-connector" backup-connector-name="backup-connector"/>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="my-discovery-group">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>10000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <retry-interval>500</retry-interval>
+ <use-duplicate-detection>true</use-duplicate-detection>
+ <forward-when-no-consumers>false</forward-when-no-consumers>
+ <max-hops>1</max-hops>
+ <discovery-group-ref discovery-group-name="my-discovery-group"/>
+ </cluster-connection>
+ </cluster-connections>
+
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/symmetric-cluster/server2/jbm-queues.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server2/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/symmetric-cluster/server2/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,17 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!-- Default JMS security -->
- <security match="jms.#">
- <permission type="createDurableQueue" roles="guest"/>
- <permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
-
-</settings>
+ <security-settings>
+ <!-- Default JMS security -->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
+
+</configuration>
Modified: trunk/examples/jms/symmetric-cluster/server3/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server3/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/symmetric-cluster/server3/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,62 +1,59 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <clustered>true</clustered>
-
- <backup>true</backup>
+ <clustered>true</clustered>
+
+ <backup>true</backup>
- <!-- Connectors -->
+ <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5448" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5448" type="Integer"/>
- </acceptor>
- </acceptors>
-
- <!-- Clustering configuration -->
- <broadcast-groups>
- <broadcast-group name="my-broadcast-group">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <broadcast-period>100</broadcast-period>
- <connector-ref connector-name="netty-connector"/>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="my-discovery-group">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>10000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <retry-interval>500</retry-interval>
- <use-duplicate-detection>true</use-duplicate-detection>
- <forward-when-no-consumers>false</forward-when-no-consumers>
- <max-hops>1</max-hops>
- <discovery-group-ref discovery-group-name="my-discovery-group"/>
- </cluster-connection>
- </cluster-connections>
-
- <!-- Other config -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5448" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5448" type="Integer"/>
+ </acceptor>
+ </acceptors>
+
+ <!-- Clustering configuration -->
+ <broadcast-groups>
+ <broadcast-group name="my-broadcast-group">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>100</broadcast-period>
+ <connector-ref connector-name="netty-connector"/>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="my-discovery-group">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>10000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <retry-interval>500</retry-interval>
+ <use-duplicate-detection>true</use-duplicate-detection>
+ <forward-when-no-consumers>false</forward-when-no-consumers>
+ <max-hops>1</max-hops>
+ <discovery-group-ref discovery-group-name="my-discovery-group"/>
+ </cluster-connection>
+ </cluster-connections>
+
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/symmetric-cluster/server3/jbm-queues.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server3/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/symmetric-cluster/server3/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,17 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!-- Default JMS security -->
- <security match="jms.#">
- <permission type="createDurableQueue" roles="guest"/>
- <permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!-- Default JMS security -->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
-</settings>
+</configuration>
Modified: trunk/examples/jms/symmetric-cluster/server4/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server4/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/symmetric-cluster/server4/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,61 +1,58 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <clustered>true</clustered>
-
- <backup>true</backup>
+ <clustered>true</clustered>
+
+ <backup>true</backup>
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5449" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5449" type="Integer"/>
- </acceptor>
- </acceptors>
-
- <!-- Clustering configuration -->
- <broadcast-groups>
- <broadcast-group name="my-broadcast-group">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <broadcast-period>100</broadcast-period>
- <connector-ref connector-name="netty-connector"/>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="my-discovery-group">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>10000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <retry-interval>500</retry-interval>
- <use-duplicate-detection>true</use-duplicate-detection>
- <forward-when-no-consumers>false</forward-when-no-consumers>
- <max-hops>1</max-hops>
- <discovery-group-ref discovery-group-name="my-discovery-group"/>
- </cluster-connection>
- </cluster-connections>
-
- <!-- Other config -->
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5449" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5449" type="Integer"/>
+ </acceptor>
+ </acceptors>
+
+ <!-- Clustering configuration -->
+ <broadcast-groups>
+ <broadcast-group name="my-broadcast-group">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>100</broadcast-period>
+ <connector-ref connector-name="netty-connector"/>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="my-discovery-group">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>10000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <retry-interval>500</retry-interval>
+ <use-duplicate-detection>true</use-duplicate-detection>
+ <forward-when-no-consumers>false</forward-when-no-consumers>
+ <max-hops>1</max-hops>
+ <discovery-group-ref discovery-group-name="my-discovery-group"/>
+ </cluster-connection>
+ </cluster-connections>
+
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/symmetric-cluster/server4/jbm-queues.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server4/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/symmetric-cluster/server4/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,17 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!-- Default JMS security -->
- <security match="jms.#">
- <permission type="createDurableQueue" roles="guest"/>
- <permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
-
-</settings>
+ <security-settings>
+ <!-- Default JMS security -->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
+
+</configuration>
Modified: trunk/examples/jms/symmetric-cluster/server5/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server5/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/symmetric-cluster/server5/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,61 +1,58 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <clustered>true</clustered>
-
- <backup>true</backup>
+ <clustered>true</clustered>
+
+ <backup>true</backup>
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5450" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5450" type="Integer"/>
- </acceptor>
- </acceptors>
-
- <!-- Clustering configuration -->
- <broadcast-groups>
- <broadcast-group name="my-broadcast-group">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <broadcast-period>100</broadcast-period>
- <connector-ref connector-name="netty-connector"/>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="my-discovery-group">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>10000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <retry-interval>500</retry-interval>
- <use-duplicate-detection>true</use-duplicate-detection>
- <forward-when-no-consumers>false</forward-when-no-consumers>
- <max-hops>1</max-hops>
- <discovery-group-ref discovery-group-name="my-discovery-group"/>
- </cluster-connection>
- </cluster-connections>
-
- <!-- Other config -->
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5450" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5450" type="Integer"/>
+ </acceptor>
+ </acceptors>
+
+ <!-- Clustering configuration -->
+ <broadcast-groups>
+ <broadcast-group name="my-broadcast-group">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>100</broadcast-period>
+ <connector-ref connector-name="netty-connector"/>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="my-discovery-group">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>10000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <retry-interval>500</retry-interval>
+ <use-duplicate-detection>true</use-duplicate-detection>
+ <forward-when-no-consumers>false</forward-when-no-consumers>
+ <max-hops>1</max-hops>
+ <discovery-group-ref discovery-group-name="my-discovery-group"/>
+ </cluster-connection>
+ </cluster-connections>
+
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/symmetric-cluster/server5/jbm-queues.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server5/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/symmetric-cluster/server5/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,17 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!-- Default JMS security -->
- <security match="jms.#">
- <permission type="createDurableQueue" roles="guest"/>
- <permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
-
-</settings>
+ <security-settings>
+ <!-- Default JMS security -->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
+
+</configuration>
Modified: trunk/examples/jms/temp-queue/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/temp-queue/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/temp-queue/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,28 +1,25 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </acceptor>
- </acceptors>
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </acceptor>
+ </acceptors>
- <!-- Other config -->
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/temp-queue/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/temp-queue/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/temp-queue/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,24 +1,28 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+
+ <!-- needed so the session can create a temporary queue-->
+ <security-setting match="jms.tempqueue.#">
+ <permission type="createDurableQueue" roles="guest"/>
+ <permission type="deleteDurableQueue" roles="guest"/>
+ <permission type="createTempQueue" roles="guest"/>
+ <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+
+ </security-settings>
- <!-- needed so the session can create a temporary queue-->
- <security match="jms.tempqueue.#">
- <permission type="createDurableQueue" roles="guest"/>
- <permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
-</settings>
+</configuration>
Modified: trunk/examples/jms/topic/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/topic/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/topic/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,28 +1,25 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </acceptor>
- </acceptors>
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </acceptor>
+ </acceptors>
- <!-- Other config -->
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/topic/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/topic/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/topic/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,17 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example topic-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example topic-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
-</settings>
+</configuration>
Modified: trunk/examples/jms/topic-hierarchies/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/topic-hierarchies/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/topic-hierarchies/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,29 +1,26 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <!-- Connectors -->
+ <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
- </acceptor>
- </acceptors>
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
+ </acceptor>
+ </acceptors>
- <!-- Other config -->
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/topic-hierarchies/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/topic-hierarchies/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/topic-hierarchies/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,17 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security match="jms.#">
- <permission type="createDurableQueue" roles="guest"/>
- <permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
-</settings>
+</configuration>
Modified: trunk/examples/jms/topic-selector-example1/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/topic-selector-example1/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/topic-selector-example1/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,28 +1,25 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </acceptor>
- </acceptors>
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </acceptor>
+ </acceptors>
- <!-- Other config -->
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/topic-selector-example1/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/topic-selector-example1/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/topic-selector-example1/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,17 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example topic-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example topic-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
-</settings>
+</configuration>
Modified: trunk/examples/jms/topic-selector-example2/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/topic-selector-example2/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/topic-selector-example2/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,28 +1,25 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </acceptor>
- </acceptors>
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </acceptor>
+ </acceptors>
- <!-- Other config -->
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/topic-selector-example2/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/topic-selector-example2/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/topic-selector-example2/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,17 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example topic-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example topic-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
-</settings>
+</configuration>
Modified: trunk/examples/jms/transactional/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/transactional/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/transactional/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,28 +1,25 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </acceptor>
- </acceptors>
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </acceptor>
+ </acceptors>
- <!-- Other config -->
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/transactional/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/transactional/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/transactional/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,17 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
-</settings>
+</configuration>
Modified: trunk/examples/jms/xa-heuristic/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/xa-heuristic/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/xa-heuristic/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,28 +1,25 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </acceptor>
- </acceptors>
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </acceptor>
+ </acceptors>
- <!-- Other config -->
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/xa-heuristic/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/xa-heuristic/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/xa-heuristic/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,17 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
-</settings>
+</configuration>
Modified: trunk/examples/jms/xa-receive/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/xa-receive/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/xa-receive/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,28 +1,25 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </acceptor>
- </acceptors>
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </acceptor>
+ </acceptors>
- <!-- Other config -->
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/xa-receive/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/xa-receive/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/xa-receive/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,17 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
-</settings>
+</configuration>
Modified: trunk/examples/jms/xa-send/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/xa-send/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/xa-send/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,28 +1,25 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </acceptor>
- </acceptors>
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </acceptor>
+ </acceptors>
- <!-- Other config -->
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/xa-send/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/xa-send/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/xa-send/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,17 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
-</settings>
+</configuration>
Property changes on: trunk/examples/jms/xa-with-jta
___________________________________________________________________
Name: svn:ignore
- server0/data
+ server0/data
build
logs
ObjectStore
Property changes on: trunk/examples/jms/xa-with-jta/server0
___________________________________________________________________
Name: svn:ignore
+ data
logs
Modified: trunk/examples/jms/xa-with-jta/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/xa-with-jta/server0/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/xa-with-jta/server0/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,28 +1,25 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </acceptor>
- </acceptors>
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </acceptor>
+ </acceptors>
- <!-- Other config -->
+ <!-- Other config -->
- <journal-min-files>2</journal-min-files>
+ <journal-min-files>2</journal-min-files>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/examples/jms/xa-with-jta/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/xa-with-jta/server0/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/examples/jms/xa-with-jta/server0/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,15 +1,17 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!--security for example queue-->
- <security 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="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
+ <security-settings>
+ <!--security for example queue-->
+ <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="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
-</settings>
+</configuration>
Modified: trunk/src/config/jboss-as/clustered/jbm-configuration.xml
===================================================================
--- trunk/src/config/jboss-as/clustered/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/src/config/jboss-as/clustered/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,172 +1,169 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <clustered>true</clustered>
-
- <!-- Maximum number of threads to use for scheduled deliveries -->
- <scheduled-thread-pool-max-size>30</scheduled-thread-pool-max-size>
+ <clustered>true</clustered>
+
+ <!-- Maximum number of threads to use for scheduled deliveries -->
+ <scheduled-thread-pool-max-size>30</scheduled-thread-pool-max-size>
- <security-enabled>true</security-enabled>
-
- <security-invalidation-interval>10000</security-invalidation-interval>
+ <security-enabled>true</security-enabled>
+
+ <security-invalidation-interval>10000</security-invalidation-interval>
- <wild-card-routing-enabled>true</wild-card-routing-enabled>
+ <wild-card-routing-enabled>true</wild-card-routing-enabled>
- <management-address>admin.management</management-address>
- <management-notification-address>admin.notification</management-notification-address>
+ <management-address>admin.management</management-address>
+ <management-notification-address>admin.notification</management-notification-address>
- <!-- true to expose JBoss Messaging resources through JMX -->
- <jmx-management-enabled>true</jmx-management-enabled>
+ <!-- true to expose JBoss Messaging resources through JMX -->
+ <jmx-management-enabled>true</jmx-management-enabled>
- <!-- by default, message counter is disabled -->
- <message-counter-enabled>false</message-counter-enabled>
-
- <connection-scan-period>10000</connection-scan-period>
-
- <!--how long before timing a transaction out-->
- <transaction-timeout>60000</transaction-timeout>
- <!--how often to scan for timedout transactions-->
- <transaction-timeout-scan-period>1000</transaction-timeout-scan-period>
+ <!-- by default, message counter is disabled -->
+ <message-counter-enabled>false</message-counter-enabled>
+
+ <connection-scan-period>10000</connection-scan-period>
+
+ <!--how long before timing a transaction out-->
+ <transaction-timeout>60000</transaction-timeout>
+ <!--how often to scan for timedout transactions-->
+ <transaction-timeout-scan-period>1000</transaction-timeout-scan-period>
- <!-- how often do we scan the queues for expired messages-->
- <message-expiry-scan-period>30000</message-expiry-scan-period>
- <!-- the priority of the thread that expires th emessages (between 1 - 10 inclusive)-->
- <message-expiry-thread-priority>3</message-expiry-thread-priority>
-
- <!-- Example interceptors
- <remoting-interceptors>
- <class-name>org.jboss.messaging.tests.unit.core.config.impl.TestInterceptor1</class-name>
- <class-name>org.jboss.messaging.tests.unit.core.config.impl.TestInterceptor2</class-name>
- </remoting-interceptors>
- -->
-
- <queue-activation-timeout>30000</queue-activation-timeout>
+ <!-- how often do we scan the queues for expired messages-->
+ <message-expiry-scan-period>30000</message-expiry-scan-period>
+ <!-- the priority of the thread that expires th emessages (between 1 - 10 inclusive)-->
+ <message-expiry-thread-priority>3</message-expiry-thread-priority>
+
+ <!-- Example interceptors
+ <remoting-interceptors>
+ <class-name>org.jboss.messaging.tests.unit.core.config.impl.TestInterceptor1</class-name>
+ <class-name>org.jboss.messaging.tests.unit.core.config.impl.TestInterceptor2</class-name>
+ </remoting-interceptors>
+ -->
+
+ <queue-activation-timeout>30000</queue-activation-timeout>
- <backup>false</backup>
+ <backup>false</backup>
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="${jboss.bind.address}" type="String"/>
- <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port}" type="Integer"/>
- </connector>
-
- <!-- <connector name="netty-connector-ssl">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="${jboss.bind.address}" type="String"/>
- <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.ssl.port}" type="Integer"/>
- <param key="jbm.remoting.netty.sslenabled" value="true" type="Boolean"/>
- </connector> -->
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.host" value="${jboss.bind.address}" type="String"/>
+ <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port}" type="Integer"/>
+ </connector>
+
+ <!-- <connector name="netty-connector-ssl">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.host" value="${jboss.bind.address}" type="String"/>
+ <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.ssl.port}" type="Integer"/>
+ <param key="jbm.remoting.netty.sslenabled" value="true" type="Boolean"/>
+ </connector> -->
- <connector name="in-vm-connector">
- <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
- </connector>
+ <connector name="in-vm-connector">
+ <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
+ </connector>
- </connectors>
+ </connectors>
- <!-- Acceptors -->
- <acceptors>
- <!-- In VM acceptor -->
- <acceptor name="in-vm-acceptor">
- <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
- <param key="jbm.remoting.invm.serverid" value="0" type="Integer"/>
- </acceptor>
+ <!-- Acceptors -->
+ <acceptors>
+ <!-- In VM acceptor -->
+ <acceptor name="in-vm-acceptor">
+ <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
+ <param key="jbm.remoting.invm.serverid" value="0" type="Integer"/>
+ </acceptor>
- <!-- Netty TCP Acceptor -->
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="${jboss.bind.address}" type="String"/>
- <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port}" type="Integer"/>
- </acceptor>
-
- <!-- Netty In VM Acceptor -->
- <!--
- <acceptor name="netty-invm">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.useinvm" value="true" type="Boolean"/>
- <param key="jbm.remoting.netty.host" value="org.jboss.jbm" type="String"/>
- </acceptor>
- -->
- </acceptors>
-
- <!-- Clustering configuration -->
- <broadcast-groups>
- <broadcast-group name="my-broadcast-group">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <broadcast-period>100</broadcast-period>
- <connector-ref connector-name="netty-connector"/>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="my-discovery-group">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>10000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <cluster-connections>
- <cluster-connection name="my-cluster">
- <address>jms</address>
- <retry-interval>500</retry-interval>
- <use-duplicate-detection>true</use-duplicate-detection>
- <forward-when-no-consumers>true</forward-when-no-consumers>
- <max-hops>1</max-hops>
- <discovery-group-ref discovery-group-name="my-discovery-group"/>
- </cluster-connection>
- </cluster-connections>
+ <!-- Netty TCP Acceptor -->
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.host" value="${jboss.bind.address}" type="String"/>
+ <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port}" type="Integer"/>
+ </acceptor>
+
+ <!-- Netty In VM Acceptor -->
+ <!--
+ <acceptor name="netty-invm">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.useinvm" value="true" type="Boolean"/>
+ <param key="jbm.remoting.netty.host" value="org.jboss.jbm" type="String"/>
+ </acceptor>
+ -->
+ </acceptors>
+
+ <!-- Clustering configuration -->
+ <broadcast-groups>
+ <broadcast-group name="my-broadcast-group">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>100</broadcast-period>
+ <connector-ref connector-name="netty-connector"/>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="my-discovery-group">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>10000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <retry-interval>500</retry-interval>
+ <use-duplicate-detection>true</use-duplicate-detection>
+ <forward-when-no-consumers>true</forward-when-no-consumers>
+ <max-hops>1</max-hops>
+ <discovery-group-ref discovery-group-name="my-discovery-group"/>
+ </cluster-connection>
+ </cluster-connections>
-
- <!-- Large Messages configuration -->
-
- <large-messages-directory>${jboss.server.data.dir}/messaging/largemessages</large-messages-directory>
+
+ <!-- Large Messages configuration -->
+
+ <large-messages-directory>${jboss.server.data.dir}/messaging/largemessages</large-messages-directory>
- <!-- Paging configuration -->
-
- <paging-max-threads>10</paging-max-threads>
-
- <paging-directory>${jboss.server.data.dir}/messsaging/paging</paging-directory>
-
- <paging-max-global-size-bytes>104857600</paging-max-global-size-bytes>
-
- <!-- Storage configuration -->
+ <!-- Paging configuration -->
+
+ <paging-max-threads>10</paging-max-threads>
+
+ <paging-directory>${jboss.server.data.dir}/messsaging/paging</paging-directory>
+
+ <paging-max-global-size-bytes>104857600</paging-max-global-size-bytes>
+
+ <!-- Storage configuration -->
- <bindings-directory>${jboss.server.data.dir}/messaging/bindings</bindings-directory>
+ <bindings-directory>${jboss.server.data.dir}/messaging/bindings</bindings-directory>
- <create-bindings-dir>true</create-bindings-dir>
+ <create-bindings-dir>true</create-bindings-dir>
- <journal-directory>${jboss.server.data.dir}/messaging/journal</journal-directory>
+ <journal-directory>${jboss.server.data.dir}/messaging/journal</journal-directory>
- <create-journal-dir>true</create-journal-dir>
+ <create-journal-dir>true</create-journal-dir>
- <journal-type>ASYNCIO</journal-type>
+ <journal-type>ASYNCIO</journal-type>
- <!-- The journal will reuse any buffers where the size < journal-buffer-reuse-size on write operations
- Set this to -1 to disable this feature -->
- <journal-buffer-reuse-size>4096</journal-buffer-reuse-size>
+ <!-- The journal will reuse any buffers where the size < journal-buffer-reuse-size on write operations
+ Set this to -1 to disable this feature -->
+ <journal-buffer-reuse-size>4096</journal-buffer-reuse-size>
- <!-- Does the journal sync to disk on each transaction commit, prepare or rollback? -->
- <journal-sync-transactional>true</journal-sync-transactional>
-
- <!-- Does the journal sync to disk for every non transactional persistent operation? -->
- <journal-sync-non-transactional>false</journal-sync-non-transactional>
+ <!-- Does the journal sync to disk on each transaction commit, prepare or rollback? -->
+ <journal-sync-transactional>true</journal-sync-transactional>
+
+ <!-- Does the journal sync to disk for every non transactional persistent operation? -->
+ <journal-sync-non-transactional>false</journal-sync-non-transactional>
- <!-- 10 MB journal file size -->
- <journal-file-size>10485760</journal-file-size>
+ <!-- 10 MB journal file size -->
+ <journal-file-size>10485760</journal-file-size>
- <journal-min-files>15</journal-min-files>
+ <journal-min-files>15</journal-min-files>
- <!-- Maximum simultaneous asynchronous writes accepted by the native layer.
- (parameter ignored on NIO)
- You can verify the max AIO on the OS level at /proc/sys/fs/aio_max_nr. (aio-nr will give you the current max-aio being used)
- -->
- <journal-max-aio>10000</journal-max-aio>
+ <!-- Maximum simultaneous asynchronous writes accepted by the native layer.
+ (parameter ignored on NIO)
+ You can verify the max AIO on the OS level at /proc/sys/fs/aio_max_nr. (aio-nr will give you the current max-aio being used)
+ -->
+ <journal-max-aio>10000</journal-max-aio>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/src/config/jboss-as/non-clustered/jbm-configuration.xml
===================================================================
--- trunk/src/config/jboss-as/non-clustered/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/src/config/jboss-as/non-clustered/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,150 +1,146 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
+ <clustered>false</clustered>
+
+ <!-- Maximum number of threads to use for scheduled deliveries -->
+ <scheduled-thread-pool-max-size>30</scheduled-thread-pool-max-size>
- <clustered>false</clustered>
-
- <!-- Maximum number of threads to use for scheduled deliveries -->
- <scheduled-thread-pool-max-size>30</scheduled-thread-pool-max-size>
+ <security-enabled>true</security-enabled>
+
+ <security-invalidation-interval>10000</security-invalidation-interval>
- <security-enabled>true</security-enabled>
-
- <security-invalidation-interval>10000</security-invalidation-interval>
+ <wild-card-routing-enabled>true</wild-card-routing-enabled>
- <wild-card-routing-enabled>true</wild-card-routing-enabled>
+ <management-address>jbm.management</management-address>
+ <management-notification-address>jbm.notifications</management-notification-address>
- <management-address>jbm.management</management-address>
- <management-notification-address>jbm.notifications</management-notification-address>
+ <!-- true to expose JBoss Messaging resources through JMX -->
+ <jmx-management-enabled>true</jmx-management-enabled>
- <!-- true to expose JBoss Messaging resources through JMX -->
- <jmx-management-enabled>true</jmx-management-enabled>
+ <!-- by default, message counter is disabled -->
+ <message-counter-enabled>false</message-counter-enabled>
+
+ <connection-scan-period>10000</connection-scan-period>
+
+ <!--how long before timing a transaction out-->
+ <transaction-timeout>60000</transaction-timeout>
+ <!--how often to scan for timedout transactions-->
+ <transaction-timeout-scan-period>1000</transaction-timeout-scan-period>
- <!-- by default, message counter is disabled -->
- <message-counter-enabled>false</message-counter-enabled>
-
- <connection-scan-period>10000</connection-scan-period>
-
- <!--how long before timing a transaction out-->
- <transaction-timeout>60000</transaction-timeout>
- <!--how often to scan for timedout transactions-->
- <transaction-timeout-scan-period>1000</transaction-timeout-scan-period>
+ <!-- how often do we scan the queues for expired messages-->
+ <message-expiry-scan-period>30000</message-expiry-scan-period>
+ <!-- the priority of the thread that expires th emessages (between 1 - 10 inclusive)-->
+ <message-expiry-thread-priority>3</message-expiry-thread-priority>
+
+ <!-- Example interceptors
+ <remoting-interceptors>
+ <class-name>org.jboss.messaging.tests.unit.core.config.impl.TestInterceptor1</class-name>
+ <class-name>org.jboss.messaging.tests.unit.core.config.impl.TestInterceptor2</class-name>
+ </remoting-interceptors>
+ -->
+
+ <queue-activation-timeout>30000</queue-activation-timeout>
- <!-- how often do we scan the queues for expired messages-->
- <message-expiry-scan-period>30000</message-expiry-scan-period>
- <!-- the priority of the thread that expires th emessages (between 1 - 10 inclusive)-->
- <message-expiry-thread-priority>3</message-expiry-thread-priority>
-
- <!-- Example interceptors
- <remoting-interceptors>
- <class-name>org.jboss.messaging.tests.unit.core.config.impl.TestInterceptor1</class-name>
- <class-name>org.jboss.messaging.tests.unit.core.config.impl.TestInterceptor2</class-name>
- </remoting-interceptors>
- -->
-
- <queue-activation-timeout>30000</queue-activation-timeout>
+ <backup>false</backup>
+
+ <persist-delivery-count-before-delivery>false</persist-delivery-count-before-delivery>
+
+ <!--
+ <backup-connector-ref connector-name="netty-backup"/>
+ -->
+
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.host" value="${jboss.bind.address}" type="String"/>
+ <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port}" type="Integer"/>
+ </connector>
+
+ <!-- <connector name="netty-connector-ssl">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.host" value="${jboss.bind.address}" type="String"/>
+ <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.ssl.port}" type="Integer"/>
+ <param key="jbm.remoting.netty.sslenabled" value="true" type="Boolean"/>
+ </connector> -->
- <backup>false</backup>
-
- <persist-delivery-count-before-delivery>false</persist-delivery-count-before-delivery>
-
- <!--
- <backup-connector-ref connector-name="netty-backup"/>
- -->
-
- <!-- Connectors -->
- <connectors>
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="${jboss.bind.address}" type="String"/>
- <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port}" type="Integer"/>
- </connector>
-
- <!-- <connector name="netty-connector-ssl">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="${jboss.bind.address}" type="String"/>
- <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.ssl.port}" type="Integer"/>
- <param key="jbm.remoting.netty.sslenabled" value="true" type="Boolean"/>
- </connector> -->
+ <connector name="in-vm-connector">
+ <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
+ </connector>
- <connector name="in-vm-connector">
- <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
- </connector>
+ </connectors>
- </connectors>
+ <!-- Acceptors -->
+ <acceptors>
+ <!-- In VM acceptor -->
+ <acceptor name="in-vm-acceptor">
+ <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
+ <param key="jbm.remoting.invm.serverid" value="0" type="Integer"/>
+ </acceptor>
- <!-- Acceptors -->
- <acceptors>
- <!-- In VM acceptor -->
- <acceptor name="in-vm-acceptor">
- <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
- <param key="jbm.remoting.invm.serverid" value="0" type="Integer"/>
- </acceptor>
+ <!-- Netty TCP Acceptor -->
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.host" value="${jboss.bind.address}" type="String"/>
+ <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port}" type="Integer"/>
+ </acceptor>
+
+ <!-- Netty In VM Acceptor -->
+ <!--
+ <acceptor name="netty-invm">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.useinvm" value="true" type="Boolean"/>
+ <param key="jbm.remoting.netty.host" value="org.jboss.jbm" type="String"/>
+ </acceptor>
+ -->
+ </acceptors>
+
+ <!-- Large Messages configuration -->
+
+ <large-messages-directory>${jboss.server.data.dir}/messaging/largemessages</large-messages-directory>
+
+ <!-- Paging configuration -->
+
+ <paging-max-threads>10</paging-max-threads>
+
+ <paging-directory>${jboss.server.data.dir}/messaging/paging</paging-directory>
+
+ <paging-global-watermark-size>10485760</paging-global-watermark-size>
+
+ <paging-max-global-size-bytes>104857600</paging-max-global-size-bytes>
+
+ <!-- Storage configuration -->
- <!-- Netty TCP Acceptor -->
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="${jboss.bind.address}" type="String"/>
- <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port}" type="Integer"/>
- </acceptor>
-
- <!-- Netty In VM Acceptor -->
- <!--
- <acceptor name="netty-invm">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.useinvm" value="true" type="Boolean"/>
- <param key="jbm.remoting.netty.host" value="org.jboss.jbm" type="String"/>
- </acceptor>
- -->
- </acceptors>
-
- <!-- Large Messages configuration -->
-
- <large-messages-directory>${jboss.server.data.dir}/messaging/largemessages</large-messages-directory>
-
- <!-- Paging configuration -->
-
- <paging-max-threads>10</paging-max-threads>
-
- <paging-directory>${jboss.server.data.dir}/messaging/paging</paging-directory>
-
- <paging-global-watermark-size>10485760</paging-global-watermark-size>
-
- <paging-max-global-size-bytes>104857600</paging-max-global-size-bytes>
-
- <!-- Storage configuration -->
+ <bindings-directory>${jboss.server.data.dir}/messaging/bindings</bindings-directory>
- <bindings-directory>${jboss.server.data.dir}/messaging/bindings</bindings-directory>
+ <create-bindings-dir>true</create-bindings-dir>
- <create-bindings-dir>true</create-bindings-dir>
+ <journal-directory>${jboss.server.data.dir}/messaging/journal</journal-directory>
- <journal-directory>${jboss.server.data.dir}/messaging/journal</journal-directory>
+ <create-journal-dir>true</create-journal-dir>
- <create-journal-dir>true</create-journal-dir>
+ <journal-type>ASYNCIO</journal-type>
- <journal-type>ASYNCIO</journal-type>
+ <!-- The journal will reuse any buffers where the size < journal-buffer-reuse-size on write operations
+ Set this to -1 to disable this feature -->
+ <journal-buffer-reuse-size>1536</journal-buffer-reuse-size>
- <!-- The journal will reuse any buffers where the size < journal-buffer-reuse-size on write operations
- Set this to -1 to disable this feature -->
- <journal-buffer-reuse-size>1536</journal-buffer-reuse-size>
+ <!-- Does the journal sync to disk on each transaction commit, prepare or rollback? -->
+ <journal-sync-transactional>true</journal-sync-transactional>
+
+ <!-- Does the journal sync to disk for every non transactional persistent operation? -->
+ <journal-sync-non-transactional>false</journal-sync-non-transactional>
- <!-- Does the journal sync to disk on each transaction commit, prepare or rollback? -->
- <journal-sync-transactional>true</journal-sync-transactional>
-
- <!-- Does the journal sync to disk for every non transactional persistent operation? -->
- <journal-sync-non-transactional>false</journal-sync-non-transactional>
+ <!-- 10 MB journal file size -->
+ <journal-file-size>10485760</journal-file-size>
- <!-- 10 MB journal file size -->
- <journal-file-size>10485760</journal-file-size>
+ <journal-min-files>15</journal-min-files>
- <journal-min-files>15</journal-min-files>
+ <!-- Maximum simultaneous asynchronous writes accepted by the native layer.
+ (parameter ignored on NIO)
+ You can verify the max AIO on the OS level at /proc/sys/fs/aio_max_nr. (aio-nr will give you the current max-aio being used)
+ -->
+ <journal-max-aio>10000</journal-max-aio>
- <!-- Maximum simultaneous asynchronous writes accepted by the native layer.
- (parameter ignored on NIO)
- You can verify the max AIO on the OS level at /proc/sys/fs/aio_max_nr. (aio-nr will give you the current max-aio being used)
- -->
- <journal-max-aio>10000</journal-max-aio>
-
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/src/config/stand-alone/clustered/jbm-configuration.xml
===================================================================
--- trunk/src/config/stand-alone/clustered/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/src/config/stand-alone/clustered/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,190 +1,187 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
- <clustered>true</clustered>
-
- <!-- Maximum number of threads to use for scheduled deliveries -->
- <scheduled-thread-pool-max-size>30</scheduled-thread-pool-max-size>
+ <clustered>true</clustered>
+
+ <!-- Maximum number of threads to use for scheduled deliveries -->
+ <scheduled-thread-pool-max-size>30</scheduled-thread-pool-max-size>
- <security-enabled>true</security-enabled>
-
- <security-invalidation-interval>10000</security-invalidation-interval>
+ <security-enabled>true</security-enabled>
+
+ <security-invalidation-interval>10000</security-invalidation-interval>
- <wild-card-routing-enabled>true</wild-card-routing-enabled>
+ <wild-card-routing-enabled>true</wild-card-routing-enabled>
- <management-address>admin.management</management-address>
- <management-notification-address>admin.notification</management-notification-address>
+ <management-address>admin.management</management-address>
+ <management-notification-address>admin.notification</management-notification-address>
- <!-- true to expose JBoss Messaging resources through JMX -->
- <jmx-management-enabled>true</jmx-management-enabled>
+ <!-- true to expose JBoss Messaging resources through JMX -->
+ <jmx-management-enabled>true</jmx-management-enabled>
- <!-- by default, message counter is disabled -->
- <message-counter-enabled>false</message-counter-enabled>
-
- <connection-scan-period>10000</connection-scan-period>
-
- <!--how long before timing a transaction out-->
- <transaction-timeout>60000</transaction-timeout>
- <!--how often to scan for timedout transactions-->
- <transaction-timeout-scan-period>1000</transaction-timeout-scan-period>
+ <!-- by default, message counter is disabled -->
+ <message-counter-enabled>false</message-counter-enabled>
+
+ <connection-scan-period>10000</connection-scan-period>
+
+ <!--how long before timing a transaction out-->
+ <transaction-timeout>60000</transaction-timeout>
+ <!--how often to scan for timedout transactions-->
+ <transaction-timeout-scan-period>1000</transaction-timeout-scan-period>
- <!-- how often do we scan the queues for expired messages-->
- <message-expiry-scan-period>30000</message-expiry-scan-period>
- <!-- the priority of the thread that expires th emessages (between 1 - 10 inclusive)-->
- <message-expiry-thread-priority>3</message-expiry-thread-priority>
-
- <!-- Example interceptors
- <remoting-interceptors>
- <class-name>org.jboss.messaging.tests.unit.core.config.impl.TestInterceptor1</class-name>
- <class-name>org.jboss.messaging.tests.unit.core.config.impl.TestInterceptor2</class-name>
- </remoting-interceptors>
- -->
-
- <queue-activation-timeout>30000</queue-activation-timeout>
+ <!-- how often do we scan the queues for expired messages-->
+ <message-expiry-scan-period>30000</message-expiry-scan-period>
+ <!-- the priority of the thread that expires th emessages (between 1 - 10 inclusive)-->
+ <message-expiry-thread-priority>3</message-expiry-thread-priority>
+
+ <!-- Example interceptors
+ <remoting-interceptors>
+ <class-name>org.jboss.messaging.tests.unit.core.config.impl.TestInterceptor1</class-name>
+ <class-name>org.jboss.messaging.tests.unit.core.config.impl.TestInterceptor2</class-name>
+ </remoting-interceptors>
+ -->
+
+ <queue-activation-timeout>30000</queue-activation-timeout>
- <backup>false</backup>
+ <backup>false</backup>
- <!--
- <backup-connector-ref connector-name="netty-backup"/>
- -->
+ <!--
+ <backup-connector-ref connector-name="netty-backup"/>
+ -->
- <!-- Connectors -->
- <connectors>
- <connector name="netty-backup">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
- <param key="jbm.remoting.netty.port" value="6400" type="Integer"/>
- </connector>
-
- <connector name="netty">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- </connector>
-
- <connector name="netty-ssl">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
- <param key="jbm.remoting.netty.port" value="5500" type="Integer"/>
- <param key="jbm.remoting.netty.sslenabled" value="true" type="Boolean"/>
- </connector>
+ <!-- Connectors -->
+ <connectors>
+ <connector name="netty-backup">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
+ <param key="jbm.remoting.netty.port" value="6400" type="Integer"/>
+ </connector>
+
+ <connector name="netty">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ </connector>
+
+ <connector name="netty-ssl">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
+ <param key="jbm.remoting.netty.port" value="5500" type="Integer"/>
+ <param key="jbm.remoting.netty.sslenabled" value="true" type="Boolean"/>
+ </connector>
- <connector name="netty-http">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
- <param key="jbm.remoting.netty.port" value="6100" type="Integer"/>
- <param key="jbm.remoting.netty.httpenabled" value="true" type="Boolean"/>
- <param key="jbm.remoting.netty.httpclientidletime" value="500" type="Long"/>
- <param key="jbm.remoting.netty.httpclientidlescanperiod" value="500" type="Long"/>
- </connector>
-
- <connector name="in-vm">
- <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
- </connector>
- </connectors>
-
- <!-- Acceptors -->
- <acceptors>
- <!-- In VM acceptor -->
- <acceptor name="in-vm">
- <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
- <param key="jbm.remoting.invm.serverid" value="0" type="Integer"/>
- </acceptor>
- <!-- Netty standard TCP acceptor -->
- <acceptor name="netty">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port}" type="Integer"/>
- </acceptor>
- <!-- Netty SSL Acceptor
- <acceptor name="netty-ssl">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
- <param key="jbm.remoting.netty.port" value="5500" type="Integer"/>
- <param key="jbm.remoting.netty.sslenabled" value="true" type="Boolean"/>
- </acceptor>
- -->
- <!--Netty HTTP Acceptor-->
- <!--<acceptor name-"netty-http">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
- <param key="jbm.remoting.netty.port" value="6100" type="Integer"/>
- <param key="jbm.remoting.netty.httpenabled" value="true" type="Boolean"/>
- <param key="jbm.remoting.netty.httpresponsetime" value="10000" type="Long"/>
- <param key="jbm.remoting.netty.httpserverscanperiod" value="5000" type="Long"/>
- </acceptor>-->
- </acceptors>
-
- <!-- Clustering configuration -->
- <broadcast-groups>
- <broadcast-group name="bg-group1">
- <local-bind-port>1234</local-bind-port>
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <broadcast-period>5000</broadcast-period>
- <connector-ref connector-name="netty" backup-connector-name="netty-backup"/>
- </broadcast-group>
- </broadcast-groups>
-
- <discovery-groups>
- <discovery-group name="dg-group1">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>10000</refresh-timeout>
- </discovery-group>
- </discovery-groups>
-
- <!--
- <bridges>
- <bridge name="foo">
- <queue-name>toto</queue-name>
- <forwarding-address>blah</forwarding-address>
- <filter string="color > 1"/>
- <connector-ref connector-name="netty"/>
- </bridge>
- </bridges>
+ <connector name="netty-http">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
+ <param key="jbm.remoting.netty.port" value="6100" type="Integer"/>
+ <param key="jbm.remoting.netty.httpenabled" value="true" type="Boolean"/>
+ <param key="jbm.remoting.netty.httpclientidletime" value="500" type="Long"/>
+ <param key="jbm.remoting.netty.httpclientidlescanperiod" value="500" type="Long"/>
+ </connector>
+
+ <connector name="in-vm">
+ <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
+ </connector>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <!-- In VM acceptor -->
+ <acceptor name="in-vm">
+ <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
+ <param key="jbm.remoting.invm.serverid" value="0" type="Integer"/>
+ </acceptor>
+ <!-- Netty standard TCP acceptor -->
+ <acceptor name="netty">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port}" type="Integer"/>
+ </acceptor>
+ <!-- Netty SSL Acceptor
+ <acceptor name="netty-ssl">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
+ <param key="jbm.remoting.netty.port" value="5500" type="Integer"/>
+ <param key="jbm.remoting.netty.sslenabled" value="true" type="Boolean"/>
+ </acceptor>
-->
-
- <!-- Paging configuration -->
-
- <paging-max-threads>10</paging-max-threads>
-
- <paging-directory>${jbm.data.dir}/paging</paging-directory>
-
- <paging-max-global-size-bytes>104857600</paging-max-global-size-bytes>
-
- <!-- Storage configuration -->
+ <!--Netty HTTP Acceptor-->
+ <!--<acceptor name-"netty-http">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
+ <param key="jbm.remoting.netty.port" value="6100" type="Integer"/>
+ <param key="jbm.remoting.netty.httpenabled" value="true" type="Boolean"/>
+ <param key="jbm.remoting.netty.httpresponsetime" value="10000" type="Long"/>
+ <param key="jbm.remoting.netty.httpserverscanperiod" value="5000" type="Long"/>
+ </acceptor>-->
+ </acceptors>
+
+ <!-- Clustering configuration -->
+ <broadcast-groups>
+ <broadcast-group name="bg-group1">
+ <local-bind-port>1234</local-bind-port>
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>5000</broadcast-period>
+ <connector-ref connector-name="netty" backup-connector-name="netty-backup"/>
+ </broadcast-group>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <discovery-group name="dg-group1">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>10000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+
+ <!--
+ <bridges>
+ <bridge name="foo">
+ <queue-name>toto</queue-name>
+ <forwarding-address>blah</forwarding-address>
+ <filter string="color > 1"/>
+ <connector-ref connector-name="netty"/>
+ </bridge>
+ </bridges>
+ -->
+
+ <!-- Paging configuration -->
+
+ <paging-max-threads>10</paging-max-threads>
+
+ <paging-directory>${jbm.data.dir}/paging</paging-directory>
+
+ <paging-max-global-size-bytes>104857600</paging-max-global-size-bytes>
+
+ <!-- Storage configuration -->
- <bindings-directory>${jbm.data.dir}/bindings</bindings-directory>
+ <bindings-directory>${jbm.data.dir}/bindings</bindings-directory>
- <create-bindings-dir>true</create-bindings-dir>
+ <create-bindings-dir>true</create-bindings-dir>
- <journal-directory>${jbm.data.dir}/journal</journal-directory>
+ <journal-directory>${jbm.data.dir}/journal</journal-directory>
- <create-journal-dir>true</create-journal-dir>
+ <create-journal-dir>true</create-journal-dir>
- <journal-type>ASYNCIO</journal-type>
+ <journal-type>ASYNCIO</journal-type>
- <!-- The journal will reuse any buffers where the size < journal-buffer-reuse-size on write operations
- Set this to -1 to disable this feature -->
- <journal-buffer-reuse-size>4096</journal-buffer-reuse-size>
+ <!-- The journal will reuse any buffers where the size < journal-buffer-reuse-size on write operations
+ Set this to -1 to disable this feature -->
+ <journal-buffer-reuse-size>4096</journal-buffer-reuse-size>
- <!-- Does the journal sync to disk on each transaction commit, prepare or rollback? -->
- <journal-sync-transactional>true</journal-sync-transactional>
-
- <!-- Does the journal sync to disk for every non transactional persistent operation? -->
- <journal-sync-non-transactional>false</journal-sync-non-transactional>
+ <!-- Does the journal sync to disk on each transaction commit, prepare or rollback? -->
+ <journal-sync-transactional>true</journal-sync-transactional>
+
+ <!-- Does the journal sync to disk for every non transactional persistent operation? -->
+ <journal-sync-non-transactional>false</journal-sync-non-transactional>
- <!-- 10 MB journal file size -->
- <journal-file-size>10485760</journal-file-size>
+ <!-- 10 MB journal file size -->
+ <journal-file-size>10485760</journal-file-size>
- <journal-min-files>15</journal-min-files>
+ <journal-min-files>15</journal-min-files>
- <!-- Maximum simultaneous asynchronous writes accepted by the native layer.
- (parameter ignored on NIO)
- You can verify the max AIO on the OS level at /proc/sys/fs/aio_max_nr. (aio-nr will give you the current max-aio being used)
- -->
- <journal-max-aio>10000</journal-max-aio>
+ <!-- Maximum simultaneous asynchronous writes accepted by the native layer.
+ (parameter ignored on NIO)
+ You can verify the max AIO on the OS level at /proc/sys/fs/aio_max_nr. (aio-nr will give you the current max-aio being used)
+ -->
+ <journal-max-aio>10000</journal-max-aio>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/src/config/stand-alone/clustered/jbm-queues.xml
===================================================================
--- trunk/src/config/stand-alone/clustered/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/src/config/stand-alone/clustered/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,60 +1,68 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd ">
- <!-- manangement address -->
- <security match="jbm.management">
- <!-- only the admin role can interact with the management address -->
- <permission type="consume" roles="admin"/>
- <permission type="send" roles="admin"/>
- <permission type="manage" roles="admin"/>
- </security>
+ <security-settings>
+ <!-- manangement address -->
+ <security-setting match="jbm.management">
+ <!-- only the admin role can interact with the management address -->
+ <permission type="consume" roles="admin"/>
+ <permission type="send" roles="admin"/>
+ <permission type="manage" roles="admin"/>
+ </security-setting>
+
+ <!--example queue or topic configuration-->
+ <!--<security-setting match="jms.queue.#">
+ <permission type="consume" roles="guest,publisher"/>
+ <permission type="send" roles="guest,publisher"/>
+ </security-setting>-->
+ <!--<security-setting match="jms.topic.#">
+ <permission type="consume" roles="guest,publisher"/>
+ <permission type="send" roles="guest,publisher"/>
+ </security-setting>-->
+
+ <!-- example temp queue or topic configuration -->
+ <!--<security-setting match="jms.tempqueue.#">
+ <permission type="createTempQueue" roles="guest"/>
+ <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+
+ <security-setting match="jms.temptopic.#">
+ <permission type="createTempQueue" roles="guest"/>
+ <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>-->
+
+
+ <!--default security to catch all-->
+ <security-setting match="#">
+ <permission type="createDurableQueue" roles="guest"/>
+ <permission type="deleteDurableQueue" roles="guest"/>
+ <permission type="createTempQueue" roles="guest"/>
+ <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+
+ </security-settings>
- <!--example queue or topic configuration-->
- <!--<security match="jms.queue.#">
- <permission type="consume" roles="guest,publisher"/>
- <permission type="send" roles="guest,publisher"/>
- </security>-->
- <!--<security match="jms.topic.#">
- <permission type="consume" roles="guest,publisher"/>
- <permission type="send" roles="guest,publisher"/>
- </security>-->
-
- <!-- example temp queue or topic configuration -->
- <!--<security match="jms.tempqueue.#">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
-
- <security match="jms.temptopic.#">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>-->
-
-
- <!--default security to catch all-->
- <security match="#">
- <permission type="createDurableQueue" roles="guest"/>
- <permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
-
- <!--default for catch all-->
- <address-settings match="#">
- <clustered>false</clustered>
- <dead-letter-address>jms.queue.DLQ</dead-letter-address>
- <expiry-address>jms.queue.ExpiryQueue</expiry-address>
- <redelivery-delay>0</redelivery-delay>
- <max-size-bytes>-1</max-size-bytes>
- <page-size-bytes>10485760</page-size-bytes>
- <distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributor</distribution-policy-class>
- <message-counter-history-day-limit>10</message-counter-history-day-limit>
+ <address-settings>
+
+ <!--default for catch all-->
+ <address-setting match="#">
+ <clustered>false</clustered>
+ <dead-letter-address>jms.queue.DLQ</dead-letter-address>
+ <expiry-address>jms.queue.ExpiryQueue</expiry-address>
+ <redelivery-delay>0</redelivery-delay>
+ <max-size-bytes>-1</max-size-bytes>
+ <page-size-bytes>10485760</page-size-bytes>
+ <distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributor</distribution-policy-class>
+ <message-counter-history-day-limit>10</message-counter-history-day-limit>
+ </address-setting>
+
</address-settings>
-</settings>
+
+</configuration>
Modified: trunk/src/config/stand-alone/non-clustered/jbm-configuration.xml
===================================================================
--- trunk/src/config/stand-alone/non-clustered/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/src/config/stand-alone/non-clustered/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,7 +1,6 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
+ xsi:schemaLocation="urn:jboss:messaging ../../../schemas/jbm-configuration.xsd">
<clustered>false</clustered>
@@ -210,6 +209,4 @@
-->
<journal-max-aio>10000</journal-max-aio>
- </configuration>
-
-</deployment>
+</configuration>
Modified: trunk/src/config/stand-alone/non-clustered/jbm-queues.xml
===================================================================
--- trunk/src/config/stand-alone/non-clustered/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/src/config/stand-alone/non-clustered/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,58 +1,66 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../../../schemas/jbm-configuration.xsd ">
- <!-- management address -->
- <security match="jbm.management">
- <!-- only the admin role can interact with the management address -->
- <permission type="consume" roles="admin"/>
- <permission type="send" roles="admin"/>
- <permission type="manage" roles="admin"/>
- </security>
-<!--example queue or topic configuration-->
- <!--<security match="jms.queue.#">
- <permission type="consume" roles="guest,publisher"/>
- <permission type="send" roles="guest,publisher"/>
- </security>-->
- <!--<security match="jms.topic.#">
- <permission type="consume" roles="guest,publisher"/>
- <permission type="send" roles="guest,publisher"/>
- </security>-->
+ <security-settings>
+ <!-- management address -->
+ <security-setting match="jbm.management">
+ <!-- only the admin role can interact with the management address -->
+ <permission type="consume" roles="admin"/>
+ <permission type="send" roles="admin"/>
+ <permission type="manage" roles="admin"/>
+ </security-setting>
+
+ <!--example queue or topic configuration-->
+ <!--<security-setting match="jms.queue.#">
+ <permission type="consume" roles="guest,publisher"/>
+ <permission type="send" roles="guest,publisher"/>
+ </security-setting>-->
+ <!--<security-setting match="jms.topic.#">
+ <permission type="consume" roles="guest,publisher"/>
+ <permission type="send" roles="guest,publisher"/>
+ </security-setting>-->
+
+ <!-- example temp queue or topic configuration -->
+ <!--<security-setting match="jms.tempqueue.#">
+ <permission type="createTempQueue" roles="guest"/>
+ <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+
+ <security-setting match="jms.temptopic.#">
+ <permission type="createTempQueue" roles="guest"/>
+ <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>-->
+
+ <!--default security to catch all-->
+ <security-setting match="#">
+ <permission type="createDurableQueue" roles="guest"/>
+ <permission type="deleteDurableQueue" roles="guest"/>
+ <permission type="createTempQueue" roles="guest"/>
+ <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
+
+ <address-settings>
+
+ <!--default for catch all-->
+ <address-setting match="#">
+ <clustered>false</clustered>
+ <dead-letter-address>jms.queue.DLQ</dead-letter-address>
+ <expiry-address>jms.queue.ExpiryQueue</expiry-address>
+ <redelivery-delay>0</redelivery-delay>
+ <max-size-bytes>-1</max-size-bytes>
+ <page-size-bytes>10485760</page-size-bytes>
+ <distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributor</distribution-policy-class>
+ <message-counter-history-day-limit>10</message-counter-history-day-limit>
+ </address-setting>
- <!-- example temp queue or topic configuration -->
- <!--<security match="jms.tempqueue.#">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
-
- <security match="jms.temptopic.#">
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>-->
-
- <!--default security to catch all-->
- <security match="#">
- <permission type="createDurableQueue" roles="guest"/>
- <permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createTempQueue" roles="guest"/>
- <permission type="deleteTempQueue" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security>
-
- <!--default for catch all-->
- <address-settings match="#">
- <clustered>false</clustered>
- <dead-letter-address>jms.queue.DLQ</dead-letter-address>
- <expiry-address>jms.queue.ExpiryQueue</expiry-address>
- <redelivery-delay>0</redelivery-delay>
- <max-size-bytes>-1</max-size-bytes>
- <page-size-bytes>10485760</page-size-bytes>
- <distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributor</distribution-policy-class>
- <message-counter-history-day-limit>10</message-counter-history-day-limit>
</address-settings>
-</settings>
+
+</configuration>
Modified: trunk/src/main/org/jboss/messaging/core/deployers/impl/AddressSettingsDeployer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/deployers/impl/AddressSettingsDeployer.java 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/src/main/org/jboss/messaging/core/deployers/impl/AddressSettingsDeployer.java 2009-05-12 14:44:10 UTC (rev 6742)
@@ -76,20 +76,13 @@
*/
public String[] getElementTagName()
{
- return new String[] { "address-settings" };
+ return new String[] { "address-setting" };
}
@Override
public void validate(Node rootNode) throws Exception
{
- if ("deployment".equals(rootNode.getNodeName()))
- {
- org.jboss.messaging.utils.XMLUtil.validate(rootNode, "jbm-configuration.xsd");
- }
- else
- {
- org.jboss.messaging.utils.XMLUtil.validate(rootNode, "jbm-queues.xsd");
- }
+ org.jboss.messaging.utils.XMLUtil.validate(rootNode, "jbm-configuration.xsd");
}
/**
Modified: trunk/src/main/org/jboss/messaging/core/deployers/impl/QueueDeployer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/deployers/impl/QueueDeployer.java 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/src/main/org/jboss/messaging/core/deployers/impl/QueueDeployer.java 2009-05-12 14:44:10 UTC (rev 6742)
@@ -58,14 +58,7 @@
@Override
public void validate(Node rootNode) throws Exception
{
- if ("deployment".equals(rootNode.getNodeName()))
- {
- org.jboss.messaging.utils.XMLUtil.validate(rootNode, "jbm-configuration.xsd");
- }
- else
- {
- org.jboss.messaging.utils.XMLUtil.validate(rootNode, "jbm-queues.xsd");
- }
+ org.jboss.messaging.utils.XMLUtil.validate(rootNode, "jbm-configuration.xsd");
}
/**
Modified: trunk/src/main/org/jboss/messaging/core/deployers/impl/SecurityDeployer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/deployers/impl/SecurityDeployer.java 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/src/main/org/jboss/messaging/core/deployers/impl/SecurityDeployer.java 2009-05-12 14:44:10 UTC (rev 6742)
@@ -30,7 +30,6 @@
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.security.Role;
import org.jboss.messaging.core.settings.HierarchicalRepository;
-import org.jboss.messaging.utils.XMLUtil;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -48,7 +47,7 @@
private static final String ROLES_ATTR_NAME = "roles";
private static final String QUEUES_XML = "jbm-queues.xml";
private static final String MATCH = "match";
- private static final String SECURITY_ELEMENT_NAME = "security";
+ private static final String SECURITY_ELEMENT_NAME = "security-setting";
public static final String SEND_NAME = "send";
public static final String CONSUME_NAME = "consume";
@@ -83,14 +82,7 @@
@Override
public void validate(Node rootNode) throws Exception
{
- if ("deployment".equals(rootNode.getNodeName()))
- {
- org.jboss.messaging.utils.XMLUtil.validate(rootNode, "jbm-configuration.xsd");
- }
- else
- {
- org.jboss.messaging.utils.XMLUtil.validate(rootNode, "jbm-queues.xsd");
- }
+ org.jboss.messaging.utils.XMLUtil.validate(rootNode, "jbm-configuration.xsd");
}
/**
Modified: trunk/src/schemas/jbm-configuration.xsd
===================================================================
--- trunk/src/schemas/jbm-configuration.xsd 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/src/schemas/jbm-configuration.xsd 2009-05-12 14:44:10 UTC (rev 6742)
@@ -5,20 +5,6 @@
elementFormDefault="qualified" attributeFormDefault="unqualified"
version="1.0">
- <xsd:include schemaLocation="jbm-queues.xsd"></xsd:include>
- <xsd:element name="deployment">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element ref="configuration" maxOccurs="1"
- minOccurs="1">
- </xsd:element>
- <xsd:element ref="settings" maxOccurs="1"
- minOccurs="0">
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
<xsd:element name="configuration">
<xsd:complexType>
<xsd:all>
@@ -163,13 +149,6 @@
</xsd:complexType>
</xsd:element>
<xsd:element name="queues" maxOccurs="1" minOccurs="0">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="queue" type="queueType"
- maxOccurs="unbounded" minOccurs="0">
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType>
</xsd:element>
<xsd:element name="bridges" maxOccurs="1" minOccurs="0">
<xsd:complexType>
@@ -237,7 +216,12 @@
<xsd:element name="large-messages-directory"
type="xsd:string" maxOccurs="1" minOccurs="0">
</xsd:element>
-
+ <xsd:element name="security-settings" maxOccurs="1"
+ minOccurs="0">
+ </xsd:element>
+ <xsd:element name="address-settings" maxOccurs="1"
+ minOccurs="0">
+ </xsd:element>
</xsd:all>
</xsd:complexType>
</xsd:element>
@@ -379,9 +363,12 @@
<xsd:element name="forwarding-address" type="xsd:string"
maxOccurs="1" minOccurs="1">
</xsd:element>
- <xsd:element name="filter" type="filterType" maxOccurs="1"
- minOccurs="0">
- </xsd:element>
+ <xsd:element name="filter"
+ maxOccurs="1" minOccurs="0">
+ <xsd:complexType>
+ <xsd:attribute name="string" type="xsd:string" use="required"></xsd:attribute>
+ </xsd:complexType>
+ </xsd:element>
<xsd:element name="transformer-class-name" type="xsd:string"
maxOccurs="1" minOccurs="0">
</xsd:element>
@@ -463,9 +450,12 @@
<xsd:element name="forwarding-address" type="xsd:string"
maxOccurs="1" minOccurs="1">
</xsd:element>
- <xsd:element name="filter" type="filterType" maxOccurs="1"
- minOccurs="0">
- </xsd:element>
+ <xsd:element name="filter"
+ maxOccurs="1" minOccurs="0">
+ <xsd:complexType>
+ <xsd:attribute name="string" type="xsd:string" use="required"></xsd:attribute>
+ </xsd:complexType>
+ </xsd:element>
<xsd:element name="transformer-class-name" type="xsd:string"
maxOccurs="1" minOccurs="0">
</xsd:element>
@@ -483,6 +473,114 @@
</xsd:restriction>
</xsd:simpleType>
+ <xsd:element name="security-settings">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="security-setting"
+ maxOccurs="unbounded" minOccurs="0">
+ </xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="security-setting">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="permission" minOccurs="0" maxOccurs="unbounded">
+ <xsd:complexType>
+ <xsd:attribute name="type" type="xsd:string" use="required"></xsd:attribute>
+ <xsd:attribute name="roles" type="xsd:string" use="required"></xsd:attribute>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="match" type="xsd:string" use="required"></xsd:attribute>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="address-settings">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="address-setting"
+ maxOccurs="unbounded" minOccurs="0">
+ </xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="address-setting">
+ <xsd:complexType>
+ <xsd:all>
+ <xsd:element name="clustered" type="xsd:boolean"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="dead-letter-address" type="xsd:string"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="expiry-address" type="xsd:string"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="redelivery-delay" type="xsd:unsignedLong"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="max-delivery-attempts" type="xsd:unsignedInt"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="max-size-bytes" type="xsd:long"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="page-size-bytes" type="xsd:unsignedLong"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="drop-messages-when-full" type="xsd:boolean"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="distribution-policy-class" type="xsd:string"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="message-counter-history-day-limit" type="xsd:positiveInteger"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="last-value-queue" type="xsd:boolean"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ <xsd:element name="redistribution-delay" type="xsd:unsignedLong"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ </xsd:all>
+ <xsd:attribute name="match" type="xsd:string" use="required"></xsd:attribute>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="queues">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="queue"
+ maxOccurs="unbounded" minOccurs="0">
+ </xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="queue">
+ <xsd:complexType>
+ <xsd:all>
+ <xsd:element name="address" type="xsd:string"
+ maxOccurs="1" minOccurs="1">
+ </xsd:element>
+ <xsd:element name="filter"
+ maxOccurs="1" minOccurs="0">
+ <xsd:complexType>
+ <xsd:attribute name="string" type="xsd:string" use="required"></xsd:attribute>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="durable" type="xsd:boolean"
+ maxOccurs="1" minOccurs="0">
+ </xsd:element>
+ </xsd:all>
+ <xsd:attribute name="name" type="xsd:ID" use="required"></xsd:attribute>
+ </xsd:complexType>
+ </xsd:element>
+
<xsd:complexType name="backup-connectorType">
<xsd:attribute name="connector-name" type="xsd:IDREF"
use="required">
Deleted: trunk/src/schemas/jbm-queues.xsd
===================================================================
--- trunk/src/schemas/jbm-queues.xsd 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/src/schemas/jbm-queues.xsd 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,108 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="urn:jboss:messaging"
- xmlns="urn:jboss:messaging"
- elementFormDefault="qualified"
- attributeFormDefault="unqualified"
- version="1.0">
-
- <xsd:element name="settings">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element ref="security" maxOccurs="unbounded"
- minOccurs="0">
- </xsd:element>
- <xsd:element ref="address-settings" maxOccurs="unbounded"
- minOccurs="0">
- </xsd:element>
- <xsd:element ref="queue" maxOccurs="unbounded"
- minOccurs="0">
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="permission">
- <xsd:complexType>
- <xsd:attribute name="type" type="xsd:string" use="required"></xsd:attribute>
- <xsd:attribute name="roles" type="xsd:string" use="required"></xsd:attribute>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="security">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element ref="permission" maxOccurs="unbounded" minOccurs="1"></xsd:element>
- </xsd:sequence>
- <xsd:attribute name="match" type="xsd:string" use="required"></xsd:attribute>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="address-settings" type="address-settingsType"></xsd:element>
-
- <xsd:complexType name="address-settingsType">
- <xsd:all>
- <xsd:element name="clustered" type="xsd:boolean"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="dead-letter-address" type="xsd:string"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="expiry-address" type="xsd:string"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="redelivery-delay" type="xsd:unsignedLong"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="max-delivery-attempts" type="xsd:unsignedInt"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="max-size-bytes" type="xsd:long"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="page-size-bytes" type="xsd:unsignedLong"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="drop-messages-when-full" type="xsd:boolean"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="distribution-policy-class" type="xsd:string"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="message-counter-history-day-limit" type="xsd:positiveInteger"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="last-value-queue" type="xsd:boolean"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="redistribution-delay" type="xsd:unsignedLong"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- </xsd:all>
- <xsd:attribute name="match" type="xsd:string" use="required"></xsd:attribute>
- </xsd:complexType>
-
- <xsd:element name="queue" type="queueType"></xsd:element>
-
- <xsd:complexType name="queueType">
- <xsd:all>
- <xsd:element name="address" type="xsd:string"
- maxOccurs="1" minOccurs="1">
- </xsd:element>
- <xsd:element name="filter" type="filterType"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- <xsd:element name="durable" type="xsd:boolean"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
- </xsd:all>
- <xsd:attribute name="name" type="xsd:ID" use="required"></xsd:attribute>
- </xsd:complexType>
-
- <xsd:complexType name="filterType">
- <xsd:attribute name="string" type="xsd:string" use="required"></xsd:attribute>
- </xsd:complexType>
-
-
-</xsd:schema>
Modified: trunk/tests/config/ConfigurationTest-config.xml
===================================================================
--- trunk/tests/config/ConfigurationTest-config.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/tests/config/ConfigurationTest-config.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,5 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:messaging ../../src/schemas/jbm-configuration.xsd ">
- <configuration>
+<configuration
+ xmlns="urn:jboss:messaging"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../../src/schemas/jbm-configuration.xsd ">
<clustered>true</clustered>
<enable-file-deployment>true</enable-file-deployment>
<scheduled-thread-pool-max-size>12345</scheduled-thread-pool-max-size>
@@ -60,5 +62,3 @@
<journal-min-files>100</journal-min-files>
<journal-max-aio>56546</journal-max-aio>
</configuration>
-
-</deployment>
\ No newline at end of file
Modified: trunk/tests/config/ConfigurationTest-defaults.xml
===================================================================
--- trunk/tests/config/ConfigurationTest-defaults.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/tests/config/ConfigurationTest-defaults.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,5 +1,6 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:messaging ../../src/schemas/jbm-configuration.xsd ">
- <configuration>
- <!-- just use all the defaults -->
- </configuration>
-</deployment>
\ No newline at end of file
+<configuration
+ xmlns="urn:jboss:messaging"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../../src/schemas/jbm-configuration.xsd ">
+ <!-- just use the defaults -->
+</configuration>
Modified: trunk/tests/config/ConfigurationTest-full-config.xml
===================================================================
--- trunk/tests/config/ConfigurationTest-full-config.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/tests/config/ConfigurationTest-full-config.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,5 +1,7 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:messaging ../../src/schemas/jbm-configuration.xsd ">
- <configuration>
+<configuration
+ xmlns="urn:jboss:messaging"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../../src/schemas/jbm-configuration.xsd ">
<clustered>true</clustered>
<enable-file-deployment>true</enable-file-deployment>
<scheduled-thread-pool-max-size>12345</scheduled-thread-pool-max-size>
@@ -184,12 +186,4 @@
<discovery-group-ref discovery-group-name="dg1"/>
</cluster-connection>
</cluster-connections>
- </configuration>
-
- <settings>
- <queue name="foo3">
- <address>bar</address>
- </queue>
- </settings>
-
-</deployment>
\ No newline at end of file
+</configuration>
Modified: trunk/tests/jms-tests/config/jbm-configuration.xml
===================================================================
--- trunk/tests/jms-tests/config/jbm-configuration.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/tests/jms-tests/config/jbm-configuration.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,7 +1,6 @@
-<deployment xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
- <configuration>
+ xsi:schemaLocation="urn:jboss:messaging ../../../src/schemas/jbm-configuration.xsd">
<!-- Connectors -->
<connectors>
@@ -38,6 +37,4 @@
<paging-max-global-size-bytes>20485760</paging-max-global-size-bytes>
<paging-global-watermark-size>1048576</paging-global-watermark-size>
- </configuration>
-
-</deployment>
+</configuration>
\ No newline at end of file
Modified: trunk/tests/jms-tests/config/jbm-queues.xml
===================================================================
--- trunk/tests/jms-tests/config/jbm-queues.xml 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/tests/jms-tests/config/jbm-queues.xml 2009-05-12 14:44:10 UTC (rev 6742)
@@ -1,14 +1,16 @@
-<settings xmlns="urn:jboss:messaging"
+<configuration xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../../../src/schemas/jbm-configuration.xsd ">
- <security 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="consume" roles="guest,def"/>
- <permission type="send" roles="guest,def"/>
- </security>
+ <security-settings>
+ <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="consume" roles="guest,def"/>
+ <permission type="send" roles="guest,def"/>
+ </security-setting>
+ </security-settings>
-</settings>
+</configuration>
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationValidationTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationValidationTest.java 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationValidationTest.java 2009-05-12 14:44:10 UTC (rev 6742)
@@ -51,26 +51,10 @@
public void testMinimalConfiguration() throws Exception
{
- String xml = "<deployment xmlns='urn:jboss:messaging'>"
- + "<configuration></configuration>"
- + "</deployment>";
+ String xml = "<configuration xmlns='urn:jboss:messaging'>"
+ + "</configuration>";
Element element = org.jboss.messaging.utils.XMLUtil.stringToElement(xml);
assertNotNull(element);
- try
- {
- XMLUtil.validate(element, "jbm-configuration.xsd");
- fail("minimal configuration must declare at least one acceptor");
- }
- catch (IllegalStateException e)
- {
- }
-
- xml = "<deployment xmlns='urn:jboss:messaging'> " + "<configuration>"
- + "<acceptors>"
- + "<acceptor><factory-class>FooAcceptor</factory-class></acceptor>"
- + "</acceptors>"
- + "</configuration>"
- + "</deployment>";
element = XMLUtil.stringToElement(xml);
assertNotNull(element);
XMLUtil.validate(element, "jbm-configuration.xsd");
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/DefaultsFileConfigurationTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/DefaultsFileConfigurationTest.java 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/DefaultsFileConfigurationTest.java 2009-05-12 14:44:10 UTC (rev 6742)
@@ -64,8 +64,7 @@
assertEquals(ConfigurationImpl.DEFAULT_CONNECTION_TTL_OVERRIDE, conf.getConnectionTTLOverride());
- // there must be at least 1 acceptor for the configuration to be valid
- assertEquals(1, conf.getAcceptorConfigurations().size());
+ assertEquals(0, conf.getAcceptorConfigurations().size());
assertEquals(emptyMap(), conf.getConnectorConfigurations());
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/AddressSettingsDeployerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/AddressSettingsDeployerTest.java 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/AddressSettingsDeployerTest.java 2009-05-12 14:44:10 UTC (rev 6742)
@@ -75,27 +75,22 @@
public void testDeployFromConfigurationFile() throws Exception
{
- String xml = "<deployment xmlns='urn:jboss:messaging'> "
- + "<configuration>"
- + "<acceptors>"
- + "<acceptor><factory-class>FooAcceptor</factory-class></acceptor>"
- + "</acceptors>"
- + "</configuration>"
- + "<settings>"
- + " <address-settings match=\"queues.*\">"
+ String xml = "<configuration xmlns='urn:jboss:messaging'> "
+ + "<address-settings>"
+ + " <address-setting match=\"queues.*\">"
+ " <dead-letter-address>DLQtest</dead-letter-address>\n"
+ " <expiry-address>ExpiryQueueTest</expiry-address>\n"
+ " <redelivery-delay>100</redelivery-delay>\n"
+ " <max-size-bytes>-100</max-size-bytes>\n"
+ " <distribution-policy-class>org.jboss.messaging.core.impl.RoundRobinDistributionPolicy</distribution-policy-class>"
+ " <message-counter-history-day-limit>1000</message-counter-history-day-limit>"
- + " </address-settings>"
- + "</settings>"
- + "</deployment>";
+ + " </address-setting>"
+ + "</address-settings>"
+ + "</configuration>";
Element rootNode = org.jboss.messaging.utils.XMLUtil.stringToElement(xml);
addressSettingsDeployer.validate(rootNode);
- NodeList addressSettingsNode = rootNode.getElementsByTagName("address-settings");
+ NodeList addressSettingsNode = rootNode.getElementsByTagName("address-setting");
assertEquals(1, addressSettingsNode.getLength());
addressSettingsDeployer.deploy(addressSettingsNode.item(0));
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/QueueDeployerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/QueueDeployerTest.java 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/QueueDeployerTest.java 2009-05-12 14:44:10 UTC (rev 6742)
@@ -59,13 +59,15 @@
public void testParseQueueConfigurationFromAddressSettings() throws Exception
{
- String xml = "<settings xmlns='urn:jboss:messaging'>"
- + " <queue name='foo'>"
- + " <address>bar</address>"
- + " <filter string='speed > 88' />"
- + " <durable>false</durable>"
- + " </queue>"
- + "</settings>";
+ String xml = "<configuration xmlns='urn:jboss:messaging'>"
+ + " <queues>"
+ + " <queue name='foo'>"
+ + " <address>bar</address>"
+ + " <filter string='speed > 88' />"
+ + " <durable>false</durable>"
+ + " </queue>"
+ + " </queues>"
+ + "</configuration>";
Element rootNode = org.jboss.messaging.utils.XMLUtil.stringToElement(xml);
deployer.validate(rootNode);
@@ -84,27 +86,20 @@
public void testParseQueueConfigurationFromJBMConfiguration() throws Exception
{
- String xml = "<deployment xmlns='urn:jboss:messaging'> "
- + "<configuration>"
- + "<acceptors>"
- + "<acceptor><factory-class>FooAcceptor</factory-class></acceptor>"
- + "</acceptors>"
+ String xml = "<configuration xmlns='urn:jboss:messaging'> "
+ "<queues>"
+ " <queue name='foo'>"
+ " <address>bar</address>"
+ " <filter string='speed > 88' />"
+ " <durable>false</durable>"
+ " </queue>"
- + "</queues>"
- + "</configuration>"
- + "<settings>"
+ " <queue name='foo2'>"
+ " <address>bar2</address>"
+ " <filter string='speed > 88' />"
+ " <durable>true</durable>"
+ " </queue>"
- + "</settings>"
- + "</deployment>";
+ + "</queues>"
+ + "</configuration>";
Element rootNode = org.jboss.messaging.utils.XMLUtil.stringToElement(xml);
deployer.validate(rootNode);
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/SecurityDeployerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/SecurityDeployerTest.java 2009-05-12 14:32:32 UTC (rev 6741)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/SecurityDeployerTest.java 2009-05-12 14:44:10 UTC (rev 6742)
@@ -22,20 +22,18 @@
package org.jboss.messaging.tests.unit.core.deployers.impl;
+import java.util.HashSet;
+import java.util.Set;
+
import org.jboss.messaging.core.deployers.DeploymentManager;
import org.jboss.messaging.core.deployers.impl.SecurityDeployer;
import org.jboss.messaging.core.security.Role;
import org.jboss.messaging.core.settings.HierarchicalRepository;
-import org.jboss.messaging.core.settings.impl.AddressSettings;
import org.jboss.messaging.core.settings.impl.HierarchicalObjectRepository;
import org.jboss.messaging.tests.util.UnitTestCase;
-import org.jboss.messaging.utils.SimpleString;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
-import java.util.HashSet;
-import java.util.Set;
-
/**
* @author <a href="ataylor at redhat.com">Andy Taylor</a>
*/
@@ -43,20 +41,20 @@
{
private SecurityDeployer deployer;
- private String conf = "<security match=\"jms.topic.testTopic\">\n" +
+ private String conf = "<security-setting match=\"jms.topic.testTopic\">\n" +
" <permission type=\"createDurableQueue\" roles=\"durpublisher\"/>\n" +
" <permission type=\"deleteDurableQueue\" roles=\"durpublisher\"/>\n" +
" <permission type=\"consume\" roles=\"guest,publisher,durpublisher\"/>\n" +
" <permission type=\"send\" roles=\"guest,publisher,durpublisher\"/>\n" +
" <permission type=\"manage\" roles=\"guest,publisher,durpublisher\"/>\n" +
- " </security>";
+ " </security-setting>";
- private String conf2 = "<security match=\"jms.topic.testQueue\">\n" +
+ private String conf2 = "<security-setting match=\"jms.topic.testQueue\">\n" +
" <permission type=\"createTempQueue\" roles=\"durpublisher\"/>\n" +
" <permission type=\"deleteTempQueue\" roles=\"durpublisher\"/>\n" +
" <permission type=\"consume\" roles=\"guest,publisher,durpublisher\"/>\n" +
" <permission type=\"send\" roles=\"guest,publisher,durpublisher\"/>\n" +
- " </security>";
+ " </security-setting>";
private String noRoles =
" <securityfoo match=\"queues.testQueue\">\n" +
@@ -214,26 +212,21 @@
public void testDeployFromConfigurationFile() throws Exception
{
- String xml = "<deployment xmlns='urn:jboss:messaging'> "
- + "<configuration>"
- + "<acceptors>"
- + "<acceptor><factory-class>FooAcceptor</factory-class></acceptor>"
- + "</acceptors>"
- + "</configuration>"
- + "<settings>"
- + " <security match=\"jms.topic.testTopic\">"
+ String xml = "<configuration xmlns='urn:jboss:messaging'> "
+ + "<security-settings>"
+ + " <security-setting match=\"jms.topic.testTopic\">"
+ " <permission type=\"createDurableQueue\" roles=\"durpublisher\"/>"
+ " <permission type=\"deleteDurableQueue\" roles=\"durpublisher\"/>"
+ " <permission type=\"consume\" roles=\"guest,publisher,durpublisher\"/>"
+ " <permission type=\"send\" roles=\"guest,publisher,durpublisher\"/>"
+ " <permission type=\"manage\" roles=\"guest,publisher,durpublisher\"/>"
- + " </security>"
- + "</settings>"
- + "</deployment>";
+ + " </security-setting>"
+ + "</security-settings>"
+ + "</configuration>";
Element rootNode = org.jboss.messaging.utils.XMLUtil.stringToElement(xml);
deployer.validate(rootNode);
- NodeList securityNodes = rootNode.getElementsByTagName("security");
+ NodeList securityNodes = rootNode.getElementsByTagName("security-setting");
assertEquals(1, securityNodes.getLength());
deployer.deploy(securityNodes.item(0));
More information about the jboss-cvs-commits
mailing list